Skip to content

Avoid allocations for cached annotation mappings #37141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gregjotau wants to merge 2 commits into
base: main
Choose a base branch
from
+39 −6
Open

Avoid allocations for cached annotation mappings #37141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baa2ef2
Avoid allocations for cached annotation mappings
gregjotau Aug 15, 2026
f0a932b
Polish AnnotationTypeMappings cache-hit path
gregjotau Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 32 additions & 6 deletions spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMappings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
*
* @author Phillip Webb
* @author Sam Brannen
* @author Greg Taube
* @since 5.2
* @see AnnotationTypeMapping
*/
Expand Down Expand Up @@ -178,7 +179,7 @@ AnnotationTypeMapping get(int index) {
* @return type mappings for the annotation type
*/
static AnnotationTypeMappings forAnnotationType(Class<? extends Annotation> annotationType) {
return forAnnotationType(annotationType, new HashSet<>());
return forAnnotationType(annotationType, RepeatableContainers.standardRepeatables(), AnnotationFilter.PLAIN);
}

/**
Expand Down Expand Up @@ -208,7 +209,11 @@ static AnnotationTypeMappings forAnnotationType(Class<? extends Annotation> anno
static AnnotationTypeMappings forAnnotationType(Class<? extends Annotation> annotationType,
RepeatableContainers repeatableContainers, AnnotationFilter annotationFilter) {

return forAnnotationType(annotationType, repeatableContainers, annotationFilter, new HashSet<>());
Cache cache = getCache(repeatableContainers, annotationFilter);
if (cache != null) {
return cache.get(annotationType);
}
return new AnnotationTypeMappings(repeatableContainers, annotationFilter, annotationType, new HashSet<>());
}

/**
Expand All @@ -227,16 +232,26 @@ static AnnotationTypeMappings forAnnotationType(Class<? extends Annotation> anno
RepeatableContainers repeatableContainers, AnnotationFilter annotationFilter,
Set<Class<? extends Annotation>> visitedAnnotationTypes) {

Cache cache = getCache(repeatableContainers, annotationFilter);
if (cache != null) {
return cache.get(annotationType, visitedAnnotationTypes);
}
return new AnnotationTypeMappings(repeatableContainers, annotationFilter, annotationType,
visitedAnnotationTypes);
}

private static @Nullable Cache getCache(
RepeatableContainers repeatableContainers, AnnotationFilter annotationFilter) {

if (repeatableContainers == RepeatableContainers.standardRepeatables()) {
return standardRepeatablesCache.computeIfAbsent(annotationFilter,
key -> new Cache(repeatableContainers, key)).get(annotationType, visitedAnnotationTypes);
key -> new Cache(repeatableContainers, key));
}
if (repeatableContainers == RepeatableContainers.none()) {
return noRepeatablesCache.computeIfAbsent(annotationFilter,
key -> new Cache(repeatableContainers, key)).get(annotationType, visitedAnnotationTypes);
key -> new Cache(repeatableContainers, key));
}
return new AnnotationTypeMappings(repeatableContainers, annotationFilter, annotationType,
visitedAnnotationTypes);
return null;
}

static void clearCache() {
Expand Down Expand Up @@ -277,6 +292,17 @@ private static class Cache {
AnnotationTypeMappings get(Class<? extends Annotation> annotationType,
Set<Class<? extends Annotation>> visitedAnnotationTypes) {

return getOrCreate(annotationType, visitedAnnotationTypes);
}

AnnotationTypeMappings get(Class<? extends Annotation> annotationType) {
AnnotationTypeMappings result = this.mappings.get(annotationType);
return (result != null ? result : getOrCreate(annotationType, new HashSet<>()));
}

private AnnotationTypeMappings getOrCreate(Class<? extends Annotation> annotationType,
Set<Class<? extends Annotation>> visitedAnnotationTypes) {

AnnotationTypeMappings result = this.mappings.get(annotationType);
if (result != null) {
return result;
Expand Down
7 changes: 7 additions & 0 deletions ...g-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@
*/
class AnnotationTypeMappingsTests {

@Test
void forAnnotationTypeWhenCalledTwiceReturnsCachedInstance() {
AnnotationTypeMappings first = AnnotationTypeMappings.forAnnotationType(SimpleAnnotation.class);
AnnotationTypeMappings second = AnnotationTypeMappings.forAnnotationType(SimpleAnnotation.class);
assertThat(second).isSameAs(first);
}

@Test
void forAnnotationTypeWhenNoMetaAnnotationsReturnsMappings() {
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(SimpleAnnotation.class);
Expand Down