Merge branch '5.2.x'

spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java

@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.IntStream;
 
 import javax.annotation.Nullable;
 
@@ -38,6 +39,7 @@ import org.springframework.core.annotation.AnnotationTypeMapping.MirrorSets.Mirr
 import org.springframework.lang.UsesSunMisc;
 import org.springframework.util.ReflectionUtils;
 
+import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
@@ -83,6 +85,14 @@ class AnnotationTypeMappingsTests {
 						WithRepeatedMetaAnnotations.class, Repeating.class, Repeating.class);
 	}
 
+	@Test
+	void forAnnotationTypeWhenRepeatableMetaAnnotationIsFiltered() {
+		AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(WithRepeatedMetaAnnotations.class,
+				Repeating.class.getName()::equals);
+		assertThat(getAll(mappings)).flatExtracting(AnnotationTypeMapping::getAnnotationType)
+				.containsExactly(WithRepeatedMetaAnnotations.class);
+	}
+
 	@Test
 	void forAnnotationTypeWhenSelfAnnotatedReturnsMapping() {
 		AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(SelfAnnotated.class);
@@ -500,11 +510,7 @@ class AnnotationTypeMappingsTests {
 	private List<AnnotationTypeMapping> getAll(AnnotationTypeMappings mappings) {
 		// AnnotationTypeMappings does not implement Iterable so we don't create
 		// too many garbage Iterators
-		List<AnnotationTypeMapping> result = new ArrayList<>(mappings.size());
-		for (int i = 0; i < mappings.size(); i++) {
-			result.add(mappings.get(i));
-		}
-		return result;
+		return IntStream.range(0, mappings.size()).mapToObj(mappings::get).collect(toList());
 	}
 
 	private List<String> getNames(MirrorSet mirrorSet) {

spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsRepeatableAnnotationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.AnnotatedElement;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import org.assertj.core.api.ThrowableTypeAssert;
 import org.junit.jupiter.api.Test;
@@ -222,14 +223,35 @@ class MergedAnnotationsRepeatableAnnotationTests {
 				"B", "C");
 	}
 
-	private <A extends Annotation> Set<A> getAnnotations(
-			Class<? extends Annotation> container, Class<A> repeatable,
-			SearchStrategy searchStrategy, AnnotatedElement element) {
+	@Test
+	void typeHierarchyAnnotationsWithLocalComposedAnnotationWhoseRepeatableMetaAnnotationsAreFiltered() {
+		Class<WithRepeatedMetaAnnotationsClass> element = WithRepeatedMetaAnnotationsClass.class;
+		SearchStrategy searchStrategy = SearchStrategy.TYPE_HIERARCHY;
+		AnnotationFilter annotationFilter = PeteRepeat.class.getName()::equals;
+
+		Set<PeteRepeat> annotations = getAnnotations(null, PeteRepeat.class, searchStrategy, element, annotationFilter);
+		assertThat(annotations).isEmpty();
+
+		MergedAnnotations mergedAnnotations = MergedAnnotations.from(element, searchStrategy,
+				RepeatableContainers.standardRepeatables(), annotationFilter);
+		Stream<Class<? extends Annotation>> annotationTypes = mergedAnnotations.stream()
+				.map(MergedAnnotation::synthesize)
+				.map(Annotation::annotationType);
+		assertThat(annotationTypes).containsExactly(WithRepeatedMetaAnnotations.class, Noninherited.class, Noninherited.class);
+	}
+
+	private <A extends Annotation> Set<A> getAnnotations(Class<? extends Annotation> container,
+			Class<A> repeatable, SearchStrategy searchStrategy, AnnotatedElement element) {
+
+		return getAnnotations(container, repeatable, searchStrategy, element, AnnotationFilter.PLAIN);
+	}
+
+	private <A extends Annotation> Set<A> getAnnotations(Class<? extends Annotation> container,
+			Class<A> repeatable, SearchStrategy searchStrategy, AnnotatedElement element, AnnotationFilter annotationFilter) {
+
 		RepeatableContainers containers = RepeatableContainers.of(repeatable, container);
-		MergedAnnotations annotations = MergedAnnotations.from(element,
-				searchStrategy, containers, AnnotationFilter.PLAIN);
-		return annotations.stream(repeatable).collect(
-				MergedAnnotationCollectors.toAnnotationSet());
+		MergedAnnotations annotations = MergedAnnotations.from(element, searchStrategy, containers, annotationFilter);
+		return annotations.stream(repeatable).collect(MergedAnnotationCollectors.toAnnotationSet());
 	}
 
 	private void nonRepeatableRequirements(Exception ex) {
@@ -414,4 +436,17 @@ class MergedAnnotationsRepeatableAnnotationTests {
 
 	}
 
+	@Retention(RetentionPolicy.RUNTIME)
+	@PeteRepeat("A")
+	@PeteRepeat("B")
+	@interface WithRepeatedMetaAnnotations {
+	}
+
+	@WithRepeatedMetaAnnotations
+	@PeteRepeat("C")
+	@Noninherited("X")
+	@Noninherited("Y")
+	static class WithRepeatedMetaAnnotationsClass {
+	}
+
 }