diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java
index c2e8f12b1d53..10a4a1529360 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java
@@ -91,7 +91,7 @@ public static EndpointServerWebExchangeMatcher to(String... endpoints) {
 	 * The {@link ServerWebExchangeMatcher} used to match against {@link Endpoint actuator
 	 * endpoints}.
 	 */
-	public final static class EndpointServerWebExchangeMatcher
+	public static final class EndpointServerWebExchangeMatcher
 			extends ApplicationContextServerWebExchangeMatcher<PathMappedEndpoints> {
 
 		private final List<Object> includes;
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
index eea3d75110ab..aa14db5b673e 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
@@ -89,7 +89,7 @@ public static EndpointRequestMatcher to(String... endpoints) {
 	/**
 	 * The request matcher used to match against {@link Endpoint actuator endpoints}.
 	 */
-	public final static class EndpointRequestMatcher
+	public static final class EndpointRequestMatcher
 			extends ApplicationContextRequestMatcher<PathMappedEndpoints> {
 
 		private final List<Object> includes;
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java
index e4a43d98457b..f1024e9241cf 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java
@@ -164,7 +164,7 @@ private <T> void assertDetail(Map<String, Object> details, String detail, T valu
 		assertThat((T) details.get(detail)).isEqualTo(value);
 	}
 
-	private final static class StubClusterHealthResponse extends ClusterHealthResponse {
+	private static final class StubClusterHealthResponse extends ClusterHealthResponse {
 
 		private final ClusterHealthStatus status;
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/StaticResourceRequest.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/StaticResourceRequest.java
index 6e3ffb32c9e0..bb2b2d85b4bc 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/StaticResourceRequest.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/StaticResourceRequest.java
@@ -92,7 +92,7 @@ public StaticResourceServerWebExchange at(Set<StaticResourceLocation> locations)
 	 * The server web exchange matcher used to match against resource
 	 * {@link StaticResourceLocation Locations}.
 	 */
-	public final static class StaticResourceServerWebExchange
+	public static final class StaticResourceServerWebExchange
 			implements ServerWebExchangeMatcher {
 
 		private final Set<StaticResourceLocation> locations;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
index 748a65052f40..82c166146c93 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
@@ -319,7 +319,7 @@ private TransportConfiguration getSingleTransportConfiguration(
 		return transportConfigurations[0];
 	}
 
-	private final static class DestinationChecker {
+	private static final class DestinationChecker {
 
 		private final JmsTemplate jmsTemplate;
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
index ee647430a7e6..9083a781ba2c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
@@ -64,7 +64,7 @@ private static TestableContext getContext() {
 		return context;
 	}
 
-	private final static class TestableContext extends InitialContext {
+	private static final class TestableContext extends InitialContext {
 
 		private final Map<String, Object> bindings = new HashMap<>();
 
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java
index d8a929489f1c..74a8b25e5fb9 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java
@@ -45,7 +45,7 @@ public class HttpTunnelPayload {
 
 	private static final int BUFFER_SIZE = 1024 * 100;
 
-	protected final static char[] HEX_CHARS = "0123456789ABCDEF".toCharArray();
+	protected static final char[] HEX_CHARS = "0123456789ABCDEF".toCharArray();
 
 	private static final Log logger = LogFactory.getLog(HttpTunnelPayload.class);
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/LambdaSafe.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/LambdaSafe.java
index 5001793555a6..04c854530671 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/LambdaSafe.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/LambdaSafe.java
@@ -370,7 +370,7 @@ public boolean match(Class<C> callbackType, C callbackInstance, A argument,
 	 * {@code null} as a valid value.
 	 * @param <R> The result type
 	 */
-	public final static class InvocationResult<R> {
+	public static final class InvocationResult<R> {
 
 		private static final InvocationResult<?> NONE = new InvocationResult<>(null);