Merge pull request #16745 from izeye

snicoll · snicoll · commit 0635d86cf446 · 2019-05-21T09:26:51.000+02:00
* pr/16745:
  Use MergedAnnotation.getRoot() in PropertyMappingCheckBeanPostProcessor
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java
@@ -93,10 +93,7 @@ public Object postProcessBeforeInitialization(Object bean, String beanName)
 		}
 
 		private Class<?> getRoot(MergedAnnotation<?> annotation) {
-			while (annotation.getParent() != null) {
-				annotation = annotation.getParent();
-			}
-			return annotation.getType();
+			return annotation.getRoot().getType();
 		}
 
 		private String getAnnotationsDescription(Set<Class<?>> annotations) {

Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,7 @@ public Object postProcessBeforeInitialization(Object bean, String beanName)`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`private Class<?> getRoot(MergedAnnotation<?> annotation) {`
`96`		`- while (annotation.getParent() != null) {`
`97`		`- annotation = annotation.getParent();`
`98`		`- }`
`99`		`- return annotation.getType();`
	`96`	`+ return annotation.getRoot().getType();`
`100`	`97`	`}`
`101`	`98`
`102`	`99`	`private String getAnnotationsDescription(Set<Class<?>> annotations) {`