Skip to content

Commit 890c28d

Browse files
snicollsnicoll
committed
Merge pull request #11681 from igor-suhorukov:master
* pr/11681: Polish "Fix modifiers order" Fix modifiers order
2 parents 322a629 + c926bed commit 890c28d

File tree

22 files changed

+38
-38
lines changed

22 files changed

+38
-38
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static EndpointServerWebExchangeMatcher to(String... endpoints) {
9191
* The {@link ServerWebExchangeMatcher} used to match against {@link Endpoint actuator
9292
* endpoints}.
9393
*/
94-
public final static class EndpointServerWebExchangeMatcher
94+
public static final class EndpointServerWebExchangeMatcher
9595
extends ApplicationContextServerWebExchangeMatcher<EndpointPathProvider> {
9696

9797
private final List<Object> includes;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public static EndpointRequestMatcher to(String... endpoints) {
8989
/**
9090
* The request matcher used to match against {@link Endpoint actuator endpoints}.
9191
*/
92-
public final static class EndpointRequestMatcher
92+
public static final class EndpointRequestMatcher
9393
extends ApplicationContextRequestMatcher<EndpointPathProvider> {
9494

9595
private final List<Object> includes;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ protected void customize(ConfigurableServletWebServerFactory webServerFactory,
109109

110110
}
111111

112-
static abstract class AccessLogCustomizer implements Ordered {
112+
abstract static class AccessLogCustomizer implements Ordered {
113113

114114
protected String customizePrefix(String prefix) {
115115
return "management_" + prefix;

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ public List<TaskDescription> getFixedRate() {
105105
/**
106106
* Base class for descriptions of a {@link Task}.
107107
*/
108-
public static abstract class TaskDescription {
108+
public abstract static class TaskDescription {
109109

110110
private static final Map<Class<? extends Task>, Function<Task, TaskDescription>> DESCRIBERS = new LinkedHashMap<>();
111111

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -139,7 +139,7 @@ public Set<Object> determineImports(AnnotationMetadata metadata) {
139139
/**
140140
* Wrapper for a package import.
141141
*/
142-
private final static class PackageImport {
142+
private static final class PackageImport {
143143

144144
private final String packageName;
145145

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ public DirectContainer getDirect() {
537537

538538
}
539539

540-
public static abstract class AmqpContainer {
540+
public abstract static class AmqpContainer {
541541

542542
/**
543543
* Whether to start the container automatically on startup.

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -246,7 +246,7 @@ public EmbeddedReactiveMongoDependencyConfiguration() {
246246
* A workaround for the lack of a {@code toString} implementation on
247247
* {@code GenericFeatureAwareVersion}.
248248
*/
249-
private final static class ToStringFriendlyFeatureAwareVersion
249+
private static final class ToStringFriendlyFeatureAwareVersion
250250
implements IFeatureAwareVersion {
251251

252252
private final String version;

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/StaticResourceRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Stream<String> getPatterns() {
127127
/**
128128
* The request matcher used to match against resource {@link Location Locations}.
129129
*/
130-
public final static class StaticResourceRequestMatcher
130+
public static final class StaticResourceRequestMatcher
131131
extends ApplicationContextRequestMatcher<ServerProperties> {
132132

133133
private final Set<Location> locations;

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -104,7 +104,7 @@ static class ReactiveSessionRepositoryConfiguration {
104104
/**
105105
* {@link ImportSelector} base class to add {@link StoreType} configuration classes.
106106
*/
107-
static abstract class SessionConfigurationImportSelector implements ImportSelector {
107+
abstract static class SessionConfigurationImportSelector implements ImportSelector {
108108

109109
protected final String[] selectImports(AnnotationMetadata importingClassMetadata,
110110
WebApplicationType webApplicationType) {
@@ -153,7 +153,7 @@ public String[] selectImports(AnnotationMetadata importingClassMetadata) {
153153
* Base class for beans used to validate that only one supported implementation is
154154
* available in the classpath when the store-type property is not set.
155155
*/
156-
static abstract class AbstractSessionRepositoryImplementationValidator {
156+
abstract static class AbstractSessionRepositoryImplementationValidator {
157157

158158
private final List<String> candidates;
159159

@@ -233,7 +233,7 @@ static class ReactiveSessionRepositoryImplementationValidator
233233
/**
234234
* Base class for validating that a (reactive) session repository bean exists.
235235
*/
236-
static abstract class AbstractSessionRepositoryValidator {
236+
abstract static class AbstractSessionRepositoryValidator {
237237

238238
private final SessionProperties sessionProperties;
239239

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/PathBasedTemplateAvailabilityProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ private boolean isTemplateAvailable(String view, ResourceLoader resourceLoader,
7474
return false;
7575
}
7676

77-
protected static abstract class TemplateAvailabilityProperties {
77+
protected abstract static class TemplateAvailabilityProperties {
7878

7979
private String prefix;
8080

‎spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -227,7 +227,7 @@ private Map<String, String> parseStringItems(JSONObject json) throws JSONExcepti
227227
return result;
228228
}
229229

230-
private final static class MetadataHolder<K, T> {
230+
private static final class MetadataHolder<K, T> {
231231

232232
private final Map<K, T> content;
233233

‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ class Connection {
4343
private static final Pattern WEBSOCKET_KEY_PATTERN = Pattern
4444
.compile("^Sec-WebSocket-Key:(.*)$", Pattern.MULTILINE);
4545

46-
public final static String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
46+
public static final String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
4747

4848
private final Socket socket;
4949

‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public class HttpTunnelPayload {
4545

4646
private static final int BUFFER_SIZE = 1024 * 100;
4747

48-
final protected static char[] HEX_CHARS = "0123456789ABCDEF".toCharArray();
48+
protected final static char[] HEX_CHARS = "0123456789ABCDEF".toCharArray();
4949

5050
private static final Log logger = LogFactory.getLog(HttpTunnelPayload.class);
5151

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ protected Class<?> loadClass(String name, boolean resolve)
7373
/**
7474
* Filter to restrict the classes that can be loaded.
7575
*/
76-
public final static class ClassFilter implements Predicate<String> {
76+
public static final class ClassFilter implements Predicate<String> {
7777

7878
private Class<?>[] hiddenClasses;
7979

@@ -100,7 +100,7 @@ public static ClassFilter of(Class<?>... hiddenClasses) {
100100
/**
101101
* Filter to restrict the packages that can be loaded.
102102
*/
103-
public final static class PackageFilter implements Predicate<String> {
103+
public static final class PackageFilter implements Predicate<String> {
104104

105105
private final String[] hiddenPackages;
106106

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ protected abstract T readObject(Reader reader, ResolvableType type)
354354
*
355355
* @param <M> The marshaller type
356356
*/
357-
protected static abstract class FieldInitializer<M> {
357+
protected abstract static class FieldInitializer<M> {
358358

359359
private final Class<?> testerClass;
360360

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ protected Check[] getChecks() {
7272
/**
7373
* {@link BeanDefinitionRegistryPostProcessor} to report warnings.
7474
*/
75-
protected final static class ConfigurationWarningsPostProcessor
75+
protected static final class ConfigurationWarningsPostProcessor
7676
implements PriorityOrdered, BeanDefinitionRegistryPostProcessor {
7777

7878
private Check[] checks;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public interface SourceOperator {
169169
* A source that is in the process of being mapped.
170170
* @param <T> the source type
171171
*/
172-
public final static class Source<T> {
172+
public static final class Source<T> {
173173

174174
private final Supplier<T> supplier;
175175

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/TextResourceOrigin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ public String toString() {
9494
/**
9595
* A location (line and column number) within the resource.
9696
*/
97-
public final static class Location {
97+
public static final class Location {
9898

9999
private final int line;
100100

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ private interface RequestFactoryCustomizer {
630630
/**
631631
* {@link RequestFactoryCustomizer} to call a "set timeout" method.
632632
*/
633-
private static abstract class TimeoutRequestFactoryCustomizer
633+
private abstract static class TimeoutRequestFactoryCustomizer
634634
implements RequestFactoryCustomizer {
635635

636636
private final int timeout;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ public int getPort() {
321321
/**
322322
* An active Undertow port.
323323
*/
324-
private final static class Port {
324+
private static final class Port {
325325

326326
private final int number;
327327

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public int getPort() {
233233
/**
234234
* An active Undertow port.
235235
*/
236-
private final static class Port {
236+
private static final class Port {
237237

238238
private final int number;
239239

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -124,7 +124,7 @@ enum ProfileType {
124124
/**
125125
* Base class for profile matchers.
126126
*/
127-
private static abstract class ProfilesMatcher {
127+
private abstract static class ProfilesMatcher {
128128

129129
public final MatchStatus matches(Set<String> profiles) {
130130
if (CollectionUtils.isEmpty(profiles)) {

0 commit comments

Comments
 (0)