root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Formatting

This commit is contained in:
Phillip Webb 2016-11-03 14:48:10 -07:00
parent 6a2ac080ac
commit 90afc8ebbe
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java
View File

@ -218,8 +218,8 @@ class NoSuchBeanDefinitionFailureAnalyzer
} }
String name = cause.getBeanName(); String name = cause.getBeanName();
ResolvableType resolvableType = cause.getResolvableType(); ResolvableType resolvableType = cause.getResolvableType();
return ((name != null && hasName(candidate, name)) return ((name != null && hasName(candidate, name)) || (resolvableType != null
|| (resolvableType != null && hasType(candidate, extractBeanType(resolvableType)))); && hasType(candidate, extractBeanType(resolvableType))));
} }
private boolean hasName(MethodMetadata methodMetadata, String name) { private boolean hasName(MethodMetadata methodMetadata, String name) {

7
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java
View File

@ -87,8 +87,8 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests {
public void failureAnalysisForMissingCollectionType() throws Exception { public void failureAnalysisForMissingCollectionType() throws Exception {
FailureAnalysis analysis = analyzeFailure( FailureAnalysis analysis = analyzeFailure(
createFailure(StringCollectionConfiguration.class)); createFailure(StringCollectionConfiguration.class));
assertDescriptionConstructorMissingType(analysis, StringCollectionHandler.class, 0, assertDescriptionConstructorMissingType(analysis, StringCollectionHandler.class,
String.class); 0, String.class);
assertBeanMethodDisabled(analysis, assertBeanMethodDisabled(analysis,
"did not find property 'spring.string.enabled'", "did not find property 'spring.string.enabled'",
TestPropertyAutoConfiguration.class, "string"); TestPropertyAutoConfiguration.class, "string");
@ -217,7 +217,8 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests {
private void assertClassDisabled(FailureAnalysis analysis, String description, private void assertClassDisabled(FailureAnalysis analysis, String description,
String methodName) { String methodName) {
String expected = String.format("Bean method '%s' not loaded because", methodName); String expected = String.format("Bean method '%s' not loaded because",
methodName);
assertThat(analysis.getDescription()).contains(expected); assertThat(analysis.getDescription()).contains(expected);
assertThat(analysis.getDescription()).contains(description); assertThat(analysis.getDescription()).contains(description);
} }