Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conditions evaluation report mistakenly prints '@ConditionalOnBean' for negative matches #19948

Closed
wants to merge 2 commits into from
Closed

Conditions evaluation report mistakenly prints '@ConditionalOnBean' for negative matches #19948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7771c1d
Fixes wrong prints of @ConditionalOnBean for negative matches in Cond…
Jan 27, 2020
0f654d3
Implements test for ConditionalOnMissingBean message report should no…
jcordoba95 Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...igure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
* @author Jakub Kubrynski
* @author Stephane Nicoll
* @author Andy Wilkinson
* @author Jorge Cordoba
* @see ConditionalOnBean
* @see ConditionalOnMissingBean
* @see ConditionalOnSingleCandidate
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions .../java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -57,6 +58,7 @@
* @author Phillip Webb
* @author Jakub Kubrynski
* @author Andy Wilkinson
* @author Jorge Cordoba
*/
@SuppressWarnings("resource")
public class ConditionalOnMissingBeanTests {
Expand Down Expand Up @@ -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() {
Expand Down