Polishing

See gh-31962
spring-projects · Jan 18, 2024 · 6b90504 · 6b90504
1 parent 88a7ca0
commit 6b90504
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...g/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java b/...g/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
@@ -433,12 +433,11 @@ private String resolveCorsAnnotationValue(String value) {
 	private static class AnnotationDescriptor<A extends Annotation> {
 
 		private final A annotation;
-		private final Annotation source;
+		private final MergedAnnotation<?> root;
 
 		AnnotationDescriptor(MergedAnnotation<A> mergedAnnotation) {
 			this.annotation = mergedAnnotation.synthesize();
-			this.source = (mergedAnnotation.getDistance() > 0 ?
-					mergedAnnotation.getRoot().synthesize() : this.annotation);
+			this.root = mergedAnnotation.getRoot();
 		}
 
 		@Override
@@ -453,7 +452,7 @@ public int hashCode() {
 
 		@Override
 		public String toString() {
-			return this.source.toString();
+			return this.root.synthesize().toString();
 		}
 
 	}

diff --git a/...a/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/...a/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -612,12 +612,11 @@ private String resolveCorsAnnotationValue(String value) {
 	private static class AnnotationDescriptor<A extends Annotation> {
 
 		private final A annotation;
-		private final Annotation source;
+		private final MergedAnnotation<?> root;
 
 		AnnotationDescriptor(MergedAnnotation<A> mergedAnnotation) {
 			this.annotation = mergedAnnotation.synthesize();
-			this.source = (mergedAnnotation.getDistance() > 0 ?
-					mergedAnnotation.getRoot().synthesize() : this.annotation);
+			this.root = mergedAnnotation.getRoot();
 		}
 
 		@Override
@@ -632,7 +631,7 @@ public int hashCode() {
 
 		@Override
 		public String toString() {
-			return this.source.toString();
+			return this.root.synthesize().toString();
 		}
 
 	}