diff --git a/buildSrc/config/checkstyle/checkstyle.xml b/buildSrc/config/checkstyle/checkstyle.xml index d809e8dbbfb..c63f232e1e7 100644 --- a/buildSrc/config/checkstyle/checkstyle.xml +++ b/buildSrc/config/checkstyle/checkstyle.xml @@ -19,6 +19,9 @@ + + + \ No newline at end of file diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java index c059826c825..8a782d3fdb8 100644 --- a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java @@ -344,7 +344,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } - public static abstract class ScopedTestBean implements IScopedTestBean { + public abstract static class ScopedTestBean implements IScopedTestBean { private String name = DEFAULT_NAME; diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java index c97840f61fb..b4a18bfb56c 100644 --- a/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java @@ -306,7 +306,7 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { } - static abstract class ScopedTestBean implements IScopedTestBean { + abstract static class ScopedTestBean implements IScopedTestBean { private String name = DEFAULT_NAME; diff --git a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java index c33a8b548d0..7ab8548e2a2 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock; */ public class MethodMatchersTests { - private final static Method TEST_METHOD = mock(Method.class); + private static final Method TEST_METHOD = mock(Method.class); private final Method EXCEPTION_GETMESSAGE; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java index 2be49bcf516..56d3e79268c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java @@ -410,7 +410,7 @@ public final class BeanInstanceSupplier extends AutowiredElementResolver impl /** * Performs lookup of the {@link Executable}. */ - static abstract class ExecutableLookup { + abstract static class ExecutableLookup { abstract Executable get(RegisteredBean registeredBean); } diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index 99f5d02bc89..69b4fa5fe59 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -582,7 +582,7 @@ class BeanWrapperGenericsTests { } - private static abstract class BaseGenericCollectionBean { + private abstract static class BaseGenericCollectionBean { public abstract Object getMapOfInteger(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index 5397168264b..2153cbd3c85 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -3030,7 +3030,7 @@ class DefaultListableBeanFactoryTests { } - public static abstract class BaseClassWithDestroyMethod { + public abstract static class BaseClassWithDestroyMethod { public abstract BaseClassWithDestroyMethod close(); } @@ -3089,7 +3089,7 @@ class DefaultListableBeanFactoryTests { } - public static abstract class RepositoryFactoryBeanSupport, S, ID extends Serializable> + public abstract static class RepositoryFactoryBeanSupport, S, ID extends Serializable> implements RepositoryFactoryInformation, FactoryBean { } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index 46b6653d1f8..8912f7bf737 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -4161,7 +4161,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { } - public static abstract class Foo> { + public abstract static class Foo> { private RT obj; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java index f482c5cd733..526e3153553 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java @@ -156,7 +156,7 @@ public class LookupAnnotationTests { } - public static abstract class AbstractBean { + public abstract static class AbstractBean { @Lookup("testBean") public abstract TestBean get(); @@ -194,7 +194,7 @@ public class LookupAnnotationTests { } - public static abstract class NumberBean { + public abstract static class NumberBean { @Lookup public abstract NumberStore getDoubleStore(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java index 414fd015766..b5e5c1aba2e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java @@ -113,7 +113,7 @@ public class LookupMethodTests { } - public static abstract class AbstractBean { + public abstract static class AbstractBean { public abstract TestBean get(); @@ -139,7 +139,7 @@ public class LookupMethodTests { } - public static abstract class NumberBean { + public abstract static class NumberBean { public abstract NumberStore getDoubleStore(); diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java index 9918e964835..32c7394fd3f 100644 --- a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java @@ -88,7 +88,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor public static final String CHECKPOINT_ON_REFRESH_VALUE = "onRefresh"; - private final static boolean checkpointOnRefresh = + private static final boolean checkpointOnRefresh = CHECKPOINT_ON_REFRESH_VALUE.equalsIgnoreCase(SpringProperties.getProperty(CHECKPOINT_PROPERTY_NAME)); private final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java index a37f27eb2a7..161a7cda2ff 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java @@ -519,7 +519,7 @@ public class MethodValidationAdapter implements MethodValidator { * also falling back on container indexes if necessary for cascaded * constraints on a List container. */ - private final static class ResultComparator implements Comparator { + private static final class ResultComparator implements Comparator { @Override public int compare(ParameterValidationResult result1, ParameterValidationResult result2) { diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java index ec37ff5aba5..5662ca5130c 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java @@ -234,7 +234,7 @@ public class MethodValidationInterceptor implements MethodInterceptor { /** * Helper class to decorate reactive arguments with async validation. */ - private final static class ReactorValidationHelper { + private static final class ReactorValidationHelper { private static final ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java index 9ae9ec3078c..83522414f15 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java @@ -87,7 +87,7 @@ class TargetPointcutSelectionTests { // Reproducing bug requires that the class specified in target() pointcut doesn't // include the advised method's implementation (instead a base class should include it) - static abstract class AbstractTestImpl implements TestInterface { + abstract static class AbstractTestImpl implements TestInterface { @Override public void interfaceMethod() { diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index 9460d8c969c..0b4ee515bbe 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -1915,7 +1915,7 @@ public abstract class AbstractAopProxyTests { } - static abstract class ExposedInvocationTestBean extends TestBean { + abstract static class ExposedInvocationTestBean extends TestBean { @Override public String getName() { diff --git a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java index afd890a78b5..257be3c1a58 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java @@ -35,7 +35,7 @@ class BridgeMethodAutowiringTests { } - static abstract class GenericServiceImpl { + abstract static class GenericServiceImpl { public abstract void setObject(D object); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java index c21783c9c81..1ca6fa907c8 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java @@ -1131,11 +1131,11 @@ class ConfigurationClassPostProcessorTests { @Order(1) static class SingletonBeanConfig { - public @Bean Foo foo() { + @Bean public Foo foo() { return new Foo(); } - public @Bean Bar bar() { + @Bean public Bar bar() { return new Bar(foo()); } } @@ -1143,11 +1143,11 @@ class ConfigurationClassPostProcessorTests { @Configuration(proxyBeanMethods = false) static class NonEnhancedSingletonBeanConfig { - public @Bean Foo foo() { + @Bean public Foo foo() { return new Foo(); } - public @Bean Bar bar() { + @Bean public Bar bar() { return new Bar(foo()); } } @@ -1168,11 +1168,11 @@ class ConfigurationClassPostProcessorTests { @Order(2) static class OverridingSingletonBeanConfig { - public @Bean ExtendedFoo foo() { + @Bean public ExtendedFoo foo() { return new ExtendedFoo(); } - public @Bean Bar bar() { + @Bean public Bar bar() { return new Bar(foo()); } } @@ -1180,7 +1180,7 @@ class ConfigurationClassPostProcessorTests { @Configuration static class OverridingAgainSingletonBeanConfig { - public @Bean ExtendedAgainFoo foo() { + @Bean public ExtendedAgainFoo foo() { return new ExtendedAgainFoo(); } } @@ -1188,7 +1188,7 @@ class ConfigurationClassPostProcessorTests { @Configuration static class InvalidOverridingSingletonBeanConfig { - public @Bean Foo foo() { + @Bean public Foo foo() { return new Foo(); } } @@ -1200,11 +1200,11 @@ class ConfigurationClassPostProcessorTests { @Order(1) static class SingletonBeanConfig { - public @Bean Foo foo() { + @Bean public Foo foo() { return new Foo(); } - public @Bean Bar bar() { + @Bean public Bar bar() { return new Bar(foo()); } } @@ -1213,11 +1213,11 @@ class ConfigurationClassPostProcessorTests { @Order(2) static class OverridingSingletonBeanConfig { - public @Bean ExtendedFoo foo() { + @Bean public ExtendedFoo foo() { return new ExtendedFoo(); } - public @Bean Bar bar() { + @Bean public Bar bar() { return new Bar(foo()); } } @@ -1233,11 +1233,11 @@ class ConfigurationClassPostProcessorTests { public SingletonBeanConfig(ConfigWithOrderedInnerClasses other) { } - public @Bean Foo foo() { + @Bean public Foo foo() { return new Foo(); } - public @Bean Bar bar() { + @Bean public Bar bar() { return new Bar(foo()); } } @@ -1250,11 +1250,11 @@ class ConfigurationClassPostProcessorTests { other.getObject(); } - public @Bean ExtendedFoo foo() { + @Bean public ExtendedFoo foo() { return new ExtendedFoo(); } - public @Bean Bar bar() { + @Bean public Bar bar() { return new Bar(foo()); } } @@ -1281,7 +1281,7 @@ class ConfigurationClassPostProcessorTests { @Configuration static class UnloadedConfig { - public @Bean Foo foo() { + @Bean public Foo foo() { return new Foo(); } } @@ -1289,7 +1289,7 @@ class ConfigurationClassPostProcessorTests { @Configuration static class LoadedConfig { - public @Bean Bar bar() { + @Bean public Bar bar() { return new Bar(new Foo()); } } @@ -1707,7 +1707,7 @@ class ConfigurationClassPostProcessorTests { } @Configuration - public static abstract class AbstractConfig { + public abstract static class AbstractConfig { @Bean public ServiceBean serviceBean() { @@ -1891,7 +1891,7 @@ class ConfigurationClassPostProcessorTests { } } - static abstract class FooFactory { + abstract static class FooFactory { abstract DependingFoo createFoo(BarArgument bar); } @@ -2010,7 +2010,7 @@ class ConfigurationClassPostProcessorTests { } @Configuration - static abstract class BeanLookupConfiguration { + abstract static class BeanLookupConfiguration { @Bean public TestBean thing() { diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java index 5199f2be92e..818b95279d4 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java @@ -54,7 +54,7 @@ public class ReflectionUtilsIntegrationTests { @Configuration - static abstract class Parent { + abstract static class Parent { public abstract Number m1(); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java index 22273a9e7b7..68815a9d584 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java @@ -432,7 +432,7 @@ class ConfigurationClassProcessingTests { @Configuration static class ConfigWithFinalBean { - public final @Bean TestBean testBean() { + @Bean public final TestBean testBean() { return new TestBean(); } } @@ -441,7 +441,7 @@ class ConfigurationClassProcessingTests { @Configuration static class ConfigWithVoidBean { - public @Bean void testBean() { + @Bean public void testBean() { } } @@ -449,7 +449,7 @@ class ConfigurationClassProcessingTests { @Configuration static class SimplestPossibleConfig { - public @Bean String stringBean() { + @Bean public String stringBean() { return "foo"; } } @@ -458,11 +458,11 @@ class ConfigurationClassProcessingTests { @Configuration static class ConfigWithNonSpecificReturnTypes { - public @Bean Object stringBean() { + @Bean public Object stringBean() { return "foo"; } - public @Bean FactoryBean factoryBean() { + @Bean public FactoryBean factoryBean() { ListFactoryBean fb = new ListFactoryBean(); fb.setSourceList(Arrays.asList("element1", "element2")); return fb; @@ -473,13 +473,13 @@ class ConfigurationClassProcessingTests { @Configuration static class ConfigWithPrototypeBean { - public @Bean TestBean foo() { + @Bean public TestBean foo() { TestBean foo = new SpousyTestBean("foo"); foo.setSpouse(bar()); return foo; } - public @Bean TestBean bar() { + @Bean public TestBean bar() { TestBean bar = new SpousyTestBean("bar"); bar.setSpouse(baz()); return bar; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java index 12fe608bbb0..c970ef8ecdb 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java @@ -120,7 +120,7 @@ public class ImportResourceTests { static class ImportXmlConfig { @Value("${name}") private String name; - public @Bean TestBean javaDeclaredBean() { + @Bean public TestBean javaDeclaredBean() { return new TestBean(this.name); } } @@ -160,7 +160,7 @@ public class ImportResourceTests { static class ImportXmlAutowiredConfig { @Autowired TestBean xmlDeclaredBean; - public @Bean String xmlBeanName() { + @Bean public String xmlBeanName() { return xmlDeclaredBean.getName(); } } diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java index 6263f62f8f7..24bd440d092 100644 --- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java @@ -729,7 +729,7 @@ class AnnotationDrivenEventListenerTests { } - static abstract class AbstractTestEventListener extends AbstractIdentifiable { + abstract static class AbstractTestEventListener extends AbstractIdentifiable { @Autowired private EventCollector eventCollector; diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 3849c623bd5..2961c45d9d6 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -618,7 +618,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen } - public static abstract class MyOrderedListenerBase implements MyOrderedListenerIfc { + public abstract static class MyOrderedListenerBase implements MyOrderedListenerIfc { @Override public int getOrder() { diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorObservabilityTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorObservabilityTests.java index 8b16f4084e8..6b412c25fb2 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorObservabilityTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorObservabilityTests.java @@ -180,7 +180,7 @@ class ScheduledAnnotationBeanPostProcessorObservabilityTests { } - static abstract class TaskTester { + abstract static class TaskTester { ObservationRegistry observationRegistry; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java index c919e95e110..1e53d0330ec 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ public abstract class AbstractCacheTests { - protected final static String CACHE_NAME = "testCache"; + protected static final String CACHE_NAME = "testCache"; protected abstract T getCache(); diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java index 5f0809deb18..c897a3e481b 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException public abstract class AbstractValueAdaptingCacheTests extends AbstractCacheTests { - protected final static String CACHE_NAME_NO_NULL = "testCacheNoNull"; + protected static final String CACHE_NAME_NO_NULL = "testCacheNoNull"; protected abstract T getCache(boolean allowNull); diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java b/spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java index cc9fbecc41e..5131adf99a0 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java @@ -64,7 +64,7 @@ public final class RuntimeHintsAgent { return loaded; } - private final static class ParsedArguments { + private static final class ParsedArguments { List instrumentedPackages; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java b/spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java index 31b20241b2a..9c6b4869964 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java @@ -47,7 +47,7 @@ public final class RuntimeHintsRecorder { * @param action the block of code we want to record invocations from * @return the recorded invocations */ - public synchronized static RuntimeHintsInvocations record(Runnable action) { + public static synchronized RuntimeHintsInvocations record(Runnable action) { Assert.notNull(action, "Runnable action must not be null"); Assert.state(RuntimeHintsAgent.isLoaded(), "RuntimeHintsAgent must be loaded in the current JVM"); RuntimeHintsRecorder recorder = new RuntimeHintsRecorder(); diff --git a/spring-core-test/src/test/java/org/springframework/core/test/tools/ClassFileTests.java b/spring-core-test/src/test/java/org/springframework/core/test/tools/ClassFileTests.java index 353c9dbdae5..24b3b1dc36d 100644 --- a/spring-core-test/src/test/java/org/springframework/core/test/tools/ClassFileTests.java +++ b/spring-core-test/src/test/java/org/springframework/core/test/tools/ClassFileTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException */ class ClassFileTests { - private final static byte[] TEST_CONTENT = new byte[]{'a'}; + private static final byte[] TEST_CONTENT = new byte[]{'a'}; @Test void ofNameAndByteArrayCreatesClass() { diff --git a/spring-core/src/main/java/org/springframework/cglib/core/DefaultNamingPolicy.java b/spring-core/src/main/java/org/springframework/cglib/core/DefaultNamingPolicy.java index 9020e490abd..06b14eb46b8 100644 --- a/spring-core/src/main/java/org/springframework/cglib/core/DefaultNamingPolicy.java +++ b/spring-core/src/main/java/org/springframework/cglib/core/DefaultNamingPolicy.java @@ -32,7 +32,7 @@ public class DefaultNamingPolicy implements NamingPolicy { /** * This allows to test collisions of {@code key.hashCode()}. */ - private final static boolean STRESS_HASH_CODE = Boolean.getBoolean("org.springframework.cglib.test.stressHashCodes"); + private static final boolean STRESS_HASH_CODE = Boolean.getBoolean("org.springframework.cglib.test.stressHashCodes"); @Override public String getClassName(String prefix, String source, Object key, Predicate names) { diff --git a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java index 2287cb6144e..9bee25e1c7b 100644 --- a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java +++ b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java @@ -82,7 +82,7 @@ abstract public class KeyFactory { TypeUtils.parseSignature("int getSort()"); //generated numbers: - private final static int PRIMES[] = { + private static final int PRIMES[] = { 11, 73, 179, 331, 521, 787, 1213, 1823, 2609, 3691, 5189, 7247, diff --git a/spring-core/src/main/java/org/springframework/core/Constants.java b/spring-core/src/main/java/org/springframework/core/Constants.java index d7096a13e51..7e794fe4d28 100644 --- a/spring-core/src/main/java/org/springframework/core/Constants.java +++ b/spring-core/src/main/java/org/springframework/core/Constants.java @@ -32,7 +32,7 @@ import org.springframework.util.ReflectionUtils; * in public static final members. The {@code asXXXX} methods of this class * allow these constant values to be accessed via their string names. * - *

Consider class Foo containing {@code public final static int CONSTANT1 = 66;} + *

Consider class Foo containing {@code public static final int CONSTANT1 = 66;} * An instance of this class wrapping {@code Foo.class} will return the constant value * of 66 from its {@code asNumber} method given the argument {@code "CONSTANT1"}. * diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java index 6410e22054f..e05a77e6545 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java @@ -64,7 +64,7 @@ import org.springframework.util.Assert; */ public abstract class DataBufferUtils { - private final static Log logger = LogFactory.getLog(DataBufferUtils.class); + private static final Log logger = LogFactory.getLog(DataBufferUtils.class); private static final Consumer RELEASE_CONSUMER = DataBufferUtils::release; @@ -868,7 +868,7 @@ public abstract class DataBufferUtils { /** * Base class for a {@link NestedMatcher}. */ - private static abstract class AbstractNestedMatcher implements NestedMatcher { + private abstract static class AbstractNestedMatcher implements NestedMatcher { private final byte[] delimiter; diff --git a/spring-core/src/main/java/org/springframework/core/log/LogMessage.java b/spring-core/src/main/java/org/springframework/core/log/LogMessage.java index 168cc3969e2..e1206d5c353 100644 --- a/spring-core/src/main/java/org/springframework/core/log/LogMessage.java +++ b/spring-core/src/main/java/org/springframework/core/log/LogMessage.java @@ -163,7 +163,7 @@ public abstract class LogMessage implements CharSequence { } - private static abstract class FormatMessage extends LogMessage { + private abstract static class FormatMessage extends LogMessage { protected final String format; diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java index 00f9653d543..8963ad25090 100644 --- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java @@ -346,7 +346,7 @@ class BridgeMethodResolverTests { } - public static abstract class Bar { + public abstract static class Bar { void someMethod(Map m, Object otherArg) { } @@ -358,7 +358,7 @@ class BridgeMethodResolverTests { } - public static abstract class InterBar extends Bar { + public abstract static class InterBar extends Bar { } @@ -380,7 +380,7 @@ class BridgeMethodResolverTests { } - public static abstract class AbstractDateAdder implements Adder { + public abstract static class AbstractDateAdder implements Adder { @Override public abstract void add(Date date); @@ -475,7 +475,7 @@ class BridgeMethodResolverTests { } - static abstract class AbstractDaoImpl implements Dao { + abstract static class AbstractDaoImpl implements Dao { protected T object; @@ -706,7 +706,7 @@ class BridgeMethodResolverTests { } - public static abstract class BaseUserInitiatedEvent extends GenericEvent implements UserInitiatedEvent { + public abstract static class BaseUserInitiatedEvent extends GenericEvent implements UserInitiatedEvent { } @@ -743,7 +743,7 @@ class BridgeMethodResolverTests { @SuppressWarnings({"unused", "unchecked"}) - public static abstract class GenericEventBroadcasterImpl + public abstract static class GenericEventBroadcasterImpl extends GenericBroadcasterImpl implements EventBroadcaster { private Class[] subscribingEvents; @@ -1053,7 +1053,7 @@ class BridgeMethodResolverTests { } - public static abstract class AbstractDao { + public abstract static class AbstractDao { public void save(T t) { } @@ -1081,7 +1081,7 @@ class BridgeMethodResolverTests { } - public static abstract class BusinessGenericDao + public abstract static class BusinessGenericDao implements DaoInterface { public void save(T object) { @@ -1181,7 +1181,7 @@ class BridgeMethodResolverTests { @SuppressWarnings("unused") - private static abstract class AbstractImplementsInterface implements IGenericInterface { + private abstract static class AbstractImplementsInterface implements IGenericInterface { @Override public void doSomething(D domainObject, T value) { @@ -1297,7 +1297,7 @@ class BridgeMethodResolverTests { // SPR-16103 classes //------------------- - public static abstract class BaseEntity { + public abstract static class BaseEntity { } public static class FooEntity extends BaseEntity { diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java index 5995c9f669a..a5c23ae6aef 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java @@ -376,9 +376,9 @@ class GenericTypeResolverTests { class TestImpl> extends TestIfc{ } - static abstract class BiGenericClass, V extends A> {} + abstract static class BiGenericClass, V extends A> {} - static abstract class SpecializedBiGenericClass extends BiGenericClass{} + abstract static class SpecializedBiGenericClass extends BiGenericClass{} static class TypeFixedBiGenericClass extends SpecializedBiGenericClass {} @@ -392,12 +392,12 @@ class GenericTypeResolverTests { } } - static abstract class WithArrayBase { + abstract static class WithArrayBase { public abstract T[] array(T... args); } - static abstract class WithArray extends WithArrayBase { + abstract static class WithArray extends WithArrayBase { } interface Repository { diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java index 3eba643295e..409642ee1b0 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java @@ -1388,7 +1388,7 @@ class AnnotatedElementUtilsTests { void handleFromInterface(); } - static abstract class AbstractClassWithInheritedAnnotation implements InterfaceWithInheritedAnnotation { + abstract static class AbstractClassWithInheritedAnnotation implements InterfaceWithInheritedAnnotation { @Transactional public abstract void handle(); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java index 840b3f4a5fb..dddac45a0fe 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java @@ -1133,7 +1133,7 @@ class AnnotationUtilsTests { boolean readOnly() default false; } - public static abstract class Foo { + public abstract static class Foo { @Order(1) public abstract void something(T arg); @@ -1243,7 +1243,7 @@ class AnnotationUtilsTests { } } - public static abstract class BaseClassWithGenericAnnotatedMethod { + public abstract static class BaseClassWithGenericAnnotatedMethod { @Order abstract void foo(T t); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java index 792dc1f6def..933300054b8 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java @@ -770,7 +770,7 @@ class AnnotationsScannerTests { void method(); } - static abstract class MultipleMethods implements MultipleMethodsInterface { + abstract static class MultipleMethods implements MultipleMethodsInterface { @TestAnnotation1 public void method() { @@ -800,7 +800,7 @@ class AnnotationsScannerTests { void method(T argument); } - static abstract class GenericNonOverride implements GenericNonOverrideInterface { + abstract static class GenericNonOverride implements GenericNonOverrideInterface { @TestAnnotation1 public void method(StringBuilder argument) { diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java index 8ffd0eeb893..867d2249818 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java @@ -2695,7 +2695,7 @@ class MergedAnnotationsTests { void handleFromInterface(); } - static abstract class AbstractClassWithInheritedAnnotation + abstract static class AbstractClassWithInheritedAnnotation implements InterfaceWithInheritedAnnotation { @Transactional @@ -2999,7 +2999,7 @@ class MergedAnnotationsTests { } } - public static abstract class SimpleGeneric { + public abstract static class SimpleGeneric { @Order(1) public abstract void something(T arg); @@ -3089,7 +3089,7 @@ class MergedAnnotationsTests { } } - public static abstract class BaseClassWithGenericAnnotatedMethod { + public abstract static class BaseClassWithGenericAnnotatedMethod { @Order abstract void foo(T t); diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index 6d0f1751d90..8b20b37180e 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -276,7 +276,7 @@ class CollectionToCollectionConverterTests { public EnumSet enumSet; - public static abstract class BaseResource implements Resource { + public abstract static class BaseResource implements Resource { @Override public InputStream getInputStream() throws IOException { diff --git a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java index 81bd8b6996a..c7f4bd9d3b4 100644 --- a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java +++ b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java @@ -94,7 +94,7 @@ class SimpleAsyncTaskExecutorTests { } - private static abstract class AbstractNotifyingRunnable implements Runnable { + private abstract static class AbstractNotifyingRunnable implements Runnable { private final Object monitor; diff --git a/spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java index e728a95073a..1b3844ed392 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java @@ -269,7 +269,7 @@ public abstract class AbstractMethodMetadataTests { } - public static abstract class WithDirectAnnotation { + public abstract static class WithDirectAnnotation { @Tag @DirectAnnotation @@ -277,7 +277,7 @@ public abstract class AbstractMethodMetadataTests { } - public static abstract class WithMetaAnnotation { + public abstract static class WithMetaAnnotation { @Tag @MetaAnnotation @@ -294,7 +294,7 @@ public abstract class AbstractMethodMetadataTests { @interface MetaAnnotation { } - public static abstract class WithAnnotationAttributes { + public abstract static class WithAnnotationAttributes { @Tag @AnnotationAttributes(name = "test", size = 1) @@ -302,7 +302,7 @@ public abstract class AbstractMethodMetadataTests { } - public static abstract class WithMetaAnnotationAttributes { + public abstract static class WithMetaAnnotationAttributes { @Tag @MetaAnnotationAttributes1 diff --git a/spring-core/src/test/java21/org/springframework/core/task/VirtualThreadTaskExecutorTests.java b/spring-core/src/test/java21/org/springframework/core/task/VirtualThreadTaskExecutorTests.java index 9205380a4e1..af110641d1a 100644 --- a/spring-core/src/test/java21/org/springframework/core/task/VirtualThreadTaskExecutorTests.java +++ b/spring-core/src/test/java21/org/springframework/core/task/VirtualThreadTaskExecutorTests.java @@ -95,7 +95,7 @@ class VirtualThreadTaskExecutorTests { } - private static abstract class AbstractNotifyingRunnable implements Runnable { + private abstract static class AbstractNotifyingRunnable implements Runnable { private final Object monitor; diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java index 08dadcbf346..8f33c0be3d3 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; */ public class SetValueTests extends AbstractExpressionTests { - private final static boolean DEBUG = false; + private static final boolean DEBUG = false; @Test diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationPerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationPerformanceTests.java index a4609f4d200..b53db5d2504 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationPerformanceTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationPerformanceTests.java @@ -41,7 +41,7 @@ public class SpelCompilationPerformanceTests extends AbstractExpressionTests { int iterations = 10; // number of times to repeat 'count' evaluations (for averaging) - private final static boolean noisyTests = true; + private static final boolean noisyTests = true; Expression expression; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java index 77483b4f0e0..b8752bdd5f5 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java @@ -150,7 +150,7 @@ class SimpleJdbcInsertIntegrationTests { } - private static abstract class AbstractSimpleJdbcInsertIntegrationTests { + private abstract static class AbstractSimpleJdbcInsertIntegrationTests { protected EmbeddedDatabase embeddedDatabase; diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java index 183b7ecbaf3..007f0a3c0d1 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java @@ -1217,7 +1217,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations } } - private static abstract class MicrometerInstrumentation { + private abstract static class MicrometerInstrumentation { static Session instrumentSession(Session session, ObservationRegistry registry) { return JmsInstrumentation.instrumentSession(session, registry); diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java index 27493687f33..1243f18458e 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java @@ -991,7 +991,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen private static class MessageRejectedWhileStoppingException extends RuntimeException { } - private static abstract class ObservationFactory { + private abstract static class ObservationFactory { private static final JmsProcessObservationConvention DEFAULT_CONVENTION = new DefaultJmsProcessObservationConvention(); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultMetadataExtractor.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultMetadataExtractor.java index 9d0c382298c..9db72199ddb 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultMetadataExtractor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultMetadataExtractor.java @@ -151,7 +151,7 @@ public class DefaultMetadataExtractor implements MetadataExtractor, MetadataExtr private static class EntryExtractor { // We only need this to wrap ByteBufs - private final static NettyDataBufferFactory bufferFactory = + private static final NettyDataBufferFactory bufferFactory = new NettyDataBufferFactory(ByteBufAllocator.DEFAULT); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketRequestValues.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketRequestValues.java index 6675189c407..1c7d0443d4a 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketRequestValues.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketRequestValues.java @@ -134,7 +134,7 @@ public final class RSocketRequestValues { /** * Builder for {@link RSocketRequestValues}. */ - public final static class Builder { + public static final class Builder { @Nullable private String route; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java index 202c0fb4d2a..5d26ccbea72 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java @@ -204,7 +204,7 @@ public class OrderedMessageChannelDecorator implements MessageChannel { } - private final static class CallbackTaskInterceptor implements ExecutorChannelInterceptor { + private static final class CallbackTaskInterceptor implements ExecutorChannelInterceptor { @Override public void afterMessageHandled( diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java index bc13d1f27b7..4322a971553 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java @@ -29,7 +29,7 @@ import org.springframework.util.ReflectionUtils; */ public class TestExceptionResolver extends AbstractExceptionHandlerMethodResolver { - private final static ReflectionUtils.MethodFilter EXCEPTION_HANDLER_METHOD_FILTER = + private static final ReflectionUtils.MethodFilter EXCEPTION_HANDLER_METHOD_FILTER = method -> method.getName().matches("handle[\\w]*Exception"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java index 1b9e5a90881..be5800d61d6 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java @@ -682,7 +682,7 @@ public class MessageBrokerConfigurationTests { @Configuration - static abstract class BaseDotSeparatorConfig extends BaseTestMessageBrokerConfig { + abstract static class BaseDotSeparatorConfig extends BaseTestMessageBrokerConfig { @Override protected void configureMessageBroker(MessageBrokerRegistry registry) { diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java index e4b9f53caa1..4ab4a586199 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java @@ -68,7 +68,7 @@ public abstract class AbstractEntityManagerFactoryBeanTests { private static final long serialVersionUID = 1L; - private transient final EntityManagerFactory emf; + private final transient EntityManagerFactory emf; public DummyEntityManagerFactoryBean(EntityManagerFactory emf) { this.emf = emf; diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java index b68b7dcbb79..7b3ee5cf126 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java @@ -49,7 +49,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap; public class ColumnMapRowMapper implements BiFunction> { /** A default {@code ColumnMapRowMapper} instance. */ - public final static ColumnMapRowMapper INSTANCE = new ColumnMapRowMapper(); + public static final ColumnMapRowMapper INSTANCE = new ColumnMapRowMapper(); @SuppressWarnings("deprecation") // getColumnNames() is deprecated as of R2DBC 0.9 diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java index 64830f879b8..c9c0ce76434 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java @@ -126,7 +126,7 @@ class WiretapConnector implements ClientHttpConnector { /** * Tap into a Publisher of data buffers to save the content. */ - final static class WiretapRecorder { + static final class WiretapRecorder { @Nullable private final Flux publisher; diff --git a/spring-test/src/test/java/org/springframework/test/context/ContextHierarchyDirtiesContextTests.java b/spring-test/src/test/java/org/springframework/test/context/ContextHierarchyDirtiesContextTests.java index 2cbccdb0aa3..a280d609fed 100644 --- a/spring-test/src/test/java/org/springframework/test/context/ContextHierarchyDirtiesContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/ContextHierarchyDirtiesContextTests.java @@ -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 { diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java index b10b8304379..fcf6ad38d57 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java @@ -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 { diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTests.java index 33076058717..2adfa062555 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTests.java @@ -158,7 +158,7 @@ class ClassLevelDirtiesContextTests { DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class }) - static abstract class BaseTestCase { + abstract static class BaseTestCase { @Configuration static class Config { diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/ContextFailureThresholdTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/ContextFailureThresholdTests.java index 50818efb3a5..cd4a15632da 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/ContextFailureThresholdTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/ContextFailureThresholdTests.java @@ -99,7 +99,7 @@ class ContextFailureThresholdTests { @TestExecutionListeners(DependencyInjectionTestExecutionListener.class) - static abstract class BaseTestCase { + abstract static class BaseTestCase { @Test void test1() {} diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java index 92dfb4532a8..e3994709472 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java @@ -174,7 +174,7 @@ class FailingBeforeAndAfterMethodsSpringExtensionTests { @FailingTestCase @ExtendWith(SpringExtension.class) - private static abstract class BaseTestCase { + private abstract static class BaseTestCase { @Test void testNothing() { diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringJUnitJupiterAutowiredConstructorInjectionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringJUnitJupiterAutowiredConstructorInjectionTests.java index d62a1ad9248..65a0c8d6b68 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringJUnitJupiterAutowiredConstructorInjectionTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringJUnitJupiterAutowiredConstructorInjectionTests.java @@ -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; diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/DynamicPropertySourceNestedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/DynamicPropertySourceNestedTests.java index 7737d7c9f56..4ee76a80b22 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/DynamicPropertySourceNestedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/DynamicPropertySourceNestedTests.java @@ -143,7 +143,7 @@ class DynamicPropertySourceNestedTests { } - static abstract class DynamicPropertySourceSuperclass { + abstract static class DynamicPropertySourceSuperclass { @DynamicPropertySource static void containerProperties(DynamicPropertyRegistry registry) { diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/TestExecutionListenersNestedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/TestExecutionListenersNestedTests.java index 2d49ece5250..9bb88b80599 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/TestExecutionListenersNestedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/TestExecutionListenersNestedTests.java @@ -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(); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsSpringRunnerTests.java index a7ceffe12d7..b03db423838 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsSpringRunnerTests.java @@ -146,7 +146,7 @@ public class FailingBeforeAndAfterMethodsSpringRunnerTests { } @RunWith(SpringRunner.class) - public static abstract class BaseTestCase { + public abstract static class BaseTestCase { @Test public void testNothing() { diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java index 61abf80a6cc..cec9ed5296a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java @@ -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() { diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java index fe12ee7756f..f774b603be9 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java @@ -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(); diff --git a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java index 8a3e8cd795b..df6513b2210 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java @@ -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 { diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java index fa9bda81e6c..04693701209 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java @@ -42,7 +42,7 @@ import org.springframework.util.ReflectionUtils; */ class TransactionBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor { - private final static String JAKARTA_TRANSACTIONAL_CLASS_NAME = "jakarta.transaction.Transactional"; + private static final String JAKARTA_TRANSACTIONAL_CLASS_NAME = "jakarta.transaction.Transactional"; @Override diff --git a/spring-tx/src/test/java/org/springframework/transaction/event/ReactiveTransactionalEventListenerTests.java b/spring-tx/src/test/java/org/springframework/transaction/event/ReactiveTransactionalEventListenerTests.java index b5f827065c6..d78cfba837b 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/event/ReactiveTransactionalEventListenerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/event/ReactiveTransactionalEventListenerTests.java @@ -367,7 +367,7 @@ public class ReactiveTransactionalEventListenerTests { } - static abstract class BaseTransactionalTestListener { + abstract static class BaseTransactionalTestListener { static final String FAIL_MSG = "FAIL"; diff --git a/spring-tx/src/test/java/org/springframework/transaction/event/TransactionalEventListenerTests.java b/spring-tx/src/test/java/org/springframework/transaction/event/TransactionalEventListenerTests.java index 0b1e802aeee..5c40b87328d 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/event/TransactionalEventListenerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/event/TransactionalEventListenerTests.java @@ -492,7 +492,7 @@ public class TransactionalEventListenerTests { } - static abstract class BaseTransactionalTestListener { + abstract static class BaseTransactionalTestListener { static final String FAIL_MSG = "FAIL"; diff --git a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java index e2f1cdecb6b..97f7735d339 100644 --- a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java +++ b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java @@ -50,10 +50,10 @@ import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME; */ public final class ContentDisposition { - private final static Pattern BASE64_ENCODED_PATTERN = + private static final Pattern BASE64_ENCODED_PATTERN = Pattern.compile("=\\?([0-9a-zA-Z-_]+)\\?B\\?([+/0-9a-zA-Z]+=*)\\?="); - private final static Pattern QUOTED_PRINTABLE_ENCODED_PATTERN = + private static final Pattern QUOTED_PRINTABLE_ENCODED_PATTERN = Pattern.compile("=\\?([0-9a-zA-Z-_]+)\\?Q\\?([!->@-~]+)\\?="); // Printable ASCII other than "?" or SPACE private static final String INVALID_HEADER_FIELD_PARAMETER_FORMAT = diff --git a/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java index 07cdb16761d..694b576731b 100644 --- a/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java @@ -47,7 +47,7 @@ public class ReactorNettyClientRequestFactory implements ClientHttpRequestFactor private static final Log logger = LogFactory.getLog(ReactorNettyClientRequestFactory.class); - private final static Function defaultInitializer = client -> client.compress(true); + private static final Function defaultInitializer = client -> client.compress(true); private HttpClient httpClient; diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java index 16a8dd963aa..5f1def633ab 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java @@ -51,7 +51,7 @@ public class ReactorClientHttpConnector implements ClientHttpConnector, SmartLif private static final Log logger = LogFactory.getLog(ReactorClientHttpConnector.class); - private final static Function defaultInitializer = client -> client.compress(true); + private static final Function defaultInitializer = client -> client.compress(true); private HttpClient httpClient; diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpConnector.java index d334479debf..4bed71fbec8 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpConnector.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpConnector.java @@ -41,7 +41,7 @@ import org.springframework.util.Assert; */ public class ReactorNetty2ClientHttpConnector implements ClientHttpConnector { - private final static Function defaultInitializer = client -> client.compress(true); + private static final Function defaultInitializer = client -> client.compress(true); private final HttpClient httpClient; diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartEvents.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartEvents.java index ce2dbab6839..14ef4397c41 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartEvents.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartEvents.java @@ -74,7 +74,7 @@ abstract class DefaultPartEvents { - private static abstract class AbstractPartEvent implements PartEvent { + private abstract static class AbstractPartEvent implements PartEvent { private final HttpHeaders headers; diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java index 8f6403f8eed..4934ed58b1e 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java @@ -102,7 +102,7 @@ abstract class DefaultParts { /** * Abstract base class for {@link Part} implementations. */ - private static abstract class AbstractPart implements Part { + private abstract static class AbstractPart implements Part { private final HttpHeaders headers; diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java index 48020187438..0e6086221f4 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java @@ -212,7 +212,7 @@ final class MultipartParser extends BaseSubscriber { /** * Represents a token that contains {@link HttpHeaders}. */ - public final static class HeadersToken extends Token { + public static final class HeadersToken extends Token { private final HttpHeaders headers; @@ -240,7 +240,7 @@ final class MultipartParser extends BaseSubscriber { /** * Represents a token that contains {@link DataBuffer}. */ - public final static class BodyToken extends Token { + public static final class BodyToken extends Token { private final DataBuffer buffer; diff --git a/spring-web/src/main/java/org/springframework/http/server/PathContainer.java b/spring-web/src/main/java/org/springframework/http/server/PathContainer.java index a125795e3d5..9a64c8374ba 100644 --- a/spring-web/src/main/java/org/springframework/http/server/PathContainer.java +++ b/spring-web/src/main/java/org/springframework/http/server/PathContainer.java @@ -140,7 +140,7 @@ public interface PathContainer { * Options for HTTP URL paths. *

Separator '/' with URL decoding and parsing of path parameters. */ - public final static Options HTTP_PATH = Options.create('/', true); + public static final Options HTTP_PATH = Options.create('/', true); /** * Options for a message route. @@ -148,7 +148,7 @@ public interface PathContainer { * Escape sequences for the separator character in segment values are still * decoded. */ - public final static Options MESSAGE_ROUTE = Options.create('.', false); + public static final Options MESSAGE_ROUTE = Options.create('.', false); private final char separator; diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java index d9a39fbdffa..e7f35726224 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java @@ -58,7 +58,7 @@ public abstract class AbstractListenerReadPublisher implements Publisher { */ protected static Log rsReadLogger = LogDelegateFactory.getHiddenLog(AbstractListenerReadPublisher.class); - final static DataBuffer EMPTY_BUFFER = DefaultDataBufferFactory.sharedInstance.allocateBuffer(0); + static final DataBuffer EMPTY_BUFFER = DefaultDataBufferFactory.sharedInstance.allocateBuffer(0); private final AtomicReference state = new AtomicReference<>(State.UNSUBSCRIBED); diff --git a/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java b/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java index a6724f9f851..8cb873edf4e 100644 --- a/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java +++ b/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java @@ -37,7 +37,7 @@ public class UnknownContentTypeException extends RestClientException { private static final long serialVersionUID = 2759516676367274084L; - private transient final Type targetType; + private final transient Type targetType; private final MediaType contentType; diff --git a/spring-web/src/main/java/org/springframework/web/service/invoker/ReactiveHttpRequestValues.java b/spring-web/src/main/java/org/springframework/web/service/invoker/ReactiveHttpRequestValues.java index e485c53fcef..55a07e979d3 100644 --- a/spring-web/src/main/java/org/springframework/web/service/invoker/ReactiveHttpRequestValues.java +++ b/spring-web/src/main/java/org/springframework/web/service/invoker/ReactiveHttpRequestValues.java @@ -109,7 +109,7 @@ public final class ReactiveHttpRequestValues extends HttpRequestValues { /** * Builder for {@link ReactiveHttpRequestValues}. */ - public final static class Builder extends HttpRequestValues.Builder { + public static final class Builder extends HttpRequestValues.Builder { @Nullable private MultipartBodyBuilder multipartBuilder; diff --git a/spring-web/src/main/java/org/springframework/web/util/BindErrorUtils.java b/spring-web/src/main/java/org/springframework/web/util/BindErrorUtils.java index 82862199982..fbb951f6edd 100644 --- a/spring-web/src/main/java/org/springframework/web/util/BindErrorUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/BindErrorUtils.java @@ -37,7 +37,7 @@ import org.springframework.validation.FieldError; */ public abstract class BindErrorUtils { - private final static MessageSource defaultMessageSource = new MethodArgumentErrorMessageSource(); + private static final MessageSource defaultMessageSource = new MethodArgumentErrorMessageSource(); /** diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java index 5e177a1a39f..7e9d2fa3abe 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java @@ -139,7 +139,7 @@ public class PathPatternParser { *

  • {@code pathOptions = PathContainer.Options.HTTP_PATH} * */ - public final static PathPatternParser defaultInstance = new PathPatternParser() { + public static final PathPatternParser defaultInstance = new PathPatternParser() { @SuppressWarnings("deprecation") @Override diff --git a/spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java b/spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java index 3984b3ab992..b237ef0d78a 100644 --- a/spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java @@ -44,7 +44,7 @@ class DefaultClientRequestObservationConventionTests { private final MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, "/test"); - private final static MockClientHttpResponse response = new MockClientHttpResponse(); + private static final MockClientHttpResponse response = new MockClientHttpResponse(); private final DefaultClientRequestObservationConvention observationConvention = new DefaultClientRequestObservationConvention(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborDecoderTests.java index 7eaab717331..a5361899f72 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborDecoderTests.java @@ -42,7 +42,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON; */ public class Jackson2CborDecoderTests extends AbstractDecoderTests { - private final static MimeType CBOR_MIME_TYPE = new MimeType("application", "cbor"); + private static final MimeType CBOR_MIME_TYPE = new MimeType("application", "cbor"); private Pojo pojo1 = new Pojo("f1", "b1"); diff --git a/spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborEncoderTests.java index a2ce8c51a3d..7148c6e5551 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborEncoderTests.java @@ -45,7 +45,7 @@ import static org.springframework.http.MediaType.APPLICATION_XML; */ public class Jackson2CborEncoderTests extends AbstractLeakCheckingTests { - private final static MimeType CBOR_MIME_TYPE = new MimeType("application", "cbor"); + private static final MimeType CBOR_MIME_TYPE = new MimeType("application", "cbor"); private final ObjectMapper mapper = Jackson2ObjectMapperBuilder.cbor().build(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java index 9e3404ce1ac..4fc74b28289 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java @@ -41,8 +41,8 @@ import static org.springframework.http.MediaType.APPLICATION_JSON; */ public class Jackson2SmileDecoderTests extends AbstractDecoderTests { - private final static MimeType SMILE_MIME_TYPE = new MimeType("application", "x-jackson-smile"); - private final static MimeType STREAM_SMILE_MIME_TYPE = new MimeType("application", "stream+x-jackson-smile"); + private static final MimeType SMILE_MIME_TYPE = new MimeType("application", "x-jackson-smile"); + private static final MimeType STREAM_SMILE_MIME_TYPE = new MimeType("application", "stream+x-jackson-smile"); private Pojo pojo1 = new Pojo("f1", "b1"); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java index 57c05fcc8e4..61a14918d08 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java @@ -48,8 +48,8 @@ import static org.springframework.http.MediaType.APPLICATION_XML; */ public class Jackson2SmileEncoderTests extends AbstractEncoderTests { - private final static MimeType SMILE_MIME_TYPE = new MimeType("application", "x-jackson-smile"); - private final static MimeType STREAM_SMILE_MIME_TYPE = new MimeType("application", "stream+x-jackson-smile"); + private static final MimeType SMILE_MIME_TYPE = new MimeType("application", "x-jackson-smile"); + private static final MimeType STREAM_SMILE_MIME_TYPE = new MimeType("application", "stream+x-jackson-smile"); private final Jackson2SmileEncoder encoder = new Jackson2SmileEncoder(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufEncoderTests.java index c4738469dee..84d9ec57b06 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufEncoderTests.java @@ -43,7 +43,7 @@ import static org.springframework.core.ResolvableType.forClass; */ public class ProtobufEncoderTests extends AbstractEncoderTests { - private final static MimeType PROTOBUF_MIME_TYPE = new MimeType("application", "x-protobuf"); + private static final MimeType PROTOBUF_MIME_TYPE = new MimeType("application", "x-protobuf"); private Msg msg1 = Msg.newBuilder().setFoo("Foo").setBlah(SecondMsg.newBuilder().setBlah(123).build()).build(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java index 85ac6e62b23..8c3a2cf8bc6 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java @@ -272,7 +272,7 @@ public class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests { @jakarta.xml.bind.annotation.XmlType @XmlSeeAlso(Child.class) - public static abstract class Parent { + public abstract static class Parent { private String foo; diff --git a/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java b/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java index 19633b4600d..efffcbc4ddd 100644 --- a/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java @@ -333,7 +333,7 @@ public class ControllerAdviceBeanTests { static class ImplementationController implements ControllerInterface {} - static abstract class AbstractController {} + abstract static class AbstractController {} static class InheritanceController extends AbstractController {} diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java index 697cf5a0afd..a13eb0a7b0f 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java @@ -32,7 +32,7 @@ import org.springframework.http.codec.HttpMessageWriter; */ final class DefaultExchangeStrategiesBuilder implements ExchangeStrategies.Builder { - final static ExchangeStrategies DEFAULT_EXCHANGE_STRATEGIES; + static final ExchangeStrategies DEFAULT_EXCHANGE_STRATEGIES; static { DefaultExchangeStrategiesBuilder builder = new DefaultExchangeStrategiesBuilder(); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java index 057cc0b0956..d6575fd5287 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java @@ -56,7 +56,7 @@ public class WebClientResponseException extends WebClientException { private final Charset responseCharset; @Nullable - private transient final HttpRequest request; + private final transient HttpRequest request; @Nullable private transient Function bodyDecodeFunction; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientUtils.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientUtils.java index dae54ccb138..ad77af9a261 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientUtils.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientUtils.java @@ -40,7 +40,7 @@ abstract class WebClientUtils { /** * Predicate that returns true if an exception should be wrapped. */ - public final static Predicate WRAP_EXCEPTION_PREDICATE = + public static final Predicate WRAP_EXCEPTION_PREDICATE = t -> !(t instanceof WebClientException) && !(t instanceof CodecException); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java index 152a9554fe8..dd06c3844ef 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java @@ -429,7 +429,7 @@ public abstract class RequestPredicates { /** * Extension of {@code RequestPredicate} that can modify the {@code ServerRequest}. */ - static abstract class RequestModifyingPredicate implements RequestPredicate { + abstract static class RequestModifyingPredicate implements RequestPredicate { public static RequestModifyingPredicate of(RequestPredicate requestPredicate) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java index 9e80b55093e..e23cc139b65 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java @@ -88,7 +88,7 @@ class ControllerMethodResolver { (!AnnotatedElementUtils.hasAnnotation(method, RequestMapping.class) && AnnotatedElementUtils.hasAnnotation(method, ModelAttribute.class)); - private final static boolean BEAN_VALIDATION_PRESENT = + private static final boolean BEAN_VALIDATION_PRESENT = ClassUtils.isPresent("jakarta.validation.Validator", HandlerMethod.class.getClassLoader()); private static final Log logger = LogFactory.getLog(ControllerMethodResolver.class); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java index 1f60ba5daad..3c9dd318f10 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java @@ -388,7 +388,7 @@ public class MessageReaderArgumentResolverTests { } - private static abstract class AbstractParameterizedController { + private abstract static class AbstractParameterizedController { @SuppressWarnings("unused") public void handleDto(DTO dto) {} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java index 176f1ac08e2..887f5851685 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java @@ -179,7 +179,7 @@ abstract class AbstractReactiveWebSocketIntegrationTests { } - static abstract class AbstractHandlerAdapterConfig { + abstract static class AbstractHandlerAdapterConfig { @Bean public WebSocketHandlerAdapter handlerAdapter() { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java index 3f85ef5f207..3f98479f75c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java @@ -428,7 +428,7 @@ public abstract class RequestPredicates { /** * Extension of {@code RequestPredicate} that can modify the {@code ServerRequest}. */ - private static abstract class RequestModifyingPredicate implements RequestPredicate { + private abstract static class RequestModifyingPredicate implements RequestPredicate { public static RequestModifyingPredicate of(RequestPredicate requestPredicate) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index be5b00bec86..699f09f0c60 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -78,7 +78,7 @@ import org.springframework.web.util.pattern.PathPatternParser; public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport implements HandlerMapping, Ordered, BeanNameAware { - final static String SUPPRESS_LOGGING_ATTRIBUTE = AbstractHandlerMapping.class.getName() + ".SUPPRESS_LOGGING"; + static final String SUPPRESS_LOGGING_ATTRIBUTE = AbstractHandlerMapping.class.getName() + ".SUPPRESS_LOGGING"; /** Dedicated "hidden" logger for request mappings. */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java index 614e7f2ccd1..f642c72534f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java @@ -50,9 +50,9 @@ import org.springframework.web.util.pattern.PathPatternParser; */ public class PatternsRequestCondition extends AbstractRequestCondition { - private final static Set EMPTY_PATH_PATTERN = Collections.singleton(""); + private static final Set EMPTY_PATH_PATTERN = Collections.singleton(""); - private final static String[] ROOT_PATH_PATTERNS = new String[] {"", "/"}; + private static final String[] ROOT_PATH_PATTERNS = new String[] {"", "/"}; private final Set patterns; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 9e2cebbc5fd..50004f9879c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -135,7 +135,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter (!AnnotatedElementUtils.hasAnnotation(method, RequestMapping.class) && AnnotatedElementUtils.hasAnnotation(method, ModelAttribute.class)); - private final static boolean BEAN_VALIDATION_PRESENT = + private static final boolean BEAN_VALIDATION_PRESENT = ClassUtils.isPresent("jakarta.validation.Validator", HandlerMethod.class.getClassLoader()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java index 747a98875ee..089ced50648 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java @@ -112,7 +112,7 @@ public class ViewResolutionIntegrationTests { } @EnableWebMvc - static abstract class AbstractWebConfig implements WebMvcConfigurer { + abstract static class AbstractWebConfig implements WebMvcConfigurer { @Bean public SampleController sampleController() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java index b16054481f7..392979a95a0 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java @@ -187,7 +187,7 @@ class HandlerMethodAnnotationDetectionTests { @Controller - static abstract class MappingAbstractClass { + abstract static class MappingAbstractClass { @InitBinder public abstract void initBinder(WebDataBinder dataBinder, String pattern); @@ -286,7 +286,7 @@ class HandlerMethodAnnotationDetectionTests { @Controller - static abstract class MappingGenericAbstractClass { + abstract static class MappingGenericAbstractClass { @InitBinder public abstract void initBinder(WebDataBinder dataBinder, A thePattern); @@ -334,7 +334,7 @@ class HandlerMethodAnnotationDetectionTests { @Controller - static abstract class MappedGenericAbstractClassWithConcreteImplementations { + abstract static class MappedGenericAbstractClassWithConcreteImplementations { @InitBinder public abstract void initBinder(WebDataBinder dataBinder, A thePattern); @@ -378,7 +378,7 @@ class HandlerMethodAnnotationDetectionTests { @Controller - static abstract class GenericAbstractClassDeclaresDefaultMappings { + abstract static class GenericAbstractClassDeclaresDefaultMappings { @InitBinder public abstract void initBinder(WebDataBinder dataBinder, A thePattern); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java index 0de29c5acac..d284dd0a748 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java @@ -270,7 +270,7 @@ public class HttpEntityMethodProcessorTests { @SuppressWarnings("unused") - private static abstract class MyParameterizedController { + private abstract static class MyParameterizedController { public void handleDto(HttpEntity dto) { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java index daab23fab35..f4206144ef5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java @@ -666,7 +666,7 @@ public class MvcUriComponentsBuilderTests { } - static abstract class AbstractCrudController { + abstract static class AbstractCrudController { abstract T get(ID id); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java index e819239860d..630e583ab83 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java @@ -830,7 +830,7 @@ class RequestResponseBodyMethodProcessorTests { } - private static abstract class MyParameterizedController { + private abstract static class MyParameterizedController { @SuppressWarnings("unused") public void handleDto(@RequestBody DTO dto) {} @@ -850,7 +850,7 @@ class RequestResponseBodyMethodProcessorTests { @SuppressWarnings("unused") - private static abstract class MyParameterizedControllerWithList { + private abstract static class MyParameterizedControllerWithList { public void handleDto(@RequestBody List dto) { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index f90910d5d80..16eb838806a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -3620,7 +3620,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl List find(boolean sort, P predicate) throws IOException; } - static abstract class Entity { + abstract static class Entity { public UUID id; @@ -3638,7 +3638,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl public String content; } - static abstract class EntityPredicate { + abstract static class EntityPredicate { public String createdBy; @@ -3756,7 +3756,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl } } - static abstract class MyAbstractController { + abstract static class MyAbstractController { @RequestMapping("/handle") public abstract void handle(Writer writer) throws IOException; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java index 577f1114748..e762a0af22d 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java @@ -164,7 +164,7 @@ public abstract class AbstractWebSocketIntegrationTests { } - static abstract class AbstractRequestUpgradeStrategyConfig { + abstract static class AbstractRequestUpgradeStrategyConfig { @Bean public DefaultHandshakeHandler handshakeHandler() { diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index f542605d243..a18fcb5b339 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -187,6 +187,9 @@ + + +