From 5c6232e681983b5f9f56f210733058310a618668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <snicoll@vmware.com>
Date: Tue, 17 Oct 2023 16:14:29 +0200
Subject: [PATCH] Polish "Order modifiers to align with JLS"

See gh-31368
---
 buildSrc/config/checkstyle/checkstyle.xml                      | 3 +++
 .../messaging/simp/broker/OrderedMessageChannelDecorator.java  | 2 +-
 .../http/client/ReactorNettyClientRequestFactory.java          | 2 +-
 src/checkstyle/checkstyle.xml                                  | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml
index d809e8dbbf..c63f232e1e 100644
--- a/buildSrc/config/checkstyle/checkstyle.xml
+++ b/buildSrc/config/checkstyle/checkstyle.xml
@@ -19,6 +19,9 @@
 			<property name="processJavadoc" value="true"/>
 		</module>
 
+		<!-- Modifiers -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
+
 	</module>
 
 </module>
\ No newline at end of file
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java
index 202c0fb4d2..5d26ccbea7 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java
@@ -204,7 +204,7 @@ public class OrderedMessageChannelDecorator implements MessageChannel {
 	}
 
 
-	private final static class CallbackTaskInterceptor implements ExecutorChannelInterceptor {
+	private static final class CallbackTaskInterceptor implements ExecutorChannelInterceptor {
 
 		@Override
 		public void afterMessageHandled(
diff --git a/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java
index 07cdb16761..694b576731 100644
--- a/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java
@@ -47,7 +47,7 @@ public class ReactorNettyClientRequestFactory implements ClientHttpRequestFactor
 
 	private static final Log logger = LogFactory.getLog(ReactorNettyClientRequestFactory.class);
 
-	private final static Function<HttpClient, HttpClient> defaultInitializer = client -> client.compress(true);
+	private static final Function<HttpClient, HttpClient> defaultInitializer = client -> client.compress(true);
 
 
 	private HttpClient httpClient;
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index 539d822732..a18fcb5b33 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -188,7 +188,7 @@
 		</module>
 
 		<!-- Modifiers -->
-		<module name="ModifierOrder" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
 
 		<!-- Miscellaneous -->
 		<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck">