Skip to content

Commit 3e788e4

Browse files
committed
Consistent parameter declaration order
1 parent 66c94bb commit 3e788e4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ public static <A extends Annotation> Set<A> getMergedRepeatableAnnotations(
464464
AnnotatedElement element, Class<A> annotationType,
465465
@Nullable Class<? extends Annotation> containerType) {
466466

467-
return getRepeatableAnnotations(element, containerType, annotationType)
467+
return getRepeatableAnnotations(element, annotationType, containerType)
468468
.stream(annotationType)
469469
.collect(MergedAnnotationCollectors.toAnnotationSet());
470470
}
@@ -760,7 +760,7 @@ public static <A extends Annotation> Set<A> findMergedRepeatableAnnotations(Anno
760760
public static <A extends Annotation> Set<A> findMergedRepeatableAnnotations(AnnotatedElement element,
761761
Class<A> annotationType, @Nullable Class<? extends Annotation> containerType) {
762762

763-
return findRepeatableAnnotations(element, containerType, annotationType)
763+
return findRepeatableAnnotations(element, annotationType, containerType)
764764
.stream(annotationType)
765765
.sorted(highAggregateIndexesFirst())
766766
.collect(MergedAnnotationCollectors.toAnnotationSet());
@@ -771,7 +771,7 @@ private static MergedAnnotations getAnnotations(AnnotatedElement element) {
771771
}
772772

773773
private static MergedAnnotations getRepeatableAnnotations(AnnotatedElement element,
774-
@Nullable Class<? extends Annotation> containerType, Class<? extends Annotation> annotationType) {
774+
Class<? extends Annotation> annotationType, @Nullable Class<? extends Annotation> containerType) {
775775

776776
RepeatableContainers repeatableContainers;
777777
if (containerType == null) {
@@ -798,7 +798,7 @@ private static MergedAnnotations findAnnotations(AnnotatedElement element) {
798798
}
799799

800800
private static MergedAnnotations findRepeatableAnnotations(AnnotatedElement element,
801-
@Nullable Class<? extends Annotation> containerType, Class<? extends Annotation> annotationType) {
801+
Class<? extends Annotation> annotationType, @Nullable Class<? extends Annotation> containerType) {
802802

803803
RepeatableContainers repeatableContainers;
804804
if (containerType == null) {

0 commit comments

Comments
 (0)