Skip to content

Commit aebb475

Browse files
igor-suhorukovsnicoll
authored andcommitted
Reorder modifiers to comply with the JLS
See spring-projectsgh-12432
1 parent 6d16c5f commit aebb475

File tree

13 files changed

+14
-12
lines changed

13 files changed

+14
-12
lines changed

Diff for: spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public interface Executor {
9191

9292
}
9393

94-
public static abstract class AbstractExecutor implements Executor {
94+
public abstract static class AbstractExecutor implements Executor {
9595

9696
}
9797

Diff for: spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public CacheManagerCustomizer<CaffeineCacheManager> caffeineCacheManagerCustomiz
147147

148148
}
149149

150-
static abstract class CacheManagerTestCustomizer<T extends CacheManager>
150+
abstract static class CacheManagerTestCustomizer<T extends CacheManager>
151151
implements CacheManagerCustomizer<T> {
152152

153153
T cacheManager;

Diff for: spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void preventsNonZeroExitCodeWhenAllOtherThreadsAreDaemonThreads() {
7676

7777
}
7878

79-
private static abstract class TestThread extends Thread {
79+
private abstract static class TestThread extends Thread {
8080

8181
private Throwable thrown;
8282

Diff for: spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle.xml

+2
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@
129129

130130
<!-- Modifiers -->
131131
<module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck" />
132+
<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
133+
132134

133135
<!-- Regexp -->
134136
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">

Diff for: spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void annotationAttributesOverridePropertiesFile() {
8888
assertThat(this.value).isEqualTo(123);
8989
}
9090

91-
protected static abstract class AbstractConfig {
91+
protected abstract static class AbstractConfig {
9292

9393
@Value("${server.port:8080}")
9494
private int port = 8080;

Diff for: spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestWebServerWebEnvironmentTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void validateWebApplicationContextIsSet() {
9292
WebApplicationContextUtils.getWebApplicationContext(this.servletContext));
9393
}
9494

95-
protected static abstract class AbstractConfig {
95+
protected abstract static class AbstractConfig {
9696

9797
@Value("${server.port:8080}")
9898
private int port = 8080;

Diff for: spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/GsonTesterTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected AbstractJsonMarshalTester<Object> createTester(Class<?> resourceLoadCl
6565
return new GsonTester<>(resourceLoadClass, type, new GsonBuilder().create());
6666
}
6767

68-
static abstract class InitFieldsBaseClass {
68+
abstract static class InitFieldsBaseClass {
6969

7070
public GsonTester<ExampleObject> base;
7171

Diff for: spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected AbstractJsonMarshalTester<Object> createTester(Class<?> resourceLoadCl
6464
return new JacksonTester<>(resourceLoadClass, type, new ObjectMapper());
6565
}
6666

67-
static abstract class InitFieldsBaseClass {
67+
abstract static class InitFieldsBaseClass {
6868

6969
public JacksonTester<ExampleObject> base;
7070

Diff for: spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonbTesterTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected AbstractJsonMarshalTester<Object> createTester(Class<?> resourceLoadCl
6666
return new JsonbTester<>(resourceLoadClass, type, JsonbBuilder.create());
6767
}
6868

69-
static abstract class InitFieldsBaseClass {
69+
abstract static class InitFieldsBaseClass {
7070

7171
public JsonbTester<ExampleObject> base;
7272

Diff for: spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public InputStream getEntryContent(String entry) throws IOException {
167167

168168
}
169169

170-
private static abstract class AbstractArchiveVerification {
170+
private abstract static class AbstractArchiveVerification {
171171

172172
private final File file;
173173

Diff for: spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/LambdaSafe.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static <C, A> Callbacks<C, A> callbacks(Class<C> callbackType,
100100
/**
101101
* Abstract base class for lambda safe callbacks.
102102
*/
103-
private static abstract class LambdaSafeCallback<C, A, SELF extends LambdaSafeCallback<C, A, SELF>> {
103+
private abstract static class LambdaSafeCallback<C, A, SELF extends LambdaSafeCallback<C, A, SELF>> {
104104

105105
private final Class<C> callbackType;
106106

Diff for: spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ static class RefreshFailureException extends RuntimeException {
13571357

13581358
}
13591359

1360-
static abstract class AbstractTestRunner implements ApplicationContextAware, Ordered {
1360+
abstract static class AbstractTestRunner implements ApplicationContextAware, Ordered {
13611361

13621362
private final String[] expectedBefore;
13631363

Diff for: spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static class OnlyDeserializer extends NameAndAgeJsonComponent.Deserializer {
110110
@JsonComponent
111111
static class ComponentWithInnerAbstractClass {
112112

113-
private static abstract class AbstractSerializer
113+
private abstract static class AbstractSerializer
114114
extends NameAndAgeJsonComponent.Serializer {
115115

116116
}

0 commit comments

Comments
 (0)