From 93382648abb52a80cd933eb1db2bc4d1dc6c38e8 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 24 Apr 2016 22:54:27 -0700 Subject: [PATCH] Formatting --- .../autoconfigure/SpringApplicationHierarchyTests.java | 6 ++---- .../metrics/export/PrefixMetricGroupExporterTests.java | 3 ++- .../EnableAutoConfigurationImportSelector.java | 4 ++-- .../boot/autoconfigure/condition/OnBeanCondition.java | 3 ++- .../boot/autoconfigure/condition/OnClassCondition.java | 5 +++-- .../autoconfigure/condition/OnPropertyCondition.java | 4 ++-- .../boot/autoconfigure/data/neo4j/package-info.java | 1 - .../autoconfigure/jms/activemq/ActiveMQProperties.java | 3 ++- .../EnableAutoConfigurationImportSelectorTests.java | 6 ++++-- .../integration/IntegrationAutoConfigurationTests.java | 6 ++++-- .../mustache/MustacheStandaloneIntegrationTests.java | 4 ++-- .../test/autoconfigure/filter/TypeExcludeFilters.java | 6 +++--- .../orm/jpa/AutoConfigureTestEntityManager.java | 4 ++-- .../boot/test/autoconfigure/orm/jpa/DataJpaTest.java | 6 +++--- ...tractSpringBootTestEmbeddedWebEnvironmentTests.java | 4 ++-- .../SpringBootTestWebEnvironmentDefinedPortTests.java | 3 +-- .../SpringBootTestWebEnvironmentRandomPortTests.java | 6 ++---- .../boot/test/json/JsonContentAssertTests.java | 6 ++---- .../MockBeanOnTestFieldForExistingBeanConfig.java | 4 ++-- .../jetty/JettyEmbeddedServletContainerFactory.java | 8 ++++---- .../boot/jackson/JsonObjectDeserializer.java | 4 ++-- .../org/springframework/boot/ImageBannerTests.java | 3 ++- .../logback/SpringBootJoranConfiguratorTests.java | 3 ++- .../boot/neo4j/NodeEntityScanTests.java | 10 ++++------ .../boot/testutil/InternalOutputCapture.java | 3 ++- 25 files changed, 58 insertions(+), 57 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java index 81f8bb7377..a821dc580a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java @@ -64,8 +64,7 @@ public class SpringApplicationHierarchyTests { @EnableAutoConfiguration(exclude = { ElasticsearchDataAutoConfiguration.class, ElasticsearchRepositoriesAutoConfiguration.class, CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, - Neo4jAutoConfiguration.class, - RedisAutoConfiguration.class, + Neo4jAutoConfiguration.class, RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class }, excludeName = { "org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration" }) public static class Child { @@ -77,8 +76,7 @@ public class SpringApplicationHierarchyTests { ElasticsearchDataAutoConfiguration.class, ElasticsearchRepositoriesAutoConfiguration.class, CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, - Neo4jAutoConfiguration.class, - RedisAutoConfiguration.class, + Neo4jAutoConfiguration.class, RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class }, excludeName = { "org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration" }) public static class Parent { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java index 8f5f8eb5d5..678ac9ee35 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java @@ -57,7 +57,8 @@ public class PrefixMetricGroupExporterTests { this.reader.set(new Metric("counter.foo.bar", 1)); this.exporter.setGroups(Collections.singleton("counter.foo")); this.exporter.export(); - assertThat(this.writer.findAll("counter.foo").iterator().next().getValue()).isEqualTo(2L); + assertThat(this.writer.findAll("counter.foo").iterator().next().getValue()) + .isEqualTo(2L); } @Test diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java index 0583df6c4d..97e272749b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java @@ -143,8 +143,8 @@ public class EnableAutoConfigurationImportSelector List 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; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index 242988aa91..948b8d01f2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -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, diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java index a854c07e82..916f2ceba5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java @@ -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()); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java index 647d0ced46..d80a6999ba 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java @@ -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"; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/package-info.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/package-info.java index a681b2a7d5..3886143a86 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/package-info.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/package-info.java @@ -18,4 +18,3 @@ * Auto-configuration for Spring Data Neo4j. */ package org.springframework.boot.autoconfigure.data.neo4j; - diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java index 02f511769c..2bc554dba4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java @@ -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 trusted = new ArrayList(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java index b19a2c3d56..27b8e1863a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java @@ -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(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index 1ea444aeb3..cf44b833b9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -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(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java index a3b9ac2b60..e1556d8ae8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java @@ -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 diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java index 0acc6f58a8..0603d72255 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java @@ -26,9 +26,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.TypeExcludeFilter; /** - * Annotation that can be on tests to define a set of {@link TypeExcludeFilter} classes that - * should be applied to {@link SpringBootApplication @SpringBootApplication} component - * scanning. + * Annotation that can be on tests to define a set of {@link TypeExcludeFilter} classes + * that should be applied to {@link SpringBootApplication @SpringBootApplication} + * component scanning. * * @author Phillip Webb * @since 1.4.0 diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestEntityManager.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestEntityManager.java index 24980aef36..d307aec3c3 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestEntityManager.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestEntityManager.java @@ -25,8 +25,8 @@ import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; /** - * Annotation that can be applied to a test class to enable - * auto-configuration of a {@link TestEntityManager}. + * Annotation that can be applied to a test class to enable auto-configuration of a + * {@link TestEntityManager}. * * @author Phillip Webb * @see TestEntityManagerAutoConfiguration diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java index 065ddb5dab..e913bb6424 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java @@ -47,9 +47,9 @@ import org.springframework.transaction.annotation.Transactional; * override these settings. *

* If you are looking to load your full application configuration, but use an embedded - * database, you should consider {@link SpringBootTest @SpringBootTest} - * combined with {@link AutoConfigureTestDatabase @AutoConfigureTestDatabase} rather than - * this annotation. + * database, you should consider {@link SpringBootTest @SpringBootTest} combined with + * {@link AutoConfigureTestDatabase @AutoConfigureTestDatabase} rather than this + * annotation. * * @author Phillip Webb * @see AutoConfigureTestDatabase diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java index 75bd664722..d90be966e3 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java @@ -37,8 +37,8 @@ import org.springframework.web.servlet.DispatcherServlet; import static org.assertj.core.api.Assertions.assertThat; /** - * Base class for {@link SpringBootTest} tests configured to start an embedded - * servlet container + * Base class for {@link SpringBootTest} tests configured to start an embedded servlet + * container * * @author Phillip Webb * @author Andy Wilkinson diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java index 9be26a952b..cb548bf912 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java @@ -26,8 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.config.annotation.EnableWebMvc; /** - * Tests for {@link SpringBootTest} configured with - * {@link WebEnvironment#DEFINED_PORT}. + * Tests for {@link SpringBootTest} configured with {@link WebEnvironment#DEFINED_PORT}. * * @author Phillip Webb * @author Andy Wilkinson diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java index 638910e5b3..01e13028c6 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java @@ -26,16 +26,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.config.annotation.EnableWebMvc; /** - * Tests for {@link SpringBootTest} configured with - * {@link WebEnvironment#DEFINED_PORT}. + * Tests for {@link SpringBootTest} configured with {@link WebEnvironment#DEFINED_PORT}. * * @author Phillip Webb * @author Andy Wilkinson */ @RunWith(SpringRunner.class) @DirtiesContext -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { - "value=123" }) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "value=123" }) public class SpringBootTestWebEnvironmentRandomPortTests extends AbstractSpringBootTestEmbeddedWebEnvironmentTests { diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java index 9e2e5f14d5..f962c2cd6b 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java @@ -289,8 +289,7 @@ public class JsonContentAssertTests { } @Test - public void isEqualToJsonWhenStringIsMatchingAndLenientShouldPass() - throws Exception { + public void isEqualToJsonWhenStringIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(LENIENT_SAME, JSONCompareMode.LENIENT); } @@ -329,8 +328,7 @@ public class JsonContentAssertTests { } @Test - public void isEqualToJsonWhenBytesAreMatchingAndLenientShouldPass() - throws Exception { + public void isEqualToJsonWhenBytesAreMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(LENIENT_SAME.getBytes(), JSONCompareMode.LENIENT); } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java index 32e3f34ee3..e1447d4564 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java @@ -22,8 +22,8 @@ import org.springframework.context.annotation.Import; /** * Config for {@link MockBeanOnTestFieldForExistingBeanIntegrationTests} and - * {@link MockBeanOnTestFieldForExistingBeanCacheIntegrationTests}. Extracted to a shared config - * to trigger caching. + * {@link MockBeanOnTestFieldForExistingBeanCacheIntegrationTests}. Extracted to a shared + * config to trigger caching. * * @author Phillip Webb */ diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 4ce669cb1f..3d05880437 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -615,9 +615,8 @@ public class JettyEmbeddedServletContainerFactory } /** - * Set a Jetty {@link ThreadPool} that should be used by the {@link Server}. - * If set to {@code null} (default), the {@link Server} creates - * a {@link ThreadPool} implicitly. + * Set a Jetty {@link ThreadPool} that should be used by the {@link Server}. If set to + * {@code null} (default), the {@link Server} creates a {@link ThreadPool} implicitly. * @param threadPool a Jetty ThreadPool to be used */ public void setThreadPool(ThreadPool threadPool) { @@ -898,7 +897,8 @@ public class JettyEmbeddedServletContainerFactory public Server createServer(ThreadPool threadPool) { Server server = new Server(); try { - ReflectionUtils.findMethod(Server.class, "setThreadPool", ThreadPool.class) + ReflectionUtils + .findMethod(Server.class, "setThreadPool", ThreadPool.class) .invoke(server, threadPool); } catch (Exception e) { diff --git a/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java b/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java index 07a74fadd8..c177335a94 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java @@ -76,8 +76,8 @@ public abstract class JsonObjectDeserializer throws IOException; /** - * Helper method to extract a value from the given {@code jsonNode} or return {@code null} - * when the node itself is {@code null}. + * Helper method to extract a value from the given {@code jsonNode} or return + * {@code null} when the node itself is {@code null}. * @param jsonNode the source node (may be {@code null} * @param type the data type. May be {@link String}, {@link Boolean}, {@link Long}, * {@link Integer}, {@link Short}, {@link Double}, {@link Float}, {@link BigDecimal} diff --git a/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java b/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java index 278819d5f8..fdcc12f6a8 100644 --- a/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java @@ -157,7 +157,8 @@ public class ImageBannerTests { } @Test - public void printBannerWhenHasMarginPropertyShouldPrintSizedMargin() throws Exception { + public void printBannerWhenHasMarginPropertyShouldPrintSizedMargin() + throws Exception { AnsiOutput.setEnabled(AnsiOutput.Enabled.NEVER); String banner = printBanner("large.gif", "banner.image.margin=4"); String[] lines = banner.split(NEW_LINE); diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java index 72e696be99..deeed6601e 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java @@ -72,7 +72,8 @@ public class SpringBootJoranConfiguratorTests { @After public void reset() { this.context.stop(); - new BasicConfigurator().configure((LoggerContext) LoggerFactory.getILoggerFactory()); + new BasicConfigurator() + .configure((LoggerContext) LoggerFactory.getILoggerFactory()); } @Test diff --git a/spring-boot/src/test/java/org/springframework/boot/neo4j/NodeEntityScanTests.java b/spring-boot/src/test/java/org/springframework/boot/neo4j/NodeEntityScanTests.java index bb24396be7..5f611bfb4f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/neo4j/NodeEntityScanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/neo4j/NodeEntityScanTests.java @@ -58,12 +58,12 @@ public class NodeEntityScanTests { this.thrown.expectMessage("Unable to configure " + "SessionFactoryFactoryBean from @NodeEntityScan, " + "ensure an appropriate bean is registered."); - this.context = new AnnotationConfigApplicationContext(MissingSessionFactory.class); + this.context = new AnnotationConfigApplicationContext( + MissingSessionFactory.class); } private void assertSetPackagesToScan(String... expected) { - String[] actual = this.context - .getBean(TestSessionFactoryProvider.class) + String[] actual = this.context.getBean(TestSessionFactoryProvider.class) .getPackagesToScan(); assertThat(actual).isEqualTo(expected); } @@ -87,9 +87,7 @@ public class NodeEntityScanTests { static class MissingSessionFactory { } - - private static class TestSessionFactoryProvider - extends SessionFactoryProvider { + private static class TestSessionFactoryProvider extends SessionFactoryProvider { private String[] packagesToScan; diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/InternalOutputCapture.java b/spring-boot/src/test/java/org/springframework/boot/testutil/InternalOutputCapture.java index a00f427caa..608a4079d2 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/InternalOutputCapture.java +++ b/spring-boot/src/test/java/org/springframework/boot/testutil/InternalOutputCapture.java @@ -63,7 +63,8 @@ public class InternalOutputCapture implements TestRule { try { if (!InternalOutputCapture.this.matchers.isEmpty()) { String output = InternalOutputCapture.this.toString(); - Assert.assertThat(output, allOf(InternalOutputCapture.this.matchers)); + Assert.assertThat(output, + allOf(InternalOutputCapture.this.matchers)); } } finally {