Formatting

This commit is contained in:
Phillip Webb
2016-04-24 22:54:27 -07:00
parent 79922360e1
commit 93382648ab
25 changed files with 58 additions and 57 deletions

View File

@@ -143,8 +143,8 @@ public class EnableAutoConfigurationImportSelector
List<String> configurations = SpringFactoriesLoader.loadFactoryNames(
getSpringFactoriesLoaderFactoryClass(), getBeanClassLoader());
Assert.notEmpty(configurations,
"No auto configuration classes found in META-INF/spring.factories. If you" +
"are using a custom packaging, make sure that file is correct.");
"No auto configuration classes found in META-INF/spring.factories. If you"
+ "are using a custom packaging, make sure that file is correct.");
return configurations;
}

View File

@@ -100,7 +100,8 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
+ matching);
}
matchMessage.append("@ConditionalOnSingleCandidate ").append(spec)
.append(" found a primary candidate amongst the following ").append(matching);
.append(" found a primary candidate amongst the following ")
.append(matching);
}
if (metadata.isAnnotated(ConditionalOnMissingBean.class.getName())) {
BeanSearchSpec spec = new BeanSearchSpec(context, metadata,

View File

@@ -73,8 +73,9 @@ class OnClassCondition extends SpringBootCondition {
}
matchMessage.append(matchMessage.length() == 0 ? "" : " ");
matchMessage.append("@ConditionalOnMissing classes not found: ")
.append(StringUtils.collectionToCommaDelimitedString(getMatchingClasses(
onMissingClasses, MatchType.MISSING, context)));
.append(StringUtils.collectionToCommaDelimitedString(
getMatchingClasses(onMissingClasses, MatchType.MISSING,
context)));
}
return ConditionOutcome.match(matchMessage.toString());

View File

@@ -83,8 +83,8 @@ class OnPropertyCondition extends SpringBootCondition {
StringBuilder message = new StringBuilder("@ConditionalOnProperty ");
if (!missingProperties.isEmpty()) {
message.append("missing required properties ").append(expandNames(prefix, missingProperties))
.append(" ");
message.append("missing required properties ")
.append(expandNames(prefix, missingProperties)).append(" ");
}
if (!nonMatchingProperties.isEmpty()) {
String expected = StringUtils.hasLength(havingValue) ? havingValue : "!false";

View File

@@ -18,4 +18,3 @@
* Auto-configuration for Spring Data Neo4j.
*/
package org.springframework.boot.autoconfigure.data.neo4j;

View File

@@ -188,7 +188,8 @@ public class ActiveMQProperties {
private Boolean trustAll;
/**
* Comma-separated list of specific packages to trust (when not trusting all packages).
* Comma-separated list of specific packages to trust (when not trusting all
* packages).
*/
private List<String> trusted = new ArrayList<String>();

View File

@@ -153,7 +153,8 @@ public class EnableAutoConfigurationImportSelectorTests {
@Test
public void propertyOverrideSetToTrue() throws Exception {
configureExclusions(new String[0], new String[0], new String[0]);
this.environment.setProperty(EnableAutoConfiguration.ENABLED_OVERRIDE_PROPERTY, "true");
this.environment.setProperty(EnableAutoConfiguration.ENABLED_OVERRIDE_PROPERTY,
"true");
String[] imports = this.importSelector.selectImports(this.annotationMetadata);
assertThat(imports).isNotEmpty();
}
@@ -161,7 +162,8 @@ public class EnableAutoConfigurationImportSelectorTests {
@Test
public void propertyOverrideSetToFalse() throws Exception {
configureExclusions(new String[0], new String[0], new String[0]);
this.environment.setProperty(EnableAutoConfiguration.ENABLED_OVERRIDE_PROPERTY, "false");
this.environment.setProperty(EnableAutoConfiguration.ENABLED_OVERRIDE_PROPERTY,
"false");
String[] imports = this.importSelector.selectImports(this.annotationMetadata);
assertThat(imports).isEmpty();
}

View File

@@ -61,12 +61,14 @@ public class IntegrationAutoConfigurationTests {
@Test
public void parentContext() {
this.context = new AnnotationConfigApplicationContext();
this.context.register(JmxAutoConfiguration.class, IntegrationAutoConfiguration.class);
this.context.register(JmxAutoConfiguration.class,
IntegrationAutoConfiguration.class);
this.context.refresh();
AnnotationConfigApplicationContext parent = this.context;
this.context = new AnnotationConfigApplicationContext();
this.context.setParent(parent);
this.context.register(JmxAutoConfiguration.class, IntegrationAutoConfiguration.class);
this.context.register(JmxAutoConfiguration.class,
IntegrationAutoConfiguration.class);
this.context.refresh();
assertThat(this.context.getBean(HeaderChannelRegistry.class)).isNotNull();
((ConfigurableApplicationContext) this.context.getParent()).close();

View File

@@ -40,8 +40,8 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
@RunWith(SpringRunner.class)
@DirtiesContext
@SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = {
"env.foo=There", "foo=World" })
@SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = { "env.foo=There",
"foo=World" })
public class MustacheStandaloneIntegrationTests {
@Autowired