root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Remove deprecated MergedAnnotations.SearchStrategy.EXHAUSTIVE constant 

Closes gh-23391
This commit is contained in:
Sam Brannen 2019-08-07 12:34:17 +02:00
parent a43ba052e9
commit 24f8d30935
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
View File

@ -113,7 +113,6 @@ abstract class AnnotationsScanner {
} }
@Nullable @Nullable
@SuppressWarnings("deprecation")
private static <C, R> R processClass(C context, Class<?> source, private static <C, R> R processClass(C context, Class<?> source,
SearchStrategy searchStrategy, AnnotationsProcessor<C, R> processor, SearchStrategy searchStrategy, AnnotationsProcessor<C, R> processor,
@Nullable BiPredicate<C, Class<?>> classFilter) { @Nullable BiPredicate<C, Class<?>> classFilter) {
@ -125,7 +124,6 @@ abstract class AnnotationsScanner {
return processClassInheritedAnnotations(context, source, searchStrategy, processor, classFilter); return processClassInheritedAnnotations(context, source, searchStrategy, processor, classFilter);
case SUPERCLASS: case SUPERCLASS:
return processClassHierarchy(context, source, processor, classFilter, false, false); return processClassHierarchy(context, source, processor, classFilter, false, false);
case EXHAUSTIVE:
case TYPE_HIERARCHY: case TYPE_HIERARCHY:
return processClassHierarchy(context, source, processor, classFilter, true, false); return processClassHierarchy(context, source, processor, classFilter, true, false);
case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES: case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES:
@ -244,7 +242,6 @@ abstract class AnnotationsScanner {
} }
@Nullable @Nullable
@SuppressWarnings("deprecation")
private static <C, R> R processMethod(C context, Method source, private static <C, R> R processMethod(C context, Method source,
SearchStrategy searchStrategy, AnnotationsProcessor<C, R> processor, SearchStrategy searchStrategy, AnnotationsProcessor<C, R> processor,
@Nullable BiPredicate<C, Class<?>> classFilter) { @Nullable BiPredicate<C, Class<?>> classFilter) {
@ -256,7 +253,6 @@ abstract class AnnotationsScanner {
case SUPERCLASS: case SUPERCLASS:
return processMethodHierarchy(context, new int[] {0}, source.getDeclaringClass(), return processMethodHierarchy(context, new int[] {0}, source.getDeclaringClass(),
processor, classFilter, source, false); processor, classFilter, source, false);
case EXHAUSTIVE:
case TYPE_HIERARCHY: case TYPE_HIERARCHY:
case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES: case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES:
return processMethodHierarchy(context, new int[] {0}, source.getDeclaringClass(), return processMethodHierarchy(context, new int[] {0}, source.getDeclaringClass(),

9
spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
View File

@ -425,15 +425,6 @@ public interface MergedAnnotations extends Iterable<MergedAnnotation<Annotation>
*/ */
SUPERCLASS, 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 * Perform a full search of the entire type hierarchy, including
* superclasses and implemented interfaces. Superclass annotations do * superclasses and implemented interfaces. Superclass annotations do