root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Consistent parameter declaration order

This commit is contained in:
Sam Brannen 2025-03-21 11:13:03 +01:00
parent 66c94bb4a2
commit 3e788e4ca1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
View File

@ -464,7 +464,7 @@ public abstract class AnnotatedElementUtils {
AnnotatedElement element, Class<A> annotationType, AnnotatedElement element, Class<A> annotationType,
@Nullable Class<? extends Annotation> containerType) { @Nullable Class<? extends Annotation> containerType) {
return getRepeatableAnnotations(element, containerType, annotationType) return getRepeatableAnnotations(element, annotationType, containerType)
.stream(annotationType) .stream(annotationType)
.collect(MergedAnnotationCollectors.toAnnotationSet()); .collect(MergedAnnotationCollectors.toAnnotationSet());
} }
@ -760,7 +760,7 @@ public abstract class AnnotatedElementUtils {
public static <A extends Annotation> Set<A> findMergedRepeatableAnnotations(AnnotatedElement element, public static <A extends Annotation> Set<A> findMergedRepeatableAnnotations(AnnotatedElement element,
Class<A> annotationType, @Nullable Class<? extends Annotation> containerType) { Class<A> annotationType, @Nullable Class<? extends Annotation> containerType) {
return findRepeatableAnnotations(element, containerType, annotationType) return findRepeatableAnnotations(element, annotationType, containerType)
.stream(annotationType) .stream(annotationType)
.sorted(highAggregateIndexesFirst()) .sorted(highAggregateIndexesFirst())
.collect(MergedAnnotationCollectors.toAnnotationSet()); .collect(MergedAnnotationCollectors.toAnnotationSet());
@ -771,7 +771,7 @@ public abstract class AnnotatedElementUtils {
} }
private static MergedAnnotations getRepeatableAnnotations(AnnotatedElement element, private static MergedAnnotations getRepeatableAnnotations(AnnotatedElement element,
@Nullable Class<? extends Annotation> containerType, Class<? extends Annotation> annotationType) { Class<? extends Annotation> annotationType, @Nullable Class<? extends Annotation> containerType) {
RepeatableContainers repeatableContainers; RepeatableContainers repeatableContainers;
if (containerType == null) { if (containerType == null) {
@ -798,7 +798,7 @@ public abstract class AnnotatedElementUtils {
} }
private static MergedAnnotations findRepeatableAnnotations(AnnotatedElement element, private static MergedAnnotations findRepeatableAnnotations(AnnotatedElement element,
@Nullable Class<? extends Annotation> containerType, Class<? extends Annotation> annotationType) { Class<? extends Annotation> annotationType, @Nullable Class<? extends Annotation> containerType) {
RepeatableContainers repeatableContainers; RepeatableContainers repeatableContainers;
if (containerType == null) { if (containerType == null) {