Merge pull request #371 from Ladicek/improve-allocations-in-annotatio…

…n-overlay improve allocations in the annotation overlay
smallrye · May 17, 2024 · 3134b6f · 3134b6f
2 parents ef5859a + 29acecc
commit 3134b6f
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/core/src/main/java/org/jboss/jandex/AnnotationOverlayImpl.java b/core/src/main/java/org/jboss/jandex/AnnotationOverlayImpl.java
@@ -231,20 +231,17 @@ public final Collection<AnnotationInstance> annotations(Declaration declaration)
 
     Set<AnnotationInstance> getAnnotationsFor(Declaration declaration) {
         EquivalenceKey key = EquivalenceKey.of(declaration);
-        Set<AnnotationInstance> annotations = overlay.get(key);
-
-        if (annotations == null) {
-            Collection<AnnotationInstance> original = new HashSet<>(getOriginalAnnotations(declaration));
+        Set<AnnotationInstance> annotations = overlay.computeIfAbsent(key, ignored -> {
+            Set<AnnotationInstance> original = getOriginalAnnotations(declaration);
             TransformationContextImpl transformationContext = new TransformationContextImpl(declaration, original);
             for (AnnotationTransformation transformation : transformations) {
                 if (transformation.supports(declaration.kind())) {
                     transformation.apply(transformationContext);
                 }
             }
             Set<AnnotationInstance> result = transformationContext.annotations;
-            annotations = original.equals(result) ? SENTINEL : Collections.unmodifiableSet(result);
-            overlay.put(key, annotations);
-        }
+            return original.equals(result) ? SENTINEL : Collections.unmodifiableSet(result);
+        });
 
         if (annotations == SENTINEL) {
             annotations = getOriginalAnnotations(declaration);