From 90afc8ebbeef58ff2b97f03839f0e023746e810c Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 3 Nov 2016 14:48:10 -0700 Subject: [PATCH] Formatting --- .../analyzer/NoSuchBeanDefinitionFailureAnalyzer.java | 4 ++-- .../analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java index b9caf165010..68f8444b5e9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java @@ -218,8 +218,8 @@ class NoSuchBeanDefinitionFailureAnalyzer } String name = cause.getBeanName(); ResolvableType resolvableType = cause.getResolvableType(); - return ((name != null && hasName(candidate, name)) - || (resolvableType != null && hasType(candidate, extractBeanType(resolvableType)))); + return ((name != null && hasName(candidate, name)) || (resolvableType != null + && hasType(candidate, extractBeanType(resolvableType)))); } private boolean hasName(MethodMetadata methodMetadata, String name) { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java index 3d04f8b9f90..e40398186b0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java @@ -87,8 +87,8 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { public void failureAnalysisForMissingCollectionType() throws Exception { FailureAnalysis analysis = analyzeFailure( createFailure(StringCollectionConfiguration.class)); - assertDescriptionConstructorMissingType(analysis, StringCollectionHandler.class, 0, - String.class); + assertDescriptionConstructorMissingType(analysis, StringCollectionHandler.class, + 0, String.class); assertBeanMethodDisabled(analysis, "did not find property 'spring.string.enabled'", TestPropertyAutoConfiguration.class, "string"); @@ -217,7 +217,8 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { private void assertClassDisabled(FailureAnalysis analysis, String description, 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(description); }