Fix condition source in OnBeanCondition

See spring-projectsgh-19948
hyk001 · Feb 11, 2020 · 547fc30 · 547fc30
1 parent d485708
commit 547fc30
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...igure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/...igure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
@@ -67,6 +67,7 @@
  * @author Jakub Kubrynski
  * @author Stephane Nicoll
  * @author Andy Wilkinson
+ * @author Jorge Cordoba
  * @see ConditionalOnBean
  * @see ConditionalOnMissingBean
  * @see ConditionalOnSingleCandidate
@@ -387,7 +388,7 @@ private static class Spec<A extends Annotation> {
 
 		private final ClassLoader classLoader;
 
-		private final Class<?> annotationType;
+		private final Class<? extends Annotation> annotationType;
 
 		private final Set<String> names;
 
@@ -581,11 +582,11 @@ Set<Class<?>> getParameterizedContainers() {
 		}
 
 		ConditionMessage.Builder message() {
-			return ConditionMessage.forCondition(ConditionalOnBean.class, this);
+			return ConditionMessage.forCondition(this.annotationType, this);
 		}
 
 		ConditionMessage.Builder message(ConditionMessage message) {
-			return message.andCondition(ConditionalOnBean.class, this);
+			return message.andCondition(this.annotationType, this);
 		}
 
 		@Override

diff --git a/.../java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/.../java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
@@ -21,6 +21,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.Collection;
 import java.util.Date;
 import java.util.function.Consumer;
 
@@ -57,6 +58,7 @@
  * @author Phillip Webb
  * @author Jakub Kubrynski
  * @author Andy Wilkinson
+ * @author Jorge Cordoba
  */
 @SuppressWarnings("resource")
 public class ConditionalOnMissingBeanTests {
@@ -135,6 +137,16 @@ void testAnnotationOnMissingBeanConditionWithEagerFactoryBean() {
 					assertThat(context.getBean("foo")).isEqualTo("foo");
 				});
 	}
+	@Test
+	void testOnMissingBeanConditionOutputShouldNotContainConditionalOnBeanClassInMessage() {
+		this.contextRunner.withUserConfiguration(ConditionalOnMissingBeanTests.OnBeanNameConfiguration.class).run((context) -> {
+			Collection<ConditionEvaluationReport.ConditionAndOutcomes> conditionAndOutcomes = ConditionEvaluationReport
+					.get(context.getSourceApplicationContext().getBeanFactory()).getConditionAndOutcomesBySource()
+					.values();
+			String message = conditionAndOutcomes.iterator().next().iterator().next().getOutcome().getMessage();
+			assertThat(message).doesNotContain("@ConditionalOnBean (names: foo; SearchStrategy: all) did not find any beans");
+		});
+	}
 
 	@Test
 	void testOnMissingBeanConditionWithFactoryBean() {