From 3e788e4ca1e4c0fc35d0797ba390d2aff7067a35 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Fri, 21 Mar 2025 11:13:03 +0100
Subject: [PATCH] Consistent parameter declaration order
---
.../core/annotation/AnnotatedElementUtils.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
index b79a97b47d..35ed4562a6 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
@@ -464,7 +464,7 @@ public abstract class AnnotatedElementUtils {
AnnotatedElement element, Class annotationType,
@Nullable Class extends Annotation> containerType) {
- return getRepeatableAnnotations(element, containerType, annotationType)
+ return getRepeatableAnnotations(element, annotationType, containerType)
.stream(annotationType)
.collect(MergedAnnotationCollectors.toAnnotationSet());
}
@@ -760,7 +760,7 @@ public abstract class AnnotatedElementUtils {
public static Set findMergedRepeatableAnnotations(AnnotatedElement element,
Class annotationType, @Nullable Class extends Annotation> containerType) {
- return findRepeatableAnnotations(element, containerType, annotationType)
+ return findRepeatableAnnotations(element, annotationType, containerType)
.stream(annotationType)
.sorted(highAggregateIndexesFirst())
.collect(MergedAnnotationCollectors.toAnnotationSet());
@@ -771,7 +771,7 @@ public abstract class AnnotatedElementUtils {
}
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;
if (containerType == null) {
@@ -798,7 +798,7 @@ public abstract class AnnotatedElementUtils {
}
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;
if (containerType == null) {