diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java index b4851d4f9f..7d89175c8c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java @@ -263,7 +263,7 @@ final class InstantiationModelAwarePointcutAdvisorImpl * Note that this is a dynamic pointcut; otherwise it might be optimized out * if it does not at first match statically. */ - private final class PerTargetInstantiationModelPointcut extends DynamicMethodMatcherPointcut { + private static final class PerTargetInstantiationModelPointcut extends DynamicMethodMatcherPointcut { private final AspectJExpressionPointcut declaredPointcut; diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java index 67d32fe668..34532d1c81 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java @@ -565,7 +565,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean * Class representing generic injection information about an annotated field * or setter method, supporting @Resource and related annotations. */ - protected abstract class LookupElement extends InjectionMetadata.InjectedElement { + protected abstract static class LookupElement extends InjectionMetadata.InjectedElement { protected String name = ""; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/IntegerToEnumConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/IntegerToEnumConverterFactory.java index 8d56edee3f..a7acc3a6d5 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/IntegerToEnumConverterFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/IntegerToEnumConverterFactory.java @@ -35,7 +35,7 @@ final class IntegerToEnumConverterFactory implements ConverterFactory implements Converter { + private static class IntegerToEnum implements Converter { private final Class enumType; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java index 5e45e62d48..90895bc1e6 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java @@ -35,7 +35,7 @@ final class StringToEnumConverterFactory implements ConverterFactory implements Converter { + private static class StringToEnum implements Converter { private final Class enumType; diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java index ac544295e8..262f227817 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java @@ -617,7 +617,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init * Opaque object used to hold Transaction information. Subclasses * must pass it back to methods on this class, but not see its internals. */ - protected final class TransactionInfo { + protected static final class TransactionInfo { @Nullable private final PlatformTransactionManager transactionManager;