root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Order modifiers to align with JLS 

This commit also applies Checkstyle ModifierOrder to enforce it.

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

2
integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
View File

@ -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;

2
integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
View File

@ -306,7 +306,7 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests {
}
static abstract class ScopedTestBean implements IScopedTestBean {
abstract static class ScopedTestBean implements IScopedTestBean {
private String name = DEFAULT_NAME;

2
spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
View File

@ -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;

2
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java
View File

@ -410,7 +410,7 @@ public final class BeanInstanceSupplier<T> extends AutowiredElementResolver impl
/**
* Performs lookup of the {@link Executable}.
*/
static abstract class ExecutableLookup {
abstract static class ExecutableLookup {
abstract Executable get(RegisteredBean registeredBean);
}

2
spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
View File

@ -582,7 +582,7 @@ class BeanWrapperGenericsTests {
}
private static abstract class BaseGenericCollectionBean {
private abstract static class BaseGenericCollectionBean {
public abstract Object getMapOfInteger();

4
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@ -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<T extends Repository<S, ID>, S, ID extends Serializable>
public abstract static class RepositoryFactoryBeanSupport<T extends Repository<S, ID>, S, ID extends Serializable>
implements RepositoryFactoryInformation<S, ID>, FactoryBean<T> {
}

2
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
View File

@ -4161,7 +4161,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
}
public static abstract class Foo<T extends Runnable, RT extends Callable<T>> {
public abstract static class Foo<T extends Runnable, RT extends Callable<T>> {
private RT obj;

4
spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java
View File

@ -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<Double> getDoubleStore();

4
spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java
View File

@ -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<Double> getDoubleStore();

2
spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
View File

@ -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());

2
spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java
View File

@ -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<ParameterValidationResult> {
private static final class ResultComparator implements Comparator<ParameterValidationResult> {
@Override
public int compare(ParameterValidationResult result1, ParameterValidationResult result2) {

2
spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
View File

@ -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();

2
spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
View File

@ -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() {

2
spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
View File

@ -1915,7 +1915,7 @@ public abstract class AbstractAopProxyTests {
}
static abstract class ExposedInvocationTestBean extends TestBean {
abstract static class ExposedInvocationTestBean extends TestBean {
@Override
public String getName() {

2
spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
View File

@ -35,7 +35,7 @@ class BridgeMethodAutowiringTests {
}
static abstract class GenericServiceImpl<D> {
abstract static class GenericServiceImpl<D> {
public abstract void setObject(D object);
}

42
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
View File

@ -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() {

2
spring-context/src/test/java/org/springframework/context/annotation/ReflectionUtilsIntegrationTests.java
View File

@ -54,7 +54,7 @@ public class ReflectionUtilsIntegrationTests {
@Configuration
static abstract class Parent {
abstract static class Parent {
public abstract Number m1();
}

14
spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
View File

@ -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;

4
spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
View File

@ -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();
}
}

2
spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
View File

@ -729,7 +729,7 @@ class AnnotationDrivenEventListenerTests {
}
static abstract class AbstractTestEventListener extends AbstractIdentifiable {
abstract static class AbstractTestEventListener extends AbstractIdentifiable {
@Autowired
private EventCollector eventCollector;

2
spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
View File

@ -618,7 +618,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
}
public static abstract class MyOrderedListenerBase implements MyOrderedListenerIfc<MyEvent> {
public abstract static class MyOrderedListenerBase implements MyOrderedListenerIfc<MyEvent> {
@Override
public int getOrder() {

2
spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorObservabilityTests.java
View File

@ -180,7 +180,7 @@ class ScheduledAnnotationBeanPostProcessorObservabilityTests {
}
static abstract class TaskTester {
abstract static class TaskTester {
ObservationRegistry observationRegistry;

2
spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java vendored
View File

@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public abstract class AbstractCacheTests<T extends Cache> {
protected final static String CACHE_NAME = "testCache";
protected static final String CACHE_NAME = "testCache";
protected abstract T getCache();

2
spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java vendored
View File

@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
public abstract class AbstractValueAdaptingCacheTests<T extends AbstractValueAdaptingCache>
extends AbstractCacheTests<T> {
protected final static String CACHE_NAME_NO_NULL = "testCacheNoNull";
protected static final String CACHE_NAME_NO_NULL = "testCacheNoNull";
protected abstract T getCache(boolean allowNull);

2
spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java
View File

@ -64,7 +64,7 @@ public final class RuntimeHintsAgent {
return loaded;
}
private final static class ParsedArguments {
private static final class ParsedArguments {
List<String> instrumentedPackages;

2
spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java
View File

@ -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();

2
spring-core-test/src/test/java/org/springframework/core/test/tools/ClassFileTests.java
View File

@ -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() {

2
spring-core/src/main/java/org/springframework/cglib/core/DefaultNamingPolicy.java
View File

@ -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) {

2
spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
View File

@ -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,

2
spring-core/src/main/java/org/springframework/core/Constants.java
View File

@ -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.
*
* <p>Consider class Foo containing {@code public final static int CONSTANT1 = 66;}
* <p>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"}.
*

4
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
View File

@ -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<DataBuffer> 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;

2
spring-core/src/main/java/org/springframework/core/log/LogMessage.java
View File

@ -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;

20
spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
View File

@ -346,7 +346,7 @@ class BridgeMethodResolverTests {
}
public static abstract class Bar<T> {
public abstract static class Bar<T> {
void someMethod(Map<?, ?> m, Object otherArg) {
}
@ -358,7 +358,7 @@ class BridgeMethodResolverTests {
}
public static abstract class InterBar<T> extends Bar<T> {
public abstract static class InterBar<T> extends Bar<T> {
}
@ -380,7 +380,7 @@ class BridgeMethodResolverTests {
}
public static abstract class AbstractDateAdder implements Adder<Date> {
public abstract static class AbstractDateAdder implements Adder<Date> {
@Override
public abstract void add(Date date);
@ -475,7 +475,7 @@ class BridgeMethodResolverTests {
}
static abstract class AbstractDaoImpl<T, S> implements Dao<T, S> {
abstract static class AbstractDaoImpl<T, S> implements Dao<T, S> {
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<T extends Event>
public abstract static class GenericEventBroadcasterImpl<T extends Event>
extends GenericBroadcasterImpl implements EventBroadcaster {
private Class<T>[] subscribingEvents;
@ -1053,7 +1053,7 @@ class BridgeMethodResolverTests {
}
public static abstract class AbstractDao<T> {
public abstract static class AbstractDao<T> {
public void save(T t) {
}
@ -1081,7 +1081,7 @@ class BridgeMethodResolverTests {
}
public static abstract class BusinessGenericDao<T, PK extends Serializable>
public abstract static class BusinessGenericDao<T, PK extends Serializable>
implements DaoInterface<T, PK> {
public void save(T object) {
@ -1181,7 +1181,7 @@ class BridgeMethodResolverTests {
@SuppressWarnings("unused")
private static abstract class AbstractImplementsInterface<D extends DomainObjectSuper> implements IGenericInterface<D> {
private abstract static class AbstractImplementsInterface<D extends DomainObjectSuper> implements IGenericInterface<D> {
@Override
public <T> 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 {

8
spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
View File

@ -376,9 +376,9 @@ class GenericTypeResolverTests {
class TestImpl<I extends A, T extends B<I>> extends TestIfc<T>{
}
static abstract class BiGenericClass<T extends B<?>, V extends A> {}
abstract static class BiGenericClass<T extends B<?>, V extends A> {}
static abstract class SpecializedBiGenericClass<U extends C> extends BiGenericClass<D, U>{}
abstract static class SpecializedBiGenericClass<U extends C> extends BiGenericClass<D, U>{}
static class TypeFixedBiGenericClass extends SpecializedBiGenericClass<E> {}
@ -392,12 +392,12 @@ class GenericTypeResolverTests {
}
}
static abstract class WithArrayBase<T> {
abstract static class WithArrayBase<T> {
public abstract T[] array(T... args);
}
static abstract class WithArray<T> extends WithArrayBase<T> {
abstract static class WithArray<T> extends WithArrayBase<T> {
}
interface Repository<T, ID extends Serializable> {

2
spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
View File

@ -1388,7 +1388,7 @@ class AnnotatedElementUtilsTests {
void handleFromInterface();
}
static abstract class AbstractClassWithInheritedAnnotation<T> implements InterfaceWithInheritedAnnotation {
abstract static class AbstractClassWithInheritedAnnotation<T> implements InterfaceWithInheritedAnnotation {
@Transactional
public abstract void handle();

4
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
View File

@ -1133,7 +1133,7 @@ class AnnotationUtilsTests {
boolean readOnly() default false;
}
public static abstract class Foo<T> {
public abstract static class Foo<T> {
@Order(1)
public abstract void something(T arg);
@ -1243,7 +1243,7 @@ class AnnotationUtilsTests {
}
}
public static abstract class BaseClassWithGenericAnnotatedMethod<T> {
public abstract static class BaseClassWithGenericAnnotatedMethod<T> {
@Order
abstract void foo(T t);

4
spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java
View File

@ -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<String> {
abstract static class GenericNonOverride implements GenericNonOverrideInterface<String> {
@TestAnnotation1
public void method(StringBuilder argument) {

6
spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
View File

@ -2695,7 +2695,7 @@ class MergedAnnotationsTests {
void handleFromInterface();
}
static abstract class AbstractClassWithInheritedAnnotation<T>
abstract static class AbstractClassWithInheritedAnnotation<T>
implements InterfaceWithInheritedAnnotation {
@Transactional
@ -2999,7 +2999,7 @@ class MergedAnnotationsTests {
}
}
public static abstract class SimpleGeneric<T> {
public abstract static class SimpleGeneric<T> {
@Order(1)
public abstract void something(T arg);
@ -3089,7 +3089,7 @@ class MergedAnnotationsTests {
}
}
public static abstract class BaseClassWithGenericAnnotatedMethod<T> {
public abstract static class BaseClassWithGenericAnnotatedMethod<T> {
@Order
abstract void foo(T t);

2
spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
View File

@ -276,7 +276,7 @@ class CollectionToCollectionConverterTests {
public EnumSet<MyEnum> enumSet;
public static abstract class BaseResource implements Resource {
public abstract static class BaseResource implements Resource {
@Override
public InputStream getInputStream() throws IOException {

2
spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
View File

@ -94,7 +94,7 @@ class SimpleAsyncTaskExecutorTests {
}
private static abstract class AbstractNotifyingRunnable implements Runnable {
private abstract static class AbstractNotifyingRunnable implements Runnable {
private final Object monitor;

8
spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java
View File

@ -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

2
spring-core/src/test/java21/org/springframework/core/task/VirtualThreadTaskExecutorTests.java
View File

@ -95,7 +95,7 @@ class VirtualThreadTaskExecutorTests {
}
private static abstract class AbstractNotifyingRunnable implements Runnable {
private abstract static class AbstractNotifyingRunnable implements Runnable {
private final Object monitor;

2
spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
View File

@ -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

2
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationPerformanceTests.java
View File

@ -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;

2
spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java
View File

@ -150,7 +150,7 @@ class SimpleJdbcInsertIntegrationTests {
}
private static abstract class AbstractSimpleJdbcInsertIntegrationTests {
private abstract static class AbstractSimpleJdbcInsertIntegrationTests {
protected EmbeddedDatabase embeddedDatabase;

2
spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
View File

@ -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);

2
spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
View File

@ -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();

2
spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultMetadataExtractor.java
View File

@ -151,7 +151,7 @@ public class DefaultMetadataExtractor implements MetadataExtractor, MetadataExtr
private static class EntryExtractor<T> {
// We only need this to wrap ByteBufs
private final static NettyDataBufferFactory bufferFactory =
private static final NettyDataBufferFactory bufferFactory =
new NettyDataBufferFactory(ByteBufAllocator.DEFAULT);

2
spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketRequestValues.java
View File

@ -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;

2
spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java
View File

@ -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");

2
spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java
View File

@ -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) {

2
spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
View File

@ -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;

2
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java
View File

@ -49,7 +49,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
public class ColumnMapRowMapper implements BiFunction<Row, RowMetadata, Map<String, Object>> {
/** 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

2
spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java
View File

@ -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<? extends DataBuffer> publisher;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java
View File

@ -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

2
spring-tx/src/test/java/org/springframework/transaction/event/ReactiveTransactionalEventListenerTests.java
View File

@ -367,7 +367,7 @@ public class ReactiveTransactionalEventListenerTests {
}
static abstract class BaseTransactionalTestListener {
abstract static class BaseTransactionalTestListener {
static final String FAIL_MSG = "FAIL";

2
spring-tx/src/test/java/org/springframework/transaction/event/TransactionalEventListenerTests.java
View File

@ -492,7 +492,7 @@ public class TransactionalEventListenerTests {
}
static abstract class BaseTransactionalTestListener {
abstract static class BaseTransactionalTestListener {
static final String FAIL_MSG = "FAIL";

4
spring-web/src/main/java/org/springframework/http/ContentDisposition.java
View File

@ -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 =

2
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
View File

@ -51,7 +51,7 @@ public class ReactorClientHttpConnector implements ClientHttpConnector, SmartLif
private static final Log logger = LogFactory.getLog(ReactorClientHttpConnector.class);
private final static Function<HttpClient, HttpClient> defaultInitializer = client -> client.compress(true);
private static final Function<HttpClient, HttpClient> defaultInitializer = client -> client.compress(true);
private HttpClient httpClient;

2
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpConnector.java
View File

@ -41,7 +41,7 @@ import org.springframework.util.Assert;
*/
public class ReactorNetty2ClientHttpConnector implements ClientHttpConnector {
private final static Function<HttpClient, HttpClient> defaultInitializer = client -> client.compress(true);
private static final Function<HttpClient, HttpClient> defaultInitializer = client -> client.compress(true);
private final HttpClient httpClient;

2
spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartEvents.java
View File

@ -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;

2
spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java
View File

@ -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;

4
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
View File

@ -212,7 +212,7 @@ final class MultipartParser extends BaseSubscriber<DataBuffer> {
/**
* 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<DataBuffer> {
/**
* 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;

4
spring-web/src/main/java/org/springframework/http/server/PathContainer.java
View File

@ -140,7 +140,7 @@ public interface PathContainer {
* Options for HTTP URL paths.
* <p>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;

2
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
View File

@ -58,7 +58,7 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
*/
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> state = new AtomicReference<>(State.UNSUBSCRIBED);

2
spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java
View File

@ -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;

2
spring-web/src/main/java/org/springframework/web/service/invoker/ReactiveHttpRequestValues.java
View File

@ -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;

2
spring-web/src/main/java/org/springframework/web/util/BindErrorUtils.java
View File

@ -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();
/**

2
spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
View File

@ -139,7 +139,7 @@ public class PathPatternParser {
* <li>{@code pathOptions = PathContainer.Options.HTTP_PATH}
* </ul>
*/
public final static PathPatternParser defaultInstance = new PathPatternParser() {
public static final PathPatternParser defaultInstance = new PathPatternParser() {
@SuppressWarnings("deprecation")
@Override

2
spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java
View File

@ -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();

2
spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborDecoderTests.java
View File

@ -42,7 +42,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON;
*/
public class Jackson2CborDecoderTests extends AbstractDecoderTests<Jackson2CborDecoder> {
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");

2
spring-web/src/test/java/org/springframework/http/codec/cbor/Jackson2CborEncoderTests.java
View File

@ -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();

4
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java
View File

@ -41,8 +41,8 @@ import static org.springframework.http.MediaType.APPLICATION_JSON;
*/
public class Jackson2SmileDecoderTests extends AbstractDecoderTests<Jackson2SmileDecoder> {
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");

4
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java
View File

@ -48,8 +48,8 @@ import static org.springframework.http.MediaType.APPLICATION_XML;
*/
public class Jackson2SmileEncoderTests extends AbstractEncoderTests<Jackson2SmileEncoder> {
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();

2
spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufEncoderTests.java
View File

@ -43,7 +43,7 @@ import static org.springframework.core.ResolvableType.forClass;
*/
public class ProtobufEncoderTests extends AbstractEncoderTests<ProtobufEncoder> {
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();

2
spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
View File

@ -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;

2
spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java
View File

@ -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 {}

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java
View File

@ -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();

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java
View File

@ -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<ResolvableType, ?> bodyDecodeFunction;

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientUtils.java
View File

@ -40,7 +40,7 @@ abstract class WebClientUtils {
/**
* Predicate that returns true if an exception should be wrapped.
*/
public final static Predicate<? super Throwable> WRAP_EXCEPTION_PREDICATE =
public static final Predicate<? super Throwable> WRAP_EXCEPTION_PREDICATE =
t -> !(t instanceof WebClientException) && !(t instanceof CodecException);

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
View File

@ -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) {

2
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java
View File

@ -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);

2
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
View File

@ -388,7 +388,7 @@ public class MessageReaderArgumentResolverTests {
}
private static abstract class AbstractParameterizedController<DTO extends Identifiable> {
private abstract static class AbstractParameterizedController<DTO extends Identifiable> {
@SuppressWarnings("unused")
public void handleDto(DTO dto) {}

2
spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java
View File

@ -179,7 +179,7 @@ abstract class AbstractReactiveWebSocketIntegrationTests {
}
static abstract class AbstractHandlerAdapterConfig {
abstract static class AbstractHandlerAdapterConfig {
@Bean
public WebSocketHandlerAdapter handlerAdapter() {

2
spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
View File

@ -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) {

2
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
View File

@ -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. */

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
View File

@ -50,9 +50,9 @@ import org.springframework.web.util.pattern.PathPatternParser;
*/
public class PatternsRequestCondition extends AbstractRequestCondition<PatternsRequestCondition> {
private final static Set<String> EMPTY_PATH_PATTERN = Collections.singleton("");
private static final Set<String> 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<String> patterns;

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
View File

@ -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());

Some files were not shown because too many files have changed in this diff Show More