From 2a2efbe6119621f3ac3667820ef28e9d9a90692b Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 16 Jan 2020 16:34:21 +0100 Subject: [PATCH] Introduce @Disabled regression test for gh-24375 --- .../src/test/java/example/gh24375/A.java | 35 +++++++++++++++++++ .../src/test/java/example/gh24375/B.java | 29 +++++++++++++++ .../java/example/gh24375/MyComponent.java | 24 +++++++++++++ ...anningCandidateComponentProviderTests.java | 14 +++++++- 4 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 spring-context/src/test/java/example/gh24375/A.java create mode 100644 spring-context/src/test/java/example/gh24375/B.java create mode 100644 spring-context/src/test/java/example/gh24375/MyComponent.java diff --git a/spring-context/src/test/java/example/gh24375/A.java b/spring-context/src/test/java/example/gh24375/A.java new file mode 100644 index 0000000000..a55f3406c2 --- /dev/null +++ b/spring-context/src/test/java/example/gh24375/A.java @@ -0,0 +1,35 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example.gh24375; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.springframework.core.annotation.AliasFor; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface A { + + @AliasFor("value") + B other() default @B; + + @AliasFor("other") + B value() default @B; +} diff --git a/spring-context/src/test/java/example/gh24375/B.java b/spring-context/src/test/java/example/gh24375/B.java new file mode 100644 index 0000000000..7d79502d71 --- /dev/null +++ b/spring-context/src/test/java/example/gh24375/B.java @@ -0,0 +1,29 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example.gh24375; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.ANNOTATION_TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface B { + + String name() default ""; +} \ No newline at end of file diff --git a/spring-context/src/test/java/example/gh24375/MyComponent.java b/spring-context/src/test/java/example/gh24375/MyComponent.java new file mode 100644 index 0000000000..ce21ae567e --- /dev/null +++ b/spring-context/src/test/java/example/gh24375/MyComponent.java @@ -0,0 +1,24 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example.gh24375; + +import org.springframework.stereotype.Component; + +@Component +@A(other = @B) +public class MyComponent { +} diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java index 7b63c97ad8..9d46c7d3f1 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.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. @@ -21,6 +21,7 @@ import java.lang.annotation.RetentionPolicy; import java.util.Set; import java.util.regex.Pattern; +import example.gh24375.MyComponent; import example.profilescan.DevComponent; import example.profilescan.ProfileAnnotatedComponent; import example.profilescan.ProfileMetaAnnotatedComponent; @@ -38,6 +39,7 @@ import example.scannable.ServiceInvocationCounter; import example.scannable.StubFooDao; import example.scannable.sub.BarComponent; import org.aspectj.lang.annotation.Aspect; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition; @@ -500,6 +502,16 @@ public class ClassPathScanningCandidateComponentProviderTests { } } + @Test + @Disabled("Disabled until gh-24375 is resolved") + public void gh24375() { + ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(true); + Set components = provider.findCandidateComponents(MyComponent.class.getPackage().getName()); + assertThat(components).hasSize(1); + assertThat(components.iterator().next().getBeanClassName()).isEqualTo(MyComponent.class.getName()); + } + + private boolean containsBeanClass(Set candidates, Class beanClass) { for (BeanDefinition candidate : candidates) { if (beanClass.getName().equals(candidate.getBeanClassName())) {