diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java index 7a6c7e93c7b..9ce2fdc6913 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -142,11 +142,11 @@ public class TrickyAspectJPointcutExpressionTests { @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited - public static @interface Log { + @interface Log { } - public static interface TestService { + public interface TestService { public String sayHello(); } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java index d3defccfb42..aa9b1706f71 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java @@ -48,7 +48,7 @@ public class IntroductionBenchmarkTests { } } - public static interface Counter { + public interface Counter { int getCount(); } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java index 3e6e08afc1c..b5100f719ff 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java @@ -307,7 +307,7 @@ public class DelegatingIntroductionInterceptorTests { } - private static interface SubTimeStamped extends TimeStamped { + private interface SubTimeStamped extends TimeStamped { } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index 87139e363e3..5390acad400 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -278,19 +278,19 @@ public class ServiceLocatorFactoryBeanTests { } - public static interface TestServiceLocator { + public interface TestServiceLocator { TestService getTestService(); } - public static interface TestServiceLocator2 { + public interface TestServiceLocator2 { TestService getTestService(String id) throws CustomServiceLocatorException2; } - public static interface TestServiceLocator3 { + public interface TestServiceLocator3 { TestService getTestService(); @@ -302,13 +302,13 @@ public class ServiceLocatorFactoryBeanTests { } - public static interface TestService2Locator { + public interface TestService2Locator { TestService2 getTestService() throws CustomServiceLocatorException3; } - public static interface ServiceLocatorInterfaceWithExtraNonCompliantMethod { + public interface ServiceLocatorInterfaceWithExtraNonCompliantMethod { TestService2 getTestService(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java index 9e79931b304..7bc9ca4de0c 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java @@ -118,28 +118,28 @@ class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests { assertThat(counter.atAnnotationMethodAnnotationCounter).isEqualTo(1); } - public static interface TestInterface { + interface TestInterface { public void doIt(); } - public static class TestImpl implements TestInterface { + static class TestImpl implements TestInterface { @Override public void doIt() { } } @Retention(RetentionPolicy.RUNTIME) - public static @interface TestAnnotation { + @interface TestAnnotation { } @TestAnnotation - public static class AnnotatedClassTestImpl implements TestInterface { + static class AnnotatedClassTestImpl implements TestInterface { @Override public void doIt() { } } - public static class AnnotatedMethodTestImpl implements TestInterface { + static class AnnotatedMethodTestImpl implements TestInterface { @Override @TestAnnotation public void doIt() { @@ -147,7 +147,7 @@ class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests { } @Aspect - public static class Counter { + static class Counter { int thisAsClassCounter; int thisAsInterfaceCounter; int targetAsClassCounter; diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java index 0c767f9ae9c..40de9ac41b8 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java @@ -79,7 +79,7 @@ class GenericParameterMatchingTests { } - static interface GenericInterface { + interface GenericInterface { void save(T bean); 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 66ce6db3826..1ad2ba6c882 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 @@ -1770,7 +1770,7 @@ public abstract class AbstractAopProxyTests { } - public static interface IOverloads { + public interface IOverloads { void overload(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java index 4438d2ec330..2722b821f2f 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,13 +44,13 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Chris Beams * @author Sam Brannen */ -public class AnnotationBeanNameGeneratorTests { +class AnnotationBeanNameGeneratorTests { private AnnotationBeanNameGenerator beanNameGenerator = new AnnotationBeanNameGenerator(); @Test - public void generateBeanNameWithNamedComponent() { + void generateBeanNameWithNamedComponent() { BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithName.class); String beanName = this.beanNameGenerator.generateBeanName(bd, registry); @@ -60,7 +60,7 @@ public class AnnotationBeanNameGeneratorTests { } @Test - public void generateBeanNameWithDefaultNamedComponent() { + void generateBeanNameWithDefaultNamedComponent() { BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(DefaultNamedComponent.class); String beanName = this.beanNameGenerator.generateBeanName(bd, registry); @@ -70,7 +70,7 @@ public class AnnotationBeanNameGeneratorTests { } @Test - public void generateBeanNameWithNamedComponentWhereTheNameIsBlank() { + void generateBeanNameWithNamedComponentWhereTheNameIsBlank() { BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithBlankName.class); String beanName = this.beanNameGenerator.generateBeanName(bd, registry); @@ -81,7 +81,7 @@ public class AnnotationBeanNameGeneratorTests { } @Test - public void generateBeanNameWithAnonymousComponentYieldsGeneratedBeanName() { + void generateBeanNameWithAnonymousComponentYieldsGeneratedBeanName() { BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnonymousComponent.class); String beanName = this.beanNameGenerator.generateBeanName(bd, registry); @@ -92,7 +92,7 @@ public class AnnotationBeanNameGeneratorTests { } @Test - public void generateBeanNameFromMetaComponentWithStringValue() { + void generateBeanNameFromMetaComponentWithStringValue() { BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentFromStringMeta.class); String beanName = this.beanNameGenerator.generateBeanName(bd, registry); @@ -100,7 +100,7 @@ public class AnnotationBeanNameGeneratorTests { } @Test - public void generateBeanNameFromMetaComponentWithNonStringValue() { + void generateBeanNameFromMetaComponentWithNonStringValue() { BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentFromNonStringMeta.class); String beanName = this.beanNameGenerator.generateBeanName(bd, registry); @@ -108,7 +108,7 @@ public class AnnotationBeanNameGeneratorTests { } @Test - public void generateBeanNameFromComposedControllerAnnotationWithoutName() { + void generateBeanNameFromComposedControllerAnnotationWithoutName() { // SPR-11360 BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComposedControllerAnnotationWithoutName.class); @@ -118,7 +118,7 @@ public class AnnotationBeanNameGeneratorTests { } @Test - public void generateBeanNameFromComposedControllerAnnotationWithBlankName() { + void generateBeanNameFromComposedControllerAnnotationWithBlankName() { // SPR-11360 BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComposedControllerAnnotationWithBlankName.class); @@ -128,7 +128,7 @@ public class AnnotationBeanNameGeneratorTests { } @Test - public void generateBeanNameFromComposedControllerAnnotationWithStringValue() { + void generateBeanNameFromComposedControllerAnnotationWithStringValue() { // SPR-11360 BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition( @@ -157,7 +157,7 @@ public class AnnotationBeanNameGeneratorTests { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Component - public @interface NonStringMetaComponent { + @interface NonStringMetaComponent { long value(); } @@ -172,21 +172,21 @@ public class AnnotationBeanNameGeneratorTests { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Controller - public static @interface TestRestController { + @interface TestRestController { String value() default ""; } @TestRestController - public static class ComposedControllerAnnotationWithoutName { + static class ComposedControllerAnnotationWithoutName { } @TestRestController(" ") - public static class ComposedControllerAnnotationWithBlankName { + static class ComposedControllerAnnotationWithBlankName { } @TestRestController("restController") - public static class ComposedControllerAnnotationWithStringValue { + static class ComposedControllerAnnotationWithStringValue { } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodMetadataTests.java b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodMetadataTests.java index b812117e740..4127bb93eb0 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodMetadataTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodMetadataTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,17 +27,14 @@ import org.springframework.beans.factory.config.BeanDefinition; import static org.assertj.core.api.Assertions.assertThat; - - - /** * @author Phillip Webb * @author Juergen Hoeller */ -public class BeanMethodMetadataTests { +class BeanMethodMetadataTests { @Test - public void providesBeanMethodBeanDefinition() throws Exception { + void providesBeanMethodBeanDefinition() throws Exception { AnnotationConfigApplicationContext context= new AnnotationConfigApplicationContext(Conf.class); BeanDefinition beanDefinition = context.getBeanDefinition("myBean"); assertThat(beanDefinition).as("should provide AnnotatedBeanDefinition").isInstanceOf(AnnotatedBeanDefinition.class); @@ -53,7 +50,7 @@ public class BeanMethodMetadataTests { @Bean @MyAnnotation("test") - public MyBean myBean() { + MyBean myBean() { return new MyBean(); } } @@ -64,7 +61,7 @@ public class BeanMethodMetadataTests { @Retention(RetentionPolicy.RUNTIME) - public static @interface MyAnnotation { + @interface MyAnnotation { String value(); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java index a66034139b9..ada7bcc09d2 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java @@ -53,6 +53,6 @@ class WithNestedAnnotation { @Retention(RetentionPolicy.RUNTIME) @Component - public static @interface MyComponent { + @interface MyComponent { } } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java index fd73c59d23d..b07e9370fce 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java @@ -724,7 +724,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { } - public static interface PersonMBean { + public interface PersonMBean { String getName(); } 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 012da181421..aea76fca67c 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 @@ -1355,7 +1355,7 @@ class AnnotatedElementUtilsTests { } @Transactional - static interface InterfaceWithInheritedAnnotation { + interface InterfaceWithInheritedAnnotation { @Order void handleFromInterface(); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java index d65ffb0ed7f..80e137c44ee 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java @@ -97,7 +97,7 @@ class AnnotationBackCompatibiltyTests { } - static enum TestEnum { + enum TestEnum { ONE, diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationEnclosingClassSample.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationEnclosingClassSample.java index 7db91cfbe93..7ec4a2ec45c 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationEnclosingClassSample.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationEnclosingClassSample.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,6 @@ public class AnnotationEnclosingClassSample { @EnclosedThree public static class EnclosedStaticStatic { - } } @@ -43,24 +42,20 @@ public class AnnotationEnclosingClassSample { @EnclosedThree public class EnclosedInnerInner { - } } @Retention(RetentionPolicy.RUNTIME) - public static @interface EnclosedOne { - + @interface EnclosedOne { } @Retention(RetentionPolicy.RUNTIME) - public static @interface EnclosedTwo { - + @interface EnclosedTwo { } @Retention(RetentionPolicy.RUNTIME) - public static @interface EnclosedThree { - + @interface EnclosedThree { } } diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationClassLoaderTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationClassLoaderTests.java index c21ab51a40b..d69cc41e7c1 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationClassLoaderTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationClassLoaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,7 +128,7 @@ class MergedAnnotationClassLoaderTests { } @Retention(RetentionPolicy.RUNTIME) - static @interface TestMetaAnnotation { + @interface TestMetaAnnotation { @AliasFor("d") String c() default ""; @@ -144,7 +144,7 @@ class MergedAnnotationClassLoaderTests { @TestMetaAnnotation(classValue = TestReference.class, enumValue = TestEnum.TWO) @Retention(RetentionPolicy.RUNTIME) - static @interface TestAnnotation { + @interface TestAnnotation { @AliasFor("b") String a() default ""; @@ -156,16 +156,13 @@ class MergedAnnotationClassLoaderTests { @TestAnnotation static class WithTestAnnotation { - } static class TestReference { - } - static enum TestEnum { - + enum TestEnum { ONE, TWO, THREE - } + } 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 307ee7b1647..cf6469caa3d 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 @@ -2293,7 +2293,7 @@ class MergedAnnotationsTests { } } - static interface NonAnnotatedInterface { + interface NonAnnotatedInterface { } @TransactionalComponent @@ -2669,7 +2669,7 @@ class MergedAnnotationsTests { } @Transactional - static interface InterfaceWithInheritedAnnotation { + interface InterfaceWithInheritedAnnotation { @Order void handleFromInterface(); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/RepeatableContainersTests.java b/spring-core/src/test/java/org/springframework/core/annotation/RepeatableContainersTests.java index 29aeb70856a..b3a9860394a 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/RepeatableContainersTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/RepeatableContainersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -206,79 +206,67 @@ class RepeatableContainersTests { } @Retention(RetentionPolicy.RUNTIME) - static @interface NonRepeatable { + @interface NonRepeatable { String value() default ""; - } @Retention(RetentionPolicy.RUNTIME) @Repeatable(StandardContainer.class) - static @interface StandardRepeatable { + @interface StandardRepeatable { String value() default ""; - } @Retention(RetentionPolicy.RUNTIME) - static @interface StandardContainer { + @interface StandardContainer { StandardRepeatable[] value(); - } @Retention(RetentionPolicy.RUNTIME) - static @interface ExplicitRepeatable { + @interface ExplicitRepeatable { String value() default ""; - } @Retention(RetentionPolicy.RUNTIME) - static @interface ExplicitContainer { + @interface ExplicitContainer { ExplicitRepeatable[] value(); - } @Retention(RetentionPolicy.RUNTIME) - static @interface InvalidNoValue { - + @interface InvalidNoValue { } @Retention(RetentionPolicy.RUNTIME) - static @interface InvalidNotArray { + @interface InvalidNotArray { int value(); - } @Retention(RetentionPolicy.RUNTIME) - static @interface InvalidWrongArrayType { + @interface InvalidWrongArrayType { StandardRepeatable[] value(); - } @NonRepeatable("a") static class WithNonRepeatable { - } @StandardRepeatable("a") static class WithSingleStandardRepeatable { - } @StandardRepeatable("a") @StandardRepeatable("b") static class WithStandardRepeatables { - } @ExplicitContainer({ @ExplicitRepeatable("a"), @ExplicitRepeatable("b") }) static class WithExplicitRepeatables { - } } diff --git a/spring-core/src/test/java/org/springframework/core/annotation/TypeMappedAnnotationTests.java b/spring-core/src/test/java/org/springframework/core/annotation/TypeMappedAnnotationTests.java index c3fa70caade..a60173d537b 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/TypeMappedAnnotationTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/TypeMappedAnnotationTests.java @@ -132,8 +132,7 @@ class TypeMappedAnnotationTests { private AnnotationTypeMapping getMapping(Annotation annotation, Class mappedAnnotationType) { - AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType( - annotation.annotationType()); + AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(annotation.annotationType()); for (int i = 0; i < mappings.size(); i++) { AnnotationTypeMapping candidate = mappings.get(i); if (candidate.getAnnotationType().equals(mappedAnnotationType)) { @@ -233,7 +232,9 @@ class TypeMappedAnnotationTests { ExampleEnum[] enumValue(); } - enum ExampleEnum {ONE,TWO,THREE} + enum ExampleEnum { + ONE, TWO, THREE + } @Retention(RetentionPolicy.RUNTIME) @interface NestedContainer { diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index 1dbc0a23a2f..fe580d29aba 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -748,7 +748,7 @@ class GenericConversionServiceTests { } } - private static interface MyEnumBaseInterface { + private interface MyEnumBaseInterface { String getBaseCode(); } diff --git a/spring-core/src/test/java/org/springframework/core/type/AbstractAnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AbstractAnnotationMetadataTests.java index 66c21ae9f2c..850319061d1 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AbstractAnnotationMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AbstractAnnotationMetadataTests.java @@ -307,10 +307,10 @@ public abstract class AbstractAnnotationMetadataTests { public static class TestClass { } - public static interface TestInterface { + public interface TestInterface { } - public static interface TestSubInterface extends TestInterface { + public interface TestSubInterface extends TestInterface { } public @interface TestAnnotation { 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 14d4ef1a2f5..b84c16b1951 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -181,9 +181,8 @@ public abstract class AbstractMethodMetadataTests { @Test public void getAllAnnotationAttributesReturnsAllAttributes() { - MultiValueMap attributes = getTagged( - WithMetaAnnotationAttributes.class).getAllAnnotationAttributes( - AnnotationAttributes.class.getName()); + MultiValueMap attributes = getTagged(WithMetaAnnotationAttributes.class) + .getAllAnnotationAttributes(AnnotationAttributes.class.getName()); assertThat(attributes).containsOnlyKeys("name", "size"); assertThat(attributes.get("name")).containsExactlyInAnyOrder("m1", "m2"); assertThat(attributes.get("size")).containsExactlyInAnyOrder(1, 2); @@ -206,8 +205,7 @@ public abstract class AbstractMethodMetadataTests { protected abstract AnnotationMetadata get(Class source); @Retention(RetentionPolicy.RUNTIME) - public static @interface Tag { - + @interface Tag { } public static class WithMethod { @@ -288,14 +286,13 @@ public abstract class AbstractMethodMetadataTests { } @Retention(RetentionPolicy.RUNTIME) - public static @interface DirectAnnotation { - + // Must be public. See AnnotationAttributesReadingVisitor.recursivelyCollectMetaAnnotations(). + public @interface DirectAnnotation { } @DirectAnnotation @Retention(RetentionPolicy.RUNTIME) - public static @interface MetaAnnotation { - + @interface MetaAnnotation { } public static abstract class WithAnnotationAttributes { @@ -317,18 +314,17 @@ public abstract class AbstractMethodMetadataTests { @Retention(RetentionPolicy.RUNTIME) @AnnotationAttributes(name = "m1", size = 1) - public static @interface MetaAnnotationAttributes1 { - + @interface MetaAnnotationAttributes1 { } @Retention(RetentionPolicy.RUNTIME) @AnnotationAttributes(name = "m2", size = 2) - public static @interface MetaAnnotationAttributes2 { - + @interface MetaAnnotationAttributes2 { } @Retention(RetentionPolicy.RUNTIME) - public static @interface AnnotationAttributes { + // Must be public. See AnnotationAttributesReadingVisitor.recursivelyCollectMetaAnnotations(). + public @interface AnnotationAttributes { String name(); diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java index d271c2abb73..c7f9d0a3b03 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java @@ -408,7 +408,7 @@ class AnnotationMetadataTests { // ------------------------------------------------------------------------- - public static enum SomeEnum { + public enum SomeEnum { LABEL1, LABEL2, DEFAULT } diff --git a/spring-core/src/test/java/org/springframework/util/comparator/InstanceComparatorTests.java b/spring-core/src/test/java/org/springframework/util/comparator/InstanceComparatorTests.java index fc0f5e21657..4d417c41310 100644 --- a/spring-core/src/test/java/org/springframework/util/comparator/InstanceComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/util/comparator/InstanceComparatorTests.java @@ -69,11 +69,11 @@ class InstanceComparatorTests { assertThat(comparator.compare(c4, null)).isEqualTo(0); } - private static interface I1 { + private interface I1 { } - private static interface I2 { + private interface I2 { } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java index 59ce02c56d3..94a1e1a79d0 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java @@ -109,7 +109,7 @@ public class DelegatingDataSourceTests { assertThat(dataSource.isWrapperFor(ExampleWrapper.class)).isTrue(); } - public static interface ExampleWrapper { + public interface ExampleWrapper { } private static class DelegatingDataSourceWithWrapper extends DelegatingDataSource diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java index 2c2700d5e9d..9ebd5051d86 100644 --- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -239,12 +239,12 @@ class ProfileValueUtilsTests { @IfProfileValue(name = NAME, value = VALUE) @Retention(RetentionPolicy.RUNTIME) - private static @interface MetaEnabled { + private @interface MetaEnabled { } @IfProfileValue(name = NAME, value = VALUE + "X") @Retention(RetentionPolicy.RUNTIME) - private static @interface MetaDisabled { + private @interface MetaDisabled { } @MetaEnabled @@ -298,13 +298,13 @@ class ProfileValueUtilsTests { @ProfileValueSourceConfiguration(HardCodedProfileValueSource.class) @IfProfileValue(name = NAME, value = "42") @Retention(RetentionPolicy.RUNTIME) - private static @interface MetaEnabledWithCustomProfileValueSource { + private @interface MetaEnabledWithCustomProfileValueSource { } @ProfileValueSourceConfiguration(HardCodedProfileValueSource.class) @IfProfileValue(name = NAME, value = "13") @Retention(RetentionPolicy.RUNTIME) - private static @interface MetaDisabledWithCustomProfileValueSource { + private @interface MetaDisabledWithCustomProfileValueSource { } @MetaEnabledWithCustomProfileValueSource diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java index 7dc81e5360e..86926e26158 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -144,7 +144,7 @@ public class RepeatedSpringRunnerTests { @Repeat(5) @Retention(RetentionPolicy.RUNTIME) - private static @interface RepeatedFiveTimes { + private @interface RepeatedFiveTimes { } public static final class RepeatedFiveTimesViaMetaAnnotationRepeatedTestCase extends AbstractRepeatedTestCase { diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java index d392198323f..16db5a46d52 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java @@ -88,12 +88,12 @@ public class SpringJUnit4ClassRunnerTests { @Timed(millis = 10) @Retention(RetentionPolicy.RUNTIME) - private static @interface MetaTimed { + private @interface MetaTimed { } @Timed(millis = 1000) @Retention(RetentionPolicy.RUNTIME) - private static @interface MetaTimedWithOverride { + private @interface MetaTimedWithOverride { @AliasFor(annotation = Timed.class) long millis() default 1000; diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/RepeatedSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/RepeatedSpringRuleTests.java index d06cdd71015..ab6c686b22c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/RepeatedSpringRuleTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/RepeatedSpringRuleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -124,7 +124,7 @@ public class RepeatedSpringRuleTests extends RepeatedSpringRunnerTests { @Repeat(5) @Retention(RetentionPolicy.RUNTIME) - private static @interface RepeatedFiveTimes { + private @interface RepeatedFiveTimes { } public static final class RepeatedFiveTimesViaMetaAnnotationRepeatedTestCase extends AbstractRepeatedTestCase { diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java index f4e66c55411..09c60174d40 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java @@ -150,14 +150,14 @@ abstract class AbstractContextConfigurationUtilsTests { @ActiveProfiles(profiles = "foo") @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - public static @interface MetaLocationsFooConfig { + public @interface MetaLocationsFooConfig { } @ContextConfiguration @ActiveProfiles @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - public static @interface MetaLocationsFooConfigWithOverrides { + public @interface MetaLocationsFooConfigWithOverrides { @AliasFor(annotation = ContextConfiguration.class) String[] locations() default "/foo.xml"; @@ -170,7 +170,7 @@ abstract class AbstractContextConfigurationUtilsTests { @ActiveProfiles(profiles = "bar") @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - public static @interface MetaLocationsBarConfig { + public @interface MetaLocationsBarConfig { } @MetaLocationsFooConfig diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java index b192b34ee24..fab23ae19d6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -264,13 +264,13 @@ class ActiveProfilesUtilsTests extends AbstractContextConfigurationUtilsTests { @ActiveProfiles(profiles = { "dog", "cat" }, inheritProfiles = false) @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - private static @interface MetaAnimalsConfig { + private @interface MetaAnimalsConfig { } @ActiveProfiles(resolver = TestClassVerifyingActiveProfilesResolver.class) @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - private static @interface MetaResolverConfig { + private @interface MetaResolverConfig { } @MetaAnimalsConfig diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtilsTests.java index a8e97820c9b..dd0d5fe573b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,7 +79,7 @@ class AnnotationConfigContextLoaderUtilsTests { @Configuration @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - private static @interface MetaConfig { + private @interface MetaConfig { } private static class MetaAnnotatedConfigTestCase { 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 40c9042ba2a..f7619018854 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 @@ -465,7 +465,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt @ContextConfiguration @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - public static @interface SpringAppConfig { + public @interface SpringAppConfig { @AliasFor(annotation = ContextConfiguration.class) Class[] classes() default {}; diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java index ac314adb7c5..72188af6c37 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java @@ -366,7 +366,7 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati @ContextConfiguration("foo.xml") @ContextHierarchy(@ContextConfiguration("bar.xml")) @Retention(RetentionPolicy.RUNTIME) - private static @interface ContextConfigurationAndContextHierarchyOnSingleMeta { + private @interface ContextConfigurationAndContextHierarchyOnSingleMeta { } @ContextConfigurationAndContextHierarchyOnSingleMeta @@ -543,17 +543,17 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati @ContextHierarchy(@ContextConfiguration("A.xml")) @Retention(RetentionPolicy.RUNTIME) - private static @interface ContextHierarchyA { + private @interface ContextHierarchyA { } @ContextHierarchy(@ContextConfiguration({ "B-one.xml", "B-two.xml" })) @Retention(RetentionPolicy.RUNTIME) - private static @interface ContextHierarchyB { + private @interface ContextHierarchyB { } @ContextHierarchy(@ContextConfiguration("C.xml")) @Retention(RetentionPolicy.RUNTIME) - private static @interface ContextHierarchyC { + private @interface ContextHierarchyC { } @ContextHierarchyA @@ -578,7 +578,7 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati @ContextConfiguration @Retention(RetentionPolicy.RUNTIME) - private static @interface ContextConfigWithOverrides { + private @interface ContextConfigWithOverrides { @AliasFor(annotation = ContextConfiguration.class) String[] locations() default "A.xml"; diff --git a/spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java index ef5b9abf978..b0745131377 100644 --- a/spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java @@ -285,7 +285,7 @@ class TransactionalTestExecutionListenerTests { @Transactional @Retention(RetentionPolicy.RUNTIME) - private static @interface MetaTxWithOverride { + private @interface MetaTxWithOverride { @AliasFor(annotation = Transactional.class) String transactionManager() default ""; diff --git a/spring-test/src/test/java/org/springframework/test/util/AopTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/AopTestUtilsTests.java index 6c43a66e5f7..8bebd7abc88 100644 --- a/spring-test/src/test/java/org/springframework/test/util/AopTestUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/util/AopTestUtilsTests.java @@ -142,7 +142,7 @@ class AopTestUtilsTests { } - static interface Foo { + interface Foo { } static class FooImpl implements Foo { 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 c75f4ac3784..22ed99a2b9a 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 @@ -512,7 +512,7 @@ public class TransactionalEventListenerTests { @Transactional @Component - static interface TransactionalComponentTestListenerInterface { + interface TransactionalComponentTestListenerInterface { // Cannot use #data in condition due to dynamic proxy. @TransactionalEventListener(condition = "!'SKIP'.equals(#p0)") diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java index d6bed9d7d8b..2b6863bacea 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java @@ -381,7 +381,7 @@ class ContextLoaderTests { } - private static interface UnknownApplicationContext extends ConfigurableApplicationContext { + private interface UnknownApplicationContext extends ConfigurableApplicationContext { void unheardOf(); }