From 9135e97f2ad1f91481be5dfbda17d9fc2a82adc2 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 16:22:14 +0100 Subject: [PATCH 01/42] fix import Signed-off-by: Vincent Potucek --- buildSrc/config/checkstyle/checkstyle.xml | 11 +++++----- .../HotelControllerTests.java | 1 - ...essageSizeLimitWebSocketConfiguration.java | 2 -- .../WebSocketConfiguration.java | 2 -- .../WebSocketConfiguration.java | 1 - .../GreetingController.java | 5 ----- .../ReceiveOrderWebSocketConfiguration.java | 1 - src/checkstyle/checkstyle.xml | 22 ++++--------------- src/nohttp/checkstyle.xml | 13 +++++++++-- 9 files changed, 20 insertions(+), 38 deletions(-) diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index b75fed0d6583..9b0beb144f05 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -1,7 +1,7 @@ - + - @@ -10,17 +10,16 @@ - - - + + + - diff --git a/framework-docs/src/main/java/org/springframework/docs/testing/mockmvc/assertj/mockmvctesterrequests/HotelControllerTests.java b/framework-docs/src/main/java/org/springframework/docs/testing/mockmvc/assertj/mockmvctesterrequests/HotelControllerTests.java index b72da0454c8e..6e94e21d3462 100644 --- a/framework-docs/src/main/java/org/springframework/docs/testing/mockmvc/assertj/mockmvctesterrequests/HotelControllerTests.java +++ b/framework-docs/src/main/java/org/springframework/docs/testing/mockmvc/assertj/mockmvctesterrequests/HotelControllerTests.java @@ -21,7 +21,6 @@ import org.springframework.test.web.servlet.assertj.MvcTestResult; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; /** * @author Stephane Nicoll diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/MessageSizeLimitWebSocketConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/MessageSizeLimitWebSocketConfiguration.java index 303e245f24f8..dfd9f5dcdb32 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/MessageSizeLimitWebSocketConfiguration.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/MessageSizeLimitWebSocketConfiguration.java @@ -17,9 +17,7 @@ package org.springframework.docs.web.websocket.stomp.websocketstompconfigurationperformance; import org.springframework.context.annotation.Configuration; -import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; -import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration; diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/WebSocketConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/WebSocketConfiguration.java index 82d556dd59de..ec2007456df4 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/WebSocketConfiguration.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/WebSocketConfiguration.java @@ -17,9 +17,7 @@ package org.springframework.docs.web.websocket.stomp.websocketstompconfigurationperformance; import org.springframework.context.annotation.Configuration; -import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; -import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration; diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomphandlesimplebroker/WebSocketConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomphandlesimplebroker/WebSocketConfiguration.java index b6518257ce66..9ea344f8556b 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomphandlesimplebroker/WebSocketConfiguration.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomphandlesimplebroker/WebSocketConfiguration.java @@ -22,7 +22,6 @@ import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.scheduling.TaskScheduler; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; -import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; // tag::snippet[] diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompmessageflow/GreetingController.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompmessageflow/GreetingController.java index 9f8302ac11f2..65d1ec09f9e4 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompmessageflow/GreetingController.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompmessageflow/GreetingController.java @@ -19,13 +19,8 @@ import java.text.SimpleDateFormat; import java.util.Date; -import org.springframework.context.annotation.Configuration; import org.springframework.messaging.handler.annotation.MessageMapping; -import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.stereotype.Controller; -import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; -import org.springframework.web.socket.config.annotation.StompEndpointRegistry; -import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; // tag::snippet[] @Controller diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomporderedmessages/ReceiveOrderWebSocketConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomporderedmessages/ReceiveOrderWebSocketConfiguration.java index 9f787007bf64..a2ab578f546d 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomporderedmessages/ReceiveOrderWebSocketConfiguration.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomporderedmessages/ReceiveOrderWebSocketConfiguration.java @@ -17,7 +17,6 @@ package org.springframework.docs.web.websocket.stomp.websocketstomporderedmessages; import org.springframework.context.annotation.Configuration; -import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index eb8c068dd409..1cf64872444e 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -1,12 +1,10 @@ - - @@ -16,10 +14,8 @@ - - @@ -27,7 +23,6 @@ - @@ -38,7 +33,6 @@ - @@ -48,7 +42,6 @@ - @@ -56,7 +49,6 @@ - @@ -74,7 +66,6 @@ - @@ -87,7 +78,6 @@ - @@ -131,7 +121,6 @@ - @@ -159,14 +148,11 @@ - - - @@ -175,7 +161,6 @@ - @@ -256,7 +241,6 @@ - @@ -264,7 +248,9 @@ - + + + + - diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index f968de4fc528..a49dc052b6e6 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -3,7 +3,6 @@ - @@ -13,4 +12,14 @@ - \ No newline at end of file + + + + + + + + + + + From 17bfeaabea7b38b6ac4f4041aa7a74f4e5ada8a5 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 16:46:15 +0100 Subject: [PATCH 02/42] fix dry AvoidStarImport --- src/checkstyle/checkstyle.xml | 3 --- src/nohttp/checkstyle.xml | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 1cf64872444e..5173f4c1b295 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -79,9 +79,6 @@ - - - diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index a49dc052b6e6..72747c383bcb 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -15,9 +15,9 @@ - - - + + + From 26660e0124827d5c7669b8c9f4fa3c19122f5cba Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 16:48:06 +0100 Subject: [PATCH 03/42] add unused import to check CS --- .../MessageSizeLimitWebSocketConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/MessageSizeLimitWebSocketConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/MessageSizeLimitWebSocketConfiguration.java index dfd9f5dcdb32..303e245f24f8 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/MessageSizeLimitWebSocketConfiguration.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/MessageSizeLimitWebSocketConfiguration.java @@ -17,7 +17,9 @@ package org.springframework.docs.web.websocket.stomp.websocketstompconfigurationperformance; import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration; From 0e9bd82806925663a5ecd4bd438130a9d4b59717 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 16:50:10 +0100 Subject: [PATCH 04/42] break ci > Checkstyle rule violations were found. --- src/nohttp/checkstyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index 72747c383bcb..dbedf1e9d54b 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -16,7 +16,7 @@ - + From 5a4df038866ed4fdcd5eacde3ce882256990a6fa Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 21:06:13 +0100 Subject: [PATCH 05/42] wip --- src/nohttp/checkstyle.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index dbedf1e9d54b..67dc5180132b 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -15,9 +15,8 @@ - - - + + From 8b7fc53b018e44bd4ef4eb73c98b91b8292cf89c Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 21:28:19 +0100 Subject: [PATCH 06/42] wip --- buildSrc/config/checkstyle/checkstyle.xml | 4 ++-- .../assertj/mockmvctesterrequests/HotelControllerTests.java | 1 + .../WebSocketConfiguration.java | 2 ++ .../WebSocketConfiguration.java | 1 + .../stomp/websocketstompmessageflow/GreetingController.java | 5 +++++ .../ReceiveOrderWebSocketConfiguration.java | 1 + src/checkstyle/checkstyle.xml | 2 +- src/nohttp/checkstyle.xml | 6 +++--- 8 files changed, 16 insertions(+), 6 deletions(-) diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index 9b0beb144f05..7bd5637082bf 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -18,8 +18,8 @@ - + - + diff --git a/framework-docs/src/main/java/org/springframework/docs/testing/mockmvc/assertj/mockmvctesterrequests/HotelControllerTests.java b/framework-docs/src/main/java/org/springframework/docs/testing/mockmvc/assertj/mockmvctesterrequests/HotelControllerTests.java index 6e94e21d3462..b72da0454c8e 100644 --- a/framework-docs/src/main/java/org/springframework/docs/testing/mockmvc/assertj/mockmvctesterrequests/HotelControllerTests.java +++ b/framework-docs/src/main/java/org/springframework/docs/testing/mockmvc/assertj/mockmvctesterrequests/HotelControllerTests.java @@ -21,6 +21,7 @@ import org.springframework.test.web.servlet.assertj.MvcTestResult; import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; /** * @author Stephane Nicoll diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/WebSocketConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/WebSocketConfiguration.java index ec2007456df4..82d556dd59de 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/WebSocketConfiguration.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompconfigurationperformance/WebSocketConfiguration.java @@ -17,7 +17,9 @@ package org.springframework.docs.web.websocket.stomp.websocketstompconfigurationperformance; import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration; diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomphandlesimplebroker/WebSocketConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomphandlesimplebroker/WebSocketConfiguration.java index 9ea344f8556b..b6518257ce66 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomphandlesimplebroker/WebSocketConfiguration.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomphandlesimplebroker/WebSocketConfiguration.java @@ -22,6 +22,7 @@ import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.scheduling.TaskScheduler; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; // tag::snippet[] diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompmessageflow/GreetingController.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompmessageflow/GreetingController.java index 65d1ec09f9e4..9f8302ac11f2 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompmessageflow/GreetingController.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstompmessageflow/GreetingController.java @@ -19,8 +19,13 @@ import java.text.SimpleDateFormat; import java.util.Date; +import org.springframework.context.annotation.Configuration; import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.stereotype.Controller; +import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; // tag::snippet[] @Controller diff --git a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomporderedmessages/ReceiveOrderWebSocketConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomporderedmessages/ReceiveOrderWebSocketConfiguration.java index a2ab578f546d..9f787007bf64 100644 --- a/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomporderedmessages/ReceiveOrderWebSocketConfiguration.java +++ b/framework-docs/src/main/java/org/springframework/docs/web/websocket/stomp/websocketstomporderedmessages/ReceiveOrderWebSocketConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.docs.web.websocket.stomp.websocketstomporderedmessages; import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 5173f4c1b295..27cb6634c0f8 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -245,7 +245,7 @@ - + diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index 67dc5180132b..e205d1c766a5 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -17,8 +17,8 @@ - - - + + + From f3bb11eb0d9ad88e72d46e632e54792265f1e006 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 21:31:04 +0100 Subject: [PATCH 07/42] doc --- buildSrc/config/checkstyle/checkstyle.xml | 2 +- src/nohttp/checkstyle.xml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index 7bd5637082bf..0110351a167d 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -20,6 +20,6 @@ - + diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index e205d1c766a5..215ba63ce466 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -16,9 +16,8 @@ + + - - - From 9a0245f0e45bc142c569854678c79b5011bc3aa1 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 21:32:59 +0100 Subject: [PATCH 08/42] apply VariableDeclarationUsageDistance --- buildSrc/config/checkstyle/checkstyle.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index 0110351a167d..a89b8972eb9b 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -20,6 +20,7 @@ + From 71b56e73d0b52d86f3816eae8b95f90631b8449e Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 21:34:01 +0100 Subject: [PATCH 09/42] wip --- src/checkstyle/checkstyle.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 27cb6634c0f8..6c513cfb55da 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -246,7 +246,8 @@ - + + From e42192aa8a6dfc9009fd71a3351a76ce2046079d Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 24 Feb 2025 21:47:14 +0100 Subject: [PATCH 10/42] RemoveUnusedPrivateFields --- init.gradle | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 init.gradle diff --git a/init.gradle b/init.gradle new file mode 100644 index 000000000000..08f98252c25f --- /dev/null +++ b/init.gradle @@ -0,0 +1,23 @@ +initscript { + repositories { + maven { url "https://plugins.gradle.org/m2" } + } + dependencies { classpath("org.openrewrite:plugin:7.1.5") } +} +rootProject { + plugins.apply(org.openrewrite.gradle.RewritePlugin) + dependencies { + rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.3.0") + } + rewrite { + activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateFields") + setExportDatatables(true) + } + afterEvaluate { + if (repositories.isEmpty()) { + repositories { + mavenCentral() + } + } + } +} From d0be9583fb36b29707a396d0fbd6b16616ec1559 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 08:30:33 +0100 Subject: [PATCH 11/42] RemoveUnusedPrivateMethods --- init.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/init.gradle b/init.gradle index 08f98252c25f..ab146e564304 100644 --- a/init.gradle +++ b/init.gradle @@ -11,6 +11,7 @@ rootProject { } rewrite { activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateFields") + activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods") setExportDatatables(true) } afterEvaluate { From 67ee89400a407bf6311b4091b195d9a8fb713cde Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 08:30:35 +0100 Subject: [PATCH 12/42] RemoveUnusedPrivateMethods --- init.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.gradle b/init.gradle index ab146e564304..2257ef8a405c 100644 --- a/init.gradle +++ b/init.gradle @@ -11,7 +11,7 @@ rootProject { } rewrite { activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateFields") - activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods") +// activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods") setExportDatatables(true) } afterEvaluate { From 33af2eca455df21fddb5bd7d56ebf3a998f53fd8 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 08:33:14 +0100 Subject: [PATCH 13/42] fix /ServiceLocatorFactoryBeanTests.java:130:17: Unused local variable 'testBean'. [UnusedLocalVariable] --- .../factory/config/ServiceLocatorFactoryBeanTests.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index 45956f2c1f0b..042ebf353ca5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -126,10 +126,9 @@ void testStringArgGetter() throws Exception { // test string-arg getter with null id TestServiceLocator2 factory = (TestServiceLocator2) bf.getBean("factory"); - @SuppressWarnings("unused") - TestService testBean = factory.getTestService(null); + factory.getTestService(null); // now test with explicit id - testBean = factory.getTestService("testService"); + factory.getTestService("testService"); // now verify failure on bad id assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> factory.getTestService("bogusTestService")); @@ -303,8 +302,6 @@ public interface TestService2Locator { public interface ServiceLocatorInterfaceWithExtraNonCompliantMethod { - TestService2 getTestService(); - TestService2 getTestService(String serviceName, String defaultNotAllowedParameter); } From 24c4d917569d5d7b6d1e5073bcf3a662e2fac3b3 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:20:00 +0100 Subject: [PATCH 14/42] SpelCompilationCoverageTests.java:7148:25: Unused local variable 'outer'. [UnusedLocalVariable] --- .../expression/spel/SpelCompilationCoverageTests.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java index 0bae62c0dc84..c0bab0b5f512 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java @@ -7145,8 +7145,7 @@ public TestClass9(int i) { static class HttpServlet3RequestFactory { static Servlet3SecurityContextHolderAwareRequestWrapper getOne() { - HttpServlet3RequestFactory outer = new HttpServlet3RequestFactory(); - return outer.new Servlet3SecurityContextHolderAwareRequestWrapper(); + return new HttpServlet3RequestFactory().new Servlet3SecurityContextHolderAwareRequestWrapper(); } // private class Servlet3SecurityContextHolderAwareRequestWrapper extends SecurityContextHolderAwareRequestWrapper From 19bdae2b2e3d8197e0ac55ccc140090903f119a4 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:28:49 +0100 Subject: [PATCH 15/42] add assertion --- .../aot/test/SampleReflection.java | 8 ++- .../test/web/client/samples/SampleTests.java | 51 ++++++++----------- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java b/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java index 3f8cbadffc61..145daefd87f3 100644 --- a/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java +++ b/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java @@ -26,15 +26,13 @@ public class SampleReflection { @SuppressWarnings("unused") public void sample() { - String value = "Sample"; - Method[] methods = String.class.getMethods(); + String.class.getMethods(); } @SuppressWarnings("unused") public void multipleCalls() { - String value = "Sample"; - Method[] methods = String.class.getMethods(); - methods = Integer.class.getMethods(); + String.class.getMethods(); + Integer.class.getMethods(); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java index 82c1d5a0dc42..211b2fc97a9f 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java @@ -37,6 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.springframework.http.HttpMethod.GET; +import static org.springframework.http.MediaType.TEXT_PLAIN; import static org.springframework.test.web.client.ExpectedCount.manyTimes; import static org.springframework.test.web.client.ExpectedCount.never; import static org.springframework.test.web.client.ExpectedCount.once; @@ -69,11 +71,10 @@ public void performGet() { String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; - this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) + this.mockServer.expect(requestTo("/composers/42")).andExpect(method(GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); - @SuppressWarnings("unused") - Person ludwig = this.restTemplate.getForObject("/composers/{id}", Person.class, 42); + this.restTemplate.getForObject("/composers/{id}", Person.class, 42); // We are only validating the request. The response is mocked out. // hotel.getId() == 42 @@ -87,11 +88,10 @@ public void performGetManyTimes() { String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; - this.mockServer.expect(manyTimes(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) + this.mockServer.expect(manyTimes(), requestTo("/composers/42")).andExpect(method(GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); - @SuppressWarnings("unused") - Person ludwig = this.restTemplate.getForObject("/composers/{id}", Person.class, 42); + this.restTemplate.getForObject("/composers/{id}", Person.class, 42); // We are only validating the request. The response is mocked out. // hotel.getId() == 42 @@ -109,9 +109,9 @@ public void expectNever() { String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; - this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) + this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); - this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(HttpMethod.GET)) + this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); this.restTemplate.getForObject("/composers/{id}", Person.class, 42); @@ -124,9 +124,9 @@ public void expectNeverViolated() { String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; - this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) + this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); - this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(HttpMethod.GET)) + this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); this.restTemplate.getForObject("/composers/{id}", Person.class, 42); @@ -139,11 +139,10 @@ public void performGetWithResponseBodyFromFile() { Resource responseBody = new ClassPathResource("ludwig.json", this.getClass()); - this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) + this.mockServer.expect(requestTo("/composers/42")).andExpect(method(GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); - @SuppressWarnings("unused") - Person ludwig = this.restTemplate.getForObject("/composers/{id}", Person.class, 42); + this.restTemplate.getForObject("/composers/{id}", Person.class, 42); // hotel.getId() == 42 // hotel.getName().equals("Holiday Inn") @@ -154,25 +153,19 @@ public void performGetWithResponseBodyFromFile() { @Test public void verify() { - this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET)) - .andRespond(withSuccess("1", MediaType.TEXT_PLAIN)); - - this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET)) - .andRespond(withSuccess("2", MediaType.TEXT_PLAIN)); + this.mockServer.expect(requestTo("/number")).andExpect(method(GET)) + .andRespond(withSuccess("1", TEXT_PLAIN)); - this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET)) - .andRespond(withSuccess("4", MediaType.TEXT_PLAIN)); + this.mockServer.expect(requestTo("/number")).andExpect(method(GET)) + .andRespond(withSuccess("2", TEXT_PLAIN)); - this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET)) - .andRespond(withSuccess("8", MediaType.TEXT_PLAIN)); + this.mockServer.expect(requestTo("/number")).andExpect(method(GET)) + .andRespond(withSuccess("4", TEXT_PLAIN)); - @SuppressWarnings("unused") - String result1 = this.restTemplate.getForObject("/number", String.class); - // result1 == "1" + this.mockServer.expect(requestTo("/number")).andExpect(method(GET)).andRespond(withSuccess("8", TEXT_PLAIN)); - @SuppressWarnings("unused") - String result2 = this.restTemplate.getForObject("/number", String.class); - // result == "2" + assertThat(this.restTemplate.getForObject("/number", String.class)).isEqualTo("1"); + assertThat(this.restTemplate.getForObject("/number", String.class)).isEqualTo("2"); try { this.mockServer.verify(); @@ -195,7 +188,7 @@ public void repeatedAccessToResponseViaResource() { .bufferContent() // enable repeated reads of response body .build(); - mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) + mockServer.expect(requestTo("/composers/42")).andExpect(method(GET)) .andRespond(withSuccess(resource, MediaType.APPLICATION_JSON)); restTemplate.getForObject("/composers/{id}", Person.class, 42); From 413d322b115517f2017361bfb433c85263290ec8 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:30:38 +0100 Subject: [PATCH 16/42] unused --- .../web/servlet/handler/HandlerMethodMappingTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java index 9e3b3cf41511..5fb59a0370c0 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java @@ -289,7 +289,7 @@ void getCorsConfigWithBeanNameHandler() throws Exception { this.mapping.setApplicationContext(context); this.mapping.registerMapping(key, beanName, this.method1); - HandlerMethod handlerMethod = this.mapping.getHandlerInternal(new MockHttpServletRequest("GET", key)); + this.mapping.getHandlerInternal(new MockHttpServletRequest("GET", key)); } @Test From d23950e1b9880226330879fd4d7865f4ac6ac1da Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:31:58 +0100 Subject: [PATCH 17/42] UnusedLocalVariable --- src/checkstyle/checkstyle.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 6c513cfb55da..8f836f63660e 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -247,7 +247,6 @@ - From 96d31fe483c258fcbedb3a7a3ce1522906987794 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:32:32 +0100 Subject: [PATCH 18/42] UnusedLocalVariable --- init.gradle | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 init.gradle diff --git a/init.gradle b/init.gradle deleted file mode 100644 index 2257ef8a405c..000000000000 --- a/init.gradle +++ /dev/null @@ -1,24 +0,0 @@ -initscript { - repositories { - maven { url "https://plugins.gradle.org/m2" } - } - dependencies { classpath("org.openrewrite:plugin:7.1.5") } -} -rootProject { - plugins.apply(org.openrewrite.gradle.RewritePlugin) - dependencies { - rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.3.0") - } - rewrite { - activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateFields") -// activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods") - setExportDatatables(true) - } - afterEvaluate { - if (repositories.isEmpty()) { - repositories { - mavenCentral() - } - } - } -} From 2055377a2bf19218349a7086676d15f8539b9aaa Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:34:48 +0100 Subject: [PATCH 19/42] form --- .../config/ServiceLocatorFactoryBeanTests.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index 042ebf353ca5..a02143227a72 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -123,15 +123,11 @@ void testStringArgGetter() throws Exception { .addPropertyValue("serviceLocatorInterface", TestServiceLocator2.class) .getBeanDefinition()); - // test string-arg getter with null id - TestServiceLocator2 factory = (TestServiceLocator2) bf.getBean("factory"); - - factory.getTestService(null); - // now test with explicit id - factory.getTestService("testService"); - // now verify failure on bad id - assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> - factory.getTestService("bogusTestService")); + final var factory = (TestServiceLocator2) bf.getBean("factory"); // test string-arg getter + factory.getTestService(null); // with null id + factory.getTestService("testService"); // test with explicit id + assertThatExceptionOfType(NoSuchBeanDefinitionException.class) + .isThrownBy(() -> factory.getTestService("bogusTestService")); // verify failure on bad id } @Disabled @Test // worked when using an ApplicationContext (see commented), fails when using BeanFactory From d50507780aa4e039a5382292617298edbb5fb742 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:35:08 +0100 Subject: [PATCH 20/42] dead code --- .../config/ServiceLocatorFactoryBeanTests.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index a02143227a72..7443cd93d83d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -140,14 +140,6 @@ public void testCombinedLocatorInterface() { .addPropertyValue("serviceLocatorInterface", TestServiceLocator3.class) .getBeanDefinition()); -// StaticApplicationContext ctx = new StaticApplicationContext(); -// ctx.registerPrototype("testService", TestService.class, new MutablePropertyValues()); -// ctx.registerAlias("testService", "1"); -// MutablePropertyValues mpv = new MutablePropertyValues(); -// mpv.addPropertyValue("serviceLocatorInterface", TestServiceLocator3.class); -// ctx.registerSingleton("factory", ServiceLocatorFactoryBean.class, mpv); -// ctx.refresh(); - TestServiceLocator3 factory = (TestServiceLocator3) bf.getBean("factory"); TestService testBean1 = factory.getTestService(); TestService testBean2 = factory.getTestService("testService"); @@ -172,16 +164,6 @@ public void testServiceMappings() { .addPropertyValue("serviceLocatorInterface", TestServiceLocator3.class) .addPropertyValue("serviceMappings", "=testService1\n1=testService1\n2=testService2") .getBeanDefinition()); - -// StaticApplicationContext ctx = new StaticApplicationContext(); -// ctx.registerPrototype("testService1", TestService.class, new MutablePropertyValues()); -// ctx.registerPrototype("testService2", ExtendedTestService.class, new MutablePropertyValues()); -// MutablePropertyValues mpv = new MutablePropertyValues(); -// mpv.addPropertyValue("serviceLocatorInterface", TestServiceLocator3.class); -// mpv.addPropertyValue("serviceMappings", "=testService1\n1=testService1\n2=testService2"); -// ctx.registerSingleton("factory", ServiceLocatorFactoryBean.class, mpv); -// ctx.refresh(); - TestServiceLocator3 factory = (TestServiceLocator3) bf.getBean("factory"); TestService testBean1 = factory.getTestService(); TestService testBean2 = factory.getTestService("testService1"); From f6ff1f6308ea64441a1dd4afa5f61737d72759f0 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:42:58 +0100 Subject: [PATCH 21/42] form --- src/nohttp/checkstyle.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index 215ba63ce466..07fab0d41f6b 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -16,8 +16,7 @@ - - + From b435f48b312c8066b5a6745fa00ec18862842fe8 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:46:11 +0100 Subject: [PATCH 22/42] fix import --- .../java/org/springframework/aot/test/SampleReflection.java | 4 ---- src/checkstyle/checkstyle.xml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java b/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java index 145daefd87f3..56dd5f5cd03d 100644 --- a/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java +++ b/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java @@ -16,20 +16,16 @@ package org.springframework.aot.test; -import java.lang.reflect.Method; - /** * @author Brian Clozel * @since 6.0 */ public class SampleReflection { - @SuppressWarnings("unused") public void sample() { String.class.getMethods(); } - @SuppressWarnings("unused") public void multipleCalls() { String.class.getMethods(); Integer.class.getMethods(); diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 8f836f63660e..8357cb4d0ef7 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -16,6 +16,10 @@ + + + + From 867fcc257d5b5728a9d2fac3195a6b77897c6153 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:47:47 +0100 Subject: [PATCH 23/42] align format --- .../core/beans/dependencies/factory-properties-detailed.adoc | 2 +- .../test/context/expression/ExpressionUsageTests-context.xml | 4 ++-- src/checkstyle/checkstyle.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc b/framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc index 90fd4106a1ad..e3912f7933f9 100644 --- a/framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc +++ b/framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc @@ -169,7 +169,7 @@ listings shows how to use the `parent` attribute: [source,xml,indent=0,subs="verbatim,quotes"] ---- - diff --git a/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml index e14ec42fcd33..e0db679a6744 100644 --- a/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml +++ b/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml @@ -38,7 +38,7 @@ - + - \ No newline at end of file + diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 8357cb4d0ef7..5d5012c430ef 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -13,7 +13,7 @@ - + From bd11e5c192d5622312cbe003a682e652428c357d Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:49:33 +0100 Subject: [PATCH 24/42] sort imoprt --- .../test/web/client/samples/SampleTests.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java index 211b2fc97a9f..ddecfad19f46 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java @@ -16,15 +16,10 @@ package org.springframework.test.web.client.samples; -import java.io.IOException; -import java.util.Collections; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import org.springframework.http.HttpMethod; import org.springframework.http.HttpRequest; import org.springframework.http.MediaType; import org.springframework.http.client.ClientHttpRequestExecution; @@ -35,6 +30,9 @@ import org.springframework.util.FileCopyUtils; import org.springframework.web.client.RestTemplate; +import java.io.IOException; +import java.util.Collections; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.springframework.http.HttpMethod.GET; From 199648f27f5c71fb2db3edcbf7a1ba38bb84de78 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:53:04 +0100 Subject: [PATCH 25/42] fix sort --- .../test/web/client/samples/SampleTests.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java index ddecfad19f46..b178eef79cd0 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java @@ -16,8 +16,12 @@ package org.springframework.test.web.client.samples; +import java.io.IOException; +import java.util.Collections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.http.HttpRequest; @@ -30,9 +34,6 @@ import org.springframework.util.FileCopyUtils; import org.springframework.web.client.RestTemplate; -import java.io.IOException; -import java.util.Collections; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.springframework.http.HttpMethod.GET; From dbc528b679c8c6cfecc7651ea4937ec6b2beaf84 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 09:54:42 +0100 Subject: [PATCH 26/42] align .editorconfig --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 3e1127a6d670..4feb8079a18a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,10 +1,10 @@ root = true -[*.{adoc,bat,groovy,html,java,js,jsp,kt,kts,md,properties,py,rb,sh,sql,svg,txt,xml,xsd}] +[*] charset = utf-8 +end_of_line = lf [*.{groovy,java,kt,kts,xml,xsd}] indent_style = tab indent_size = 4 continuation_indent_size = 8 -end_of_line = lf From 504b6c35a8b5d6128812cc0136168d26546cbec3 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 10:25:56 +0100 Subject: [PATCH 27/42] doc --- .../springframework/aot/test/ReflectionInvocationsTests.java | 4 ++-- .../java/org/springframework/aot/test/SampleReflection.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java b/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java index 1a1123c22670..3422676262d5 100644 --- a/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java +++ b/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java @@ -36,7 +36,7 @@ void sampleTest() { RuntimeHintsInvocations invocations = org.springframework.aot.test.agent.RuntimeHintsRecorder.record(() -> { SampleReflection sample = new SampleReflection(); - sample.sample(); // does Method[] methods = String.class.getMethods(); + sample.sample(); // does String.class.getMethods(); }); assertThat(invocations).match(hints); } @@ -48,7 +48,7 @@ void multipleCallsTest() { hints.reflection().registerType(Integer.class); RuntimeHintsInvocations invocations = org.springframework.aot.test.agent.RuntimeHintsRecorder.record(() -> { SampleReflection sample = new SampleReflection(); - sample.multipleCalls(); // does Method[] methods = String.class.getMethods(); methods = Integer.class.getMethods(); + sample.multipleCalls(); // does String.class.getMethods(); Integer.class.getMethods(); }); assertThat(invocations).match(hints); } diff --git a/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java b/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java index 56dd5f5cd03d..cb8968f65a26 100644 --- a/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java +++ b/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java @@ -27,8 +27,8 @@ public void sample() { } public void multipleCalls() { - String.class.getMethods(); - Integer.class.getMethods(); +// String.class.getMethods(); +// Integer.class.getMethods(); } } From a1e4d0af3e2b44eaa067fc7441eebce937f60c10 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 10:26:21 +0100 Subject: [PATCH 28/42] check test --- .../java/org/springframework/aot/test/SampleReflection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java b/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java index cb8968f65a26..bd4779ccd474 100644 --- a/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java +++ b/integration-tests/src/test/java/org/springframework/aot/test/SampleReflection.java @@ -28,7 +28,7 @@ public void sample() { public void multipleCalls() { // String.class.getMethods(); -// Integer.class.getMethods(); + Integer.class.getMethods(); } } From bf1da9a4c240d074a266613e6517f461fc373795 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 10:28:44 +0100 Subject: [PATCH 29/42] inline --- .../aot/test/ReflectionInvocationsTests.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java b/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java index 3422676262d5..f5a54aed1688 100644 --- a/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java +++ b/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java @@ -20,7 +20,7 @@ import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.test.agent.EnabledIfRuntimeHintsAgent; -import org.springframework.aot.test.agent.RuntimeHintsInvocations; +import org.springframework.aot.test.agent.RuntimeHintsRecorder; import static org.assertj.core.api.Assertions.assertThat; @@ -34,11 +34,10 @@ void sampleTest() { RuntimeHints hints = new RuntimeHints(); hints.reflection().registerType(String.class); - RuntimeHintsInvocations invocations = org.springframework.aot.test.agent.RuntimeHintsRecorder.record(() -> { + assertThat(RuntimeHintsRecorder.record(() -> { SampleReflection sample = new SampleReflection(); sample.sample(); // does String.class.getMethods(); - }); - assertThat(invocations).match(hints); + })).match(hints); } @Test @@ -46,11 +45,11 @@ void multipleCallsTest() { RuntimeHints hints = new RuntimeHints(); hints.reflection().registerType(String.class); hints.reflection().registerType(Integer.class); - RuntimeHintsInvocations invocations = org.springframework.aot.test.agent.RuntimeHintsRecorder.record(() -> { + + assertThat(RuntimeHintsRecorder.record(() -> { SampleReflection sample = new SampleReflection(); sample.multipleCalls(); // does String.class.getMethods(); Integer.class.getMethods(); - }); - assertThat(invocations).match(hints); + })).match(hints); } } From be7cc10cc05922d215bc55922a572eb0c82ae8de Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 10:29:31 +0100 Subject: [PATCH 30/42] doc --- .../springframework/aot/test/ReflectionInvocationsTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java b/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java index f5a54aed1688..ca90f1e8430a 100644 --- a/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java +++ b/integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java @@ -36,7 +36,7 @@ void sampleTest() { assertThat(RuntimeHintsRecorder.record(() -> { SampleReflection sample = new SampleReflection(); - sample.sample(); // does String.class.getMethods(); + sample.sample(); // String.class.getMethods(); })).match(hints); } @@ -48,7 +48,7 @@ void multipleCallsTest() { assertThat(RuntimeHintsRecorder.record(() -> { SampleReflection sample = new SampleReflection(); - sample.multipleCalls(); // does String.class.getMethods(); Integer.class.getMethods(); + sample.multipleCalls(); // String.class.getMethods(); Integer.class.getMethods(); })).match(hints); } From e59c7007b5cd2bb1a0efcad2ff2fbcdf1c8e331d Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 12:48:20 +0100 Subject: [PATCH 31/42] EmptyStatement --- buildSrc/config/checkstyle/checkstyle.xml | 1 + src/checkstyle/checkstyle.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index a89b8972eb9b..e62387d89393 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -20,6 +20,7 @@ + diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 5d5012c430ef..9999d78323b6 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -251,6 +251,7 @@ + From a9e09bfcda7821657bd83317e4c9168fecd3e24c Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 12:51:47 +0100 Subject: [PATCH 32/42] apply EmptyStatement --- buildSrc/config/checkstyle/checkstyle.xml | 2 +- src/checkstyle/checkstyle.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index e62387d89393..d6cbe04ad760 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -20,7 +20,7 @@ - + diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 9999d78323b6..ce20e0ddbde2 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -55,7 +55,6 @@ - @@ -251,7 +250,7 @@ - + From ed592cea5c705e70951c161c15694c182230511b Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 12:54:01 +0100 Subject: [PATCH 33/42] VariableDeclarationUsageDistance --- src/checkstyle/checkstyle.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index ce20e0ddbde2..61223060c5cb 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -252,6 +252,7 @@ - + + From 4e441b3a45d0f8be4b2b3506ff7ecba4100394a8 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 13:41:09 +0100 Subject: [PATCH 34/42] unused UnusedLocalMethod --- buildSrc/config/checkstyle/checkstyle.xml | 1 - src/checkstyle/checkstyle.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index d6cbe04ad760..7ecdd29926d3 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -21,7 +21,6 @@ - diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 61223060c5cb..12cb2d249684 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -251,7 +251,6 @@ - From 8b5c79724624d1c0e3b39bc8c635072fb8a927ad Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 16:04:08 +0100 Subject: [PATCH 35/42] undo --- .../core/beans/dependencies/factory-properties-detailed.adoc | 2 +- .../test/context/expression/ExpressionUsageTests-context.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc b/framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc index e3912f7933f9..90fd4106a1ad 100644 --- a/framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc +++ b/framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc @@ -169,7 +169,7 @@ listings shows how to use the `parent` attribute: [source,xml,indent=0,subs="verbatim,quotes"] ---- - diff --git a/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml index e0db679a6744..e14ec42fcd33 100644 --- a/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml +++ b/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml @@ -38,7 +38,7 @@ - + - + \ No newline at end of file From 784297785759ee70abe3719e6336a6939972fea7 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 16:07:47 +0100 Subject: [PATCH 36/42] add UnusedLocalVariable" --- src/nohttp/checkstyle.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index 07fab0d41f6b..8cdec76e13d6 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -18,5 +18,6 @@ + From 423200b4c02d1b4a9d03e2030650784f9371049b Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 16:08:46 +0100 Subject: [PATCH 37/42] ignore --- src/nohttp/checkstyle.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index 8cdec76e13d6..ae1fcc43c050 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -16,8 +16,8 @@ - - + + From 71be52035b2a3a4507bc789de28646536afbcd97 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 16:11:12 +0100 Subject: [PATCH 38/42] ignore --- src/nohttp/checkstyle.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index ae1fcc43c050..d8d5c12a7383 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -17,7 +17,9 @@ - - + + + + From c08f7c164d4c87d6d80eeb2edbe3b105982041fc Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 16:14:13 +0100 Subject: [PATCH 39/42] ignored as --- src/nohttp/checkstyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml index d8d5c12a7383..85186bd76a1a 100644 --- a/src/nohttp/checkstyle.xml +++ b/src/nohttp/checkstyle.xml @@ -17,7 +17,7 @@ - + From 4ddde8dd4cc456fa9353fc763cc30758ebaf60dd Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 16:17:28 +0100 Subject: [PATCH 40/42] sort --- buildSrc/config/checkstyle/checkstyle.xml | 2 +- src/checkstyle/checkstyle.xml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index 7ecdd29926d3..a58ebe3fe653 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -19,8 +19,8 @@ - + diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 12cb2d249684..795c4470e71d 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -249,9 +249,8 @@ - - - + + From bd7eb42b2a8e4dfacd7e71100373d80262c998c4 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 16:52:57 +0100 Subject: [PATCH 41/42] undo --- .../test/web/client/samples/SampleTests.java | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java index b178eef79cd0..46c90b8f88bc 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java @@ -24,6 +24,7 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; +import org.springframework.http.HttpMethod; import org.springframework.http.HttpRequest; import org.springframework.http.MediaType; import org.springframework.http.client.ClientHttpRequestExecution; @@ -36,8 +37,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.springframework.http.HttpMethod.GET; -import static org.springframework.http.MediaType.TEXT_PLAIN; import static org.springframework.test.web.client.ExpectedCount.manyTimes; import static org.springframework.test.web.client.ExpectedCount.never; import static org.springframework.test.web.client.ExpectedCount.once; @@ -70,8 +69,8 @@ public void performGet() { String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; - this.mockServer.expect(requestTo("/composers/42")).andExpect(method(GET)) - .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); + this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); this.restTemplate.getForObject("/composers/{id}", Person.class, 42); @@ -87,7 +86,7 @@ public void performGetManyTimes() { String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; - this.mockServer.expect(manyTimes(), requestTo("/composers/42")).andExpect(method(GET)) + this.mockServer.expect(manyTimes(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); this.restTemplate.getForObject("/composers/{id}", Person.class, 42); @@ -108,9 +107,9 @@ public void expectNever() { String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; - this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(GET)) + this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); - this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(GET)) + this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(HttpMethod.GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); this.restTemplate.getForObject("/composers/{id}", Person.class, 42); @@ -123,9 +122,9 @@ public void expectNeverViolated() { String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; - this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(GET)) + this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); - this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(GET)) + this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(HttpMethod.GET)) .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); this.restTemplate.getForObject("/composers/{id}", Person.class, 42); @@ -138,8 +137,8 @@ public void performGetWithResponseBodyFromFile() { Resource responseBody = new ClassPathResource("ludwig.json", this.getClass()); - this.mockServer.expect(requestTo("/composers/42")).andExpect(method(GET)) - .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); + this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); this.restTemplate.getForObject("/composers/{id}", Person.class, 42); @@ -152,19 +151,25 @@ public void performGetWithResponseBodyFromFile() { @Test public void verify() { - this.mockServer.expect(requestTo("/number")).andExpect(method(GET)) - .andRespond(withSuccess("1", TEXT_PLAIN)); + this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess("1", MediaType.TEXT_PLAIN)); + + this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess("2", MediaType.TEXT_PLAIN)); - this.mockServer.expect(requestTo("/number")).andExpect(method(GET)) - .andRespond(withSuccess("2", TEXT_PLAIN)); + this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess("4", MediaType.TEXT_PLAIN)); - this.mockServer.expect(requestTo("/number")).andExpect(method(GET)) - .andRespond(withSuccess("4", TEXT_PLAIN)); + this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess("8", MediaType.TEXT_PLAIN)); - this.mockServer.expect(requestTo("/number")).andExpect(method(GET)).andRespond(withSuccess("8", TEXT_PLAIN)); + @SuppressWarnings("unused") + String result1 = this.restTemplate.getForObject("/number", String.class); + // result1 == "1" - assertThat(this.restTemplate.getForObject("/number", String.class)).isEqualTo("1"); - assertThat(this.restTemplate.getForObject("/number", String.class)).isEqualTo("2"); + @SuppressWarnings("unused") + String result2 = this.restTemplate.getForObject("/number", String.class); + // result == "2" try { this.mockServer.verify(); @@ -187,7 +192,7 @@ public void repeatedAccessToResponseViaResource() { .bufferContent() // enable repeated reads of response body .build(); - mockServer.expect(requestTo("/composers/42")).andExpect(method(GET)) + mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) .andRespond(withSuccess(resource, MediaType.APPLICATION_JSON)); restTemplate.getForObject("/composers/{id}", Person.class, 42); @@ -207,7 +212,7 @@ private ContentInterceptor(Resource resource) { @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, - ClientHttpRequestExecution execution) throws IOException { + ClientHttpRequestExecution execution) throws IOException { ClientHttpResponse response = execution.execute(request, body); byte[] expected = FileCopyUtils.copyToByteArray(this.resource.getInputStream()); From 520a35acde7003f430b5fbd30c9bccc8295db456 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Tue, 25 Feb 2025 16:53:54 +0100 Subject: [PATCH 42/42] undo --- .../springframework/test/web/client/samples/SampleTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java index 46c90b8f88bc..150c7844c295 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java @@ -138,7 +138,7 @@ public void performGetWithResponseBodyFromFile() { Resource responseBody = new ClassPathResource("ludwig.json", this.getClass()); this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET)) - .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); + .andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON)); this.restTemplate.getForObject("/composers/{id}", Person.class, 42);