Polish "Fix condition source in OnBeanCondition"

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

Hide file tree

Showing 3 changed files with 18 additions and 6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-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.
@@ -67,7 +67,6 @@
  * @author Jakub Kubrynski
  * @author Stephane Nicoll
  * @author Andy Wilkinson
- * @author Jorge Cordoba
  * @see ConditionalOnBean
  * @see ConditionalOnMissingBean
  * @see ConditionalOnSingleCandidate

diff --git a/...rc/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java b/...rc/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.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;
 
@@ -29,6 +30,7 @@
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport.ConditionAndOutcomes;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -134,6 +136,17 @@ private void hasBarBean(AssertableApplicationContext context) {
 		assertThat(context.getBean("bar")).isEqualTo("bar");
 	}
 
+	@Test
+	void onBeanConditionOutputShouldNotContainConditionalOnMissingBeanClassInMessage() {
+		this.contextRunner.withUserConfiguration(OnBeanNameConfiguration.class).run((context) -> {
+			Collection<ConditionAndOutcomes> conditionAndOutcomes = ConditionEvaluationReport
+					.get(context.getSourceApplicationContext().getBeanFactory()).getConditionAndOutcomesBySource()
+					.values();
+			String message = conditionAndOutcomes.iterator().next().iterator().next().getOutcome().getMessage();
+			assertThat(message).doesNotContain("@ConditionalOnMissingBean");
+		});
+	}
+
 	@Test
 	void conditionEvaluationConsidersChangeInTypeWhenBeanIsOverridden() {
 		this.contextRunner.withUserConfiguration(OriginalDefinition.class, OverridingDefinition.class,

diff --git a/.../java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/.../java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-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.
@@ -58,7 +58,6 @@
  * @author Phillip Webb
  * @author Jakub Kubrynski
  * @author Andy Wilkinson
- * @author Jorge Cordoba
  */
 @SuppressWarnings("resource")
 public class ConditionalOnMissingBeanTests {
@@ -137,14 +136,15 @@ void testAnnotationOnMissingBeanConditionWithEagerFactoryBean() {
 					assertThat(context.getBean("foo")).isEqualTo("foo");
 				});
 	}
+
 	@Test
 	void testOnMissingBeanConditionOutputShouldNotContainConditionalOnBeanClassInMessage() {
-		this.contextRunner.withUserConfiguration(ConditionalOnMissingBeanTests.OnBeanNameConfiguration.class).run((context) -> {
+		this.contextRunner.withUserConfiguration(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");
+			assertThat(message).doesNotContain("@ConditionalOnBean");
 		});
 	}