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 657d2b78dee..b73e2c5c26c 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 @@ -145,12 +145,12 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean private static final boolean JNDI_PRESENT = ClassUtils.isPresent( "javax.naming.InitialContext", CommonAnnotationBeanPostProcessor.class.getClassLoader()); - private static final Set> resourceAnnotationTypes = CollectionUtils.newLinkedHashSet(3); - private static final @Nullable Class JAKARTA_RESOURCE_TYPE; private static final @Nullable Class EJB_ANNOTATION_TYPE; + private static final Set> resourceAnnotationTypes = CollectionUtils.newLinkedHashSet(2); + static { JAKARTA_RESOURCE_TYPE = loadAnnotationType("jakarta.annotation.Resource"); if (JAKARTA_RESOURCE_TYPE != null) { diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java index b5ddcf4507c..258d5103bed 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java @@ -200,9 +200,9 @@ class MockServletContextTests { assertThat(filterRegistrations).isNotNull(); assertThat(filterRegistrations).isEmpty(); } - } + /** * @since 5.1.11 */ @@ -242,7 +242,6 @@ class MockServletContextTests { assertThat(realPath).isNotNull(); } } - } }