From f602967dbcd775285834950925e1d1eaa4dc20d2 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Wed, 8 Apr 2026 11:42:09 +0200 Subject: [PATCH] Consistently supply List to MergedAnnotations.of() --- .../classreading/SimpleAnnotationMetadataReadingVisitor.java | 4 +++- .../core/type/classreading/ClassFileAnnotationMetadata.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java index 3802ee7d48d..70ccfb53a2c 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java @@ -16,7 +16,9 @@ package org.springframework.core.type.classreading; +import java.util.ArrayList; import java.util.LinkedHashSet; +import java.util.List; import java.util.Set; import org.jspecify.annotations.Nullable; @@ -57,7 +59,7 @@ final class SimpleAnnotationMetadataReadingVisitor extends ClassVisitor { private final Set memberClassNames = new LinkedHashSet<>(4); - private final Set> annotations = new LinkedHashSet<>(4); + private final List> annotations = new ArrayList<>(4); private final Set declaredMethods = new LinkedHashSet<>(4); diff --git a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java index 2ddf9844fcd..0cf823759f0 100644 --- a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java +++ b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java @@ -255,7 +255,7 @@ final class ClassFileAnnotationMetadata implements AnnotationMetadata { private Set declaredMethods = new LinkedHashSet<>(4); - private MergedAnnotations mergedAnnotations = MergedAnnotations.of(Collections.emptySet()); + private MergedAnnotations mergedAnnotations = MergedAnnotations.of(Collections.emptyList()); public Builder(ClassLoader classLoader) { this.classLoader = classLoader;