Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Order modifiers to align with JLS

Browse Source 
This commit also applies Checkstyle ModifierOrder to enforce it.

See gh-31368
This commit is contained in:
Johnny Lim
2023-10-05 21:52:29 +09:00
committed by Stéphane Nicoll
parent f60791a8e2
commit 919faa2ce2
108 changed files with 175 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-test/src/test/java/org/springframework/test/context/ContextHierarchyDirtiesContextTests.java
View File

@@ -113,7 +113,7 @@ class ContextHierarchyDirtiesContextTests {
@RunWith(SpringRunner.class)
@ContextHierarchy(@ContextConfiguration(name = "foo"))
static abstract class FooTestCase implements ApplicationContextAware {
abstract static class FooTestCase implements ApplicationContextAware {
@Configuration
static class Config {
@@ -134,7 +134,7 @@ class ContextHierarchyDirtiesContextTests {
}
@ContextHierarchy(@ContextConfiguration(name = "bar"))
static abstract class BarTestCase extends FooTestCase {
abstract static class BarTestCase extends FooTestCase {
@Configuration
static class Config {
@@ -147,7 +147,7 @@ class ContextHierarchyDirtiesContextTests {
}
@ContextHierarchy(@ContextConfiguration(name = "baz"))
static abstract class BazTestCase extends BarTestCase {
abstract static class BazTestCase extends BarTestCase {
@Configuration
static class Config {

2
spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java vendored
View File

@@ -165,7 +165,7 @@ class ClassLevelDirtiesContextTestNGTests {
@TestExecutionListeners(listeners = { DependencyInjectionTestExecutionListener.class,
DirtiesContextTestExecutionListener.class }, inheritListeners = false)
@ContextConfiguration
static abstract class BaseTestCase extends AbstractTestNGSpringContextTests {
abstract static class BaseTestCase extends AbstractTestNGSpringContextTests {
@Configuration
static class Config {

2
spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTests.java vendored
View File

@@ -158,7 +158,7 @@ class ClassLevelDirtiesContextTests {
DependencyInjectionTestExecutionListener.class,
DirtiesContextTestExecutionListener.class
})
static abstract class BaseTestCase {
abstract static class BaseTestCase {
@Configuration
static class Config {

2
spring-test/src/test/java/org/springframework/test/context/cache/ContextFailureThresholdTests.java vendored
View File

@@ -99,7 +99,7 @@ class ContextFailureThresholdTests {
@TestExecutionListeners(DependencyInjectionTestExecutionListener.class)
static abstract class BaseTestCase {
abstract static class BaseTestCase {
@Test
void test1() {}

2
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java
View File

@@ -174,7 +174,7 @@ class FailingBeforeAndAfterMethodsSpringExtensionTests {
@FailingTestCase
@ExtendWith(SpringExtension.class)
private static abstract class BaseTestCase {
private abstract static class BaseTestCase {
@Test
void testNothing() {

2
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringJUnitJupiterAutowiredConstructorInjectionTests.java
View File

@@ -69,7 +69,7 @@ class SpringJUnitJupiterAutowiredConstructorInjectionTests {
@SpringJUnitConfig(TestConfig.class)
@TestPropertySource(properties = "enigma = 42")
private static abstract class BaseClass {
private abstract static class BaseClass {
final ApplicationContext context;
final Person dilbert;

2
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/DynamicPropertySourceNestedTests.java
View File

@@ -143,7 +143,7 @@ class DynamicPropertySourceNestedTests {
}
static abstract class DynamicPropertySourceSuperclass {
abstract static class DynamicPropertySourceSuperclass {
@DynamicPropertySource
static void containerProperties(DynamicPropertyRegistry registry) {

2
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/TestExecutionListenersNestedTests.java
View File

@@ -144,7 +144,7 @@ class TestExecutionListenersNestedTests {
/* no user beans required for these tests */
}
private static abstract class BaseTestExecutionListener extends AbstractTestExecutionListener {
private abstract static class BaseTestExecutionListener extends AbstractTestExecutionListener {
protected abstract String name();

2
spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsSpringRunnerTests.java
View File

@@ -146,7 +146,7 @@ public class FailingBeforeAndAfterMethodsSpringRunnerTests {
}
@RunWith(SpringRunner.class)
public static abstract class BaseTestCase {
public abstract static class BaseTestCase {
@Test
public void testNothing() {

2
spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java
View File

@@ -167,7 +167,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@TestExecutionListeners(inheritListeners = false)
public static abstract class BaseTestCase extends AbstractTestNGSpringContextTests {
public abstract static class BaseTestCase extends AbstractTestNGSpringContextTests {
@org.testng.annotations.Test
public void testNothing() {

2
spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java
View File

@@ -69,7 +69,7 @@ public class FailingBeforeAndAfterMethodsSpringRuleTests extends FailingBeforeAn
// All tests are in superclass.
@RunWith(JUnit4.class)
public static abstract class BaseSpringRuleTestCase {
public abstract static class BaseSpringRuleTestCase {
@ClassRule
public static final SpringClassRule springClassRule = new SpringClassRule();

4
spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java
View File

@@ -450,10 +450,10 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt
}
@SpringAppConfig(classes = { FooConfig.class, BarConfig.class })
public static abstract class Dog {
public abstract static class Dog {
}
public static abstract class WorkingDog extends Dog {
public abstract static class WorkingDog extends Dog {
}
public static class GermanShepherd extends WorkingDog {