From 87bf0b26df6c2c3b95530d6688e7d0ed8f3ef3d8 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 13 Feb 2018 15:21:44 +0900 Subject: [PATCH] Polish modifier order See gh-12019 --- .../autoconfigure/security/reactive/EndpointRequest.java | 2 +- .../actuate/autoconfigure/security/servlet/EndpointRequest.java | 2 +- .../elasticsearch/ElasticsearchHealthIndicatorTests.java | 2 +- .../autoconfigure/security/reactive/StaticResourceRequest.java | 2 +- .../jms/artemis/ArtemisAutoConfigurationTests.java | 2 +- .../boot/autoconfigure/jndi/TestableInitialContextFactory.java | 2 +- .../boot/devtools/tunnel/payload/HttpTunnelPayload.java | 2 +- .../src/main/java/org/springframework/boot/util/LambdaSafe.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 c2e8f12b1d..10a4a15293 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 final class EndpointRequest { * The {@link ServerWebExchangeMatcher} used to match against {@link Endpoint actuator * endpoints}. */ - public final static class EndpointServerWebExchangeMatcher + public static final class EndpointServerWebExchangeMatcher extends ApplicationContextServerWebExchangeMatcher { private final List 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 eea3d75110..aa14db5b67 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 final class EndpointRequest { /** * The request matcher used to match against {@link Endpoint actuator endpoints}. */ - public final static class EndpointRequestMatcher + public static final class EndpointRequestMatcher extends ApplicationContextRequestMatcher { private final List 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 e4a43d9845..f1024e9241 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 @@ public class ElasticsearchHealthIndicatorTests { 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 6e3ffb32c9..bb2b2d85b4 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 final class StaticResourceRequest { * 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 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 748a65052f..82c166146c 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 @@ public class ArtemisAutoConfigurationTests { 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 ee647430a7..9083a781ba 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 @@ public class TestableInitialContextFactory implements InitialContextFactory { return context; } - private final static class TestableContext extends InitialContext { + private static final class TestableContext extends InitialContext { private final Map 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 d8a929489f..74a8b25e5f 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 5001793555..04c8545306 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 final class LambdaSafe { * {@code null} as a valid value. * @param The result type */ - public final static class InvocationResult { + public static final class InvocationResult { private static final InvocationResult NONE = new InvocationResult<>(null);