From 5619b005f03d5b4160c3a0bf31991067f58401be Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 30 Mar 2016 10:22:30 +0200 Subject: [PATCH] Polishing --- .../core/annotation/AnnotatedElementUtils.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 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 d28724eebb..79fbe118e8 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 @@ -966,9 +966,8 @@ public class AnnotatedElementUtils { } /** - * This method is invoked by - * {@link #searchWithGetSemantics(AnnotatedElement, Class, String, Processor, Set, int)} - * to perform the actual search within the supplied list of annotations. + * This method is invoked by {@link #searchWithGetSemantics} to perform + * the actual search within the supplied list of annotations. *

This method should be invoked first with locally declared annotations * and then subsequently with inherited annotations, thereby allowing * local annotations to take precedence over inherited annotations. @@ -996,10 +995,9 @@ public class AnnotatedElementUtils { // Search in annotations for (Annotation annotation : annotations) { if (!AnnotationUtils.isInJavaLangAnnotationPackage(annotation)) { - if ((annotation.annotationType() == annotationType - || annotation.annotationType().getName().equals(annotationName)) - || processor.alwaysProcesses()) { - + if (annotation.annotationType() == annotationType || + annotation.annotationType().getName().equals(annotationName) || + processor.alwaysProcesses()) { T result = processor.process(element, annotation, metaDepth); if (result != null) { if (processor.aggregates() && metaDepth == 0) {