From 6699833121975ac94bf458cab4aa3b2e2098772e Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 16 Jan 2020 16:34:21 +0100 Subject: [PATCH] Introduce regression test for gh-24375 --- ...anningCandidateComponentProviderTests.java | 12 ++++++- .../annotation/componentscan/gh24375/A.java | 35 +++++++++++++++++++ .../annotation/componentscan/gh24375/B.java | 29 +++++++++++++++ .../componentscan/gh24375/MyComponent.java | 24 +++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/componentscan/gh24375/A.java create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/componentscan/gh24375/B.java create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/componentscan/gh24375/MyComponent.java 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 0f761cca2f17..197dba38cfa9 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-2017 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. @@ -42,6 +42,7 @@ import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.context.annotation.componentscan.gh24375.MyComponent; import org.springframework.context.index.CandidateComponentsTestClassLoader; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; @@ -501,6 +502,15 @@ public void testIntegrationWithAnnotationConfigApplicationContext_metaProfile() } } + @Test + public void gh24375() { + ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(true); + Set components = provider.findCandidateComponents(MyComponent.class.getPackage().getName()); + assertEquals(1, components.size()); + assertEquals(MyComponent.class.getName(), components.iterator().next().getBeanClassName()); + } + + private boolean containsBeanClass(Set candidates, Class beanClass) { for (BeanDefinition candidate : candidates) { if (beanClass.getName().equals(candidate.getBeanClassName())) { diff --git a/spring-context/src/test/java/org/springframework/context/annotation/componentscan/gh24375/A.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/gh24375/A.java new file mode 100644 index 000000000000..195b5bc4d180 --- /dev/null +++ b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/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 org.springframework.context.annotation.componentscan.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/org/springframework/context/annotation/componentscan/gh24375/B.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/gh24375/B.java new file mode 100644 index 000000000000..f1fdfb24de00 --- /dev/null +++ b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/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 org.springframework.context.annotation.componentscan.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/org/springframework/context/annotation/componentscan/gh24375/MyComponent.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/gh24375/MyComponent.java new file mode 100644 index 000000000000..f51b9d37c482 --- /dev/null +++ b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/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 org.springframework.context.annotation.componentscan.gh24375; + +import org.springframework.stereotype.Component; + +@Component +@A(other = @B) +public class MyComponent { +}