Expose empty annotation array as empty AnnotationAttributes array

jhoeller · jhoeller · commit 863754067863 · 2019-02-12T09:07:51.000+01:00
Closes spring-projectsgh-22405
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -184,6 +184,20 @@ public void postProcessorWorksWithComposedConfigurationWithAttributeOverrideForE
 		assertSupportForComposedAnnotationWithExclude(beanDefinition);
 	}
 
+	@Test
+	public void postProcessorWorksWithExtendedConfigurationWithAttributeOverrideForExcludesFilterUsingReflection() {
+		RootBeanDefinition beanDefinition = new RootBeanDefinition(
+				ExtendedConfigurationWithAttributeOverrideForExcludeFilter.class);
+		assertSupportForComposedAnnotationWithExclude(beanDefinition);
+	}
+
+	@Test
+	public void postProcessorWorksWithExtendedConfigurationWithAttributeOverrideForExcludesFilterUsingAsm() {
+		RootBeanDefinition beanDefinition = new RootBeanDefinition(
+				ExtendedConfigurationWithAttributeOverrideForExcludeFilter.class.getName());
+		assertSupportForComposedAnnotationWithExclude(beanDefinition);
+	}
+
 	@Test
 	public void postProcessorWorksWithComposedComposedConfigurationWithAttributeOverridesUsingReflection() {
 		RootBeanDefinition beanDefinition = new RootBeanDefinition(
@@ -1515,6 +1529,15 @@ public static class ComposedConfigurationWithAttributeOverrideForBasePackage {
 	public static class ComposedConfigurationWithAttributeOverrideForExcludeFilter {
 	}
 
+	@ComponentScan(basePackages = "org.springframework.context.annotation.componentscan.base", excludeFilters = {})
+	public static class BaseConfigurationWithEmptyExcludeFilters {
+	}
+
+	@ComponentScan(basePackages = "org.springframework.context.annotation.componentscan.simple",
+			excludeFilters = @ComponentScan.Filter(Component.class))
+	public static class ExtendedConfigurationWithAttributeOverrideForExcludeFilter extends BaseConfigurationWithEmptyExcludeFilters {
+	}
+
 	@ComposedConfigurationWithAttributeOverrides
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.TYPE)
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -89,7 +89,11 @@ else if (!this.attributes.containsKey(this.attributeName)) {
 				try {
 					Class<?> attributeType = annotationType.getMethod(this.attributeName).getReturnType();
 					if (attributeType.isArray()) {
-						this.attributes.put(this.attributeName, Array.newInstance(attributeType.getComponentType(), 0));
+						Class<?> elementType = attributeType.getComponentType();
+						if (elementType.isAnnotation()) {
+							elementType = AnnotationAttributes.class;
+						}
+						this.attributes.put(this.attributeName, Array.newInstance(elementType, 0));
 					}
 				}
 				catch (NoSuchMethodException ex) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2018 the original author or authors.`
	`2`	`+ * Copyright 2002-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -89,7 +89,11 @@ else if (!this.attributes.containsKey(this.attributeName)) {`
`89`	`89`	`try {`
`90`	`90`	`Class<?> attributeType = annotationType.getMethod(this.attributeName).getReturnType();`
`91`	`91`	`if (attributeType.isArray()) {`
`92`		`- this.attributes.put(this.attributeName, Array.newInstance(attributeType.getComponentType(), 0));`
	`92`	`+ Class<?> elementType = attributeType.getComponentType();`
	`93`	`+ if (elementType.isAnnotation()) {`
	`94`	`+ elementType = AnnotationAttributes.class;`
	`95`	`+ }`
	`96`	`+ this.attributes.put(this.attributeName, Array.newInstance(elementType, 0));`
`93`	`97`	`}`
`94`	`98`	`}`
`95`	`99`	`catch (NoSuchMethodException ex) {`