From 24f8d3093597c7f7e3b40c8e63a034998fd92e32 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 7 Aug 2019 12:34:17 +0200 Subject: [PATCH] Remove deprecated MergedAnnotations.SearchStrategy.EXHAUSTIVE constant Closes gh-23391 --- .../core/annotation/AnnotationsScanner.java | 4 ---- .../core/annotation/MergedAnnotations.java | 9 --------- 2 files changed, 13 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java index 3cd819c684c..de132349369 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java @@ -113,7 +113,6 @@ abstract class AnnotationsScanner { } @Nullable - @SuppressWarnings("deprecation") private static R processClass(C context, Class source, SearchStrategy searchStrategy, AnnotationsProcessor processor, @Nullable BiPredicate> classFilter) { @@ -125,7 +124,6 @@ abstract class AnnotationsScanner { return processClassInheritedAnnotations(context, source, searchStrategy, processor, classFilter); case SUPERCLASS: return processClassHierarchy(context, source, processor, classFilter, false, false); - case EXHAUSTIVE: case TYPE_HIERARCHY: return processClassHierarchy(context, source, processor, classFilter, true, false); case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES: @@ -244,7 +242,6 @@ abstract class AnnotationsScanner { } @Nullable - @SuppressWarnings("deprecation") private static R processMethod(C context, Method source, SearchStrategy searchStrategy, AnnotationsProcessor processor, @Nullable BiPredicate> classFilter) { @@ -256,7 +253,6 @@ abstract class AnnotationsScanner { case SUPERCLASS: return processMethodHierarchy(context, new int[] {0}, source.getDeclaringClass(), processor, classFilter, source, false); - case EXHAUSTIVE: case TYPE_HIERARCHY: case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES: return processMethodHierarchy(context, new int[] {0}, source.getDeclaringClass(), diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java index d729f7128a6..dcdf0c88e0d 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java @@ -425,15 +425,6 @@ public interface MergedAnnotations extends Iterable */ SUPERCLASS, - /** - * Perform a full search of all related elements, including those on any - * superclasses or implemented interfaces. Superclass annotations do - * not need to be meta-annotated with {@link Inherited @Inherited}. - * @deprecated since 5.2.0.RC1 in favor of {@link #TYPE_HIERARCHY}. - */ - @Deprecated - EXHAUSTIVE, - /** * Perform a full search of the entire type hierarchy, including * superclasses and implemented interfaces. Superclass annotations do