diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index c2f9434781..7e44e0dc2a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -226,7 +226,7 @@ public class EndpointWebMvcChildContextConfiguration { // the same place) this.server.customize(container); // Then reset the error pages - container.setErrorPages(Collections. emptySet()); + container.setErrorPages(Collections.emptySet()); // and add the management-specific bits container.setPort(this.managementServerProperties.getPort()); container.setAddress(this.managementServerProperties.getAddress()); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java index f9c4c40035..55398cf4bf 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java @@ -241,7 +241,7 @@ public class ManagementWebSecurityAutoConfiguration { } if (this.endpointHandlerMapping == null) { this.endpointHandlerMapping = new EndpointHandlerMapping( - Collections. emptySet()); + Collections.emptySet()); } } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java index f37a0411ba..91fd774a1c 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java @@ -67,7 +67,8 @@ public abstract class AbstractJmxCacheStatisticsProvider implem * {@code null} if none is found. * @param cache the cache to handle * @return the object name of the cache statistics MBean - * @throws MalformedObjectNameException if the {@link ObjectName} for that cache is invalid + * @throws MalformedObjectNameException if the {@link ObjectName} for that cache is + * invalid */ protected abstract ObjectName getObjectName(C cache) throws MalformedObjectNameException; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java index 4a97f72575..f6fa2572c5 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java @@ -39,8 +39,8 @@ import org.springframework.web.client.RestTemplate; * HTTP endpoint provided by the server. Data are buffered according to the * {@link #setBufferSize(int) bufferSize} property, and only flushed automatically when * the buffer size is reached. Users should either manually {@link #flush()} after writing - * a batch of data if that makes sense, or consider adding a {@link Scheduled - * Scheduled} task to flush periodically. + * a batch of data if that makes sense, or consider adding a {@link Scheduled Scheduled} + * task to flush periodically. * * @author Dave Syer * @since 1.3.0 diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricExportersTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricExportersTests.java index ce484672e5..71d0b61020 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricExportersTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricExportersTests.java @@ -72,7 +72,7 @@ public class MetricExportersTests { public void exporter() { this.export.setUpDefaults(); this.exporters = new MetricExporters(this.export); - this.exporters.setExporters(Collections. singletonMap("foo", + this.exporters.setExporters(Collections.singletonMap("foo", new MetricCopyExporter(this.reader, this.writer))); this.exporters.configureTasks(new ScheduledTaskRegistrar()); assertNotNull(this.exporters.getExporters()); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java index e503d4f711..7be02bee30 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java @@ -42,7 +42,7 @@ public class DataSourcePoolMetadataProviders implements DataSourcePoolMetadataPr public DataSourcePoolMetadataProviders( Collection providers) { this.providers = (providers == null ? Collections - . emptyList() + .emptyList() : new ArrayList(providers)); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java index 40e11f53e5..9630d7bd32 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java @@ -200,8 +200,8 @@ public class MongoProperties { /** * Creates a {@link MongoClient} using the given {@code options} and * {@code environment}. If the configured port is zero, the value of the - * {@code local.mongo.port} property retrieved from the {@code environment} is used - * to configure the client. + * {@code local.mongo.port} property retrieved from the {@code environment} is used to + * configure the client. * * @param options the options * @param environment the environment diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java index 418e0fce08..4674f3863e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java @@ -206,8 +206,7 @@ public class EmbeddedMongoAutoConfiguration { private ToStringFriendlyFeatureAwareVersion(String version, Set features) { Assert.notNull(version, "version must not be null"); this.version = version; - this.features = features == null ? Collections. emptySet() - : features; + this.features = features == null ? Collections.emptySet() : features; } @Override diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java index 961cf18cff..7be3da0341 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java @@ -113,7 +113,7 @@ public class OAuth2AuthorizationServerConfiguration extends "password", "client_credentials", "implicit", "refresh_token")); details.setAuthorities(AuthorityUtils .commaSeparatedStringToAuthorityList("ROLE_USER")); - details.setRegisteredRedirectUri(Collections. emptySet()); + details.setRegisteredRedirectUri(Collections.emptySet()); return details; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java index 362ba2b692..7ca42b39a8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java @@ -114,7 +114,7 @@ public class ResourceServerTokenServicesConfiguration { } OAuth2RestTemplate template = getTemplate(); template.setInterceptors(Arrays - . asList(new AcceptJsonRequestInterceptor())); + .asList(new AcceptJsonRequestInterceptor())); AuthorizationCodeAccessTokenProvider accessTokenProvider = new AuthorizationCodeAccessTokenProvider(); accessTokenProvider.setTokenRequestEnhancer(new AcceptJsonRequestEnhancer()); template.setAccessTokenProvider(accessTokenProvider); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java index 5eef1771ce..cfbed8c623 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java @@ -125,7 +125,7 @@ public class UserInfoTokenServices implements ResourceServerTokenServices { catch (Exception ex) { this.logger.info("Could not fetch user details: " + ex.getClass() + ", " + ex.getMessage()); - return Collections. singletonMap("error", + return Collections.singletonMap("error", "Could not fetch user details"); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java index 05ccb499ef..2301c69a45 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java @@ -49,8 +49,7 @@ public class WebMvcProperties { private String dateFormat; /** - * If the content of the "default" model should be ignored during redirect - * scenarios. + * If the content of the "default" model should be ignored during redirect scenarios. */ private boolean ignoreDefaultModelOnRedirect = true; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java index 065fa7a7c2..6c8ed69d73 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java @@ -35,8 +35,8 @@ import static org.junit.Assert.assertEquals; * * @author Dave Syer */ -@SpringApplicationConfiguration({ Config.class, - MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) +@SpringApplicationConfiguration({ Config.class, MessageSourceAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class }) @RunWith(SpringJUnit4ClassRunner.class) @IntegrationTest("spring.messages.basename:test/messages") public class MessageSourceAutoConfigurationIntegrationTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationProfileTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationProfileTests.java index 984c9ac78d..6f2b02961e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationProfileTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationProfileTests.java @@ -35,8 +35,8 @@ import static org.junit.Assert.assertEquals; * * @author Dave Syer */ -@SpringApplicationConfiguration({ Config.class, - MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) +@SpringApplicationConfiguration({ Config.class, MessageSourceAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class }) @RunWith(SpringJUnit4ClassRunner.class) @ActiveProfiles("switch-messages") public class MessageSourceAutoConfigurationProfileTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java index fe6043e3c5..b2a30d8c3f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java @@ -615,8 +615,8 @@ public class CacheAutoConfigurationTests { @Bean public javax.cache.CacheManager customJCacheCacheManager() { javax.cache.CacheManager cacheManager = mock(javax.cache.CacheManager.class); - when(cacheManager.getCacheNames()).thenReturn( - Collections. emptyList()); + when(cacheManager.getCacheNames()) + .thenReturn(Collections.emptyList()); return cacheManager; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java index 9c2fe854b0..bdd1406072 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java @@ -81,7 +81,7 @@ public class UserInfoTokenServicesTests { this.services.setRestTemplate(this.template); given(this.template.getForEntity(any(String.class), any(Class.class))).willThrow( new UserRedirectRequiredException("foo:bar", Collections - . emptyMap())); + .emptyMap())); this.expected.expect(InvalidTokenException.class); assertEquals("unknown", this.services.loadAuthentication("FOO").getName()); } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java index 3e95ac30ef..605266253e 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java @@ -138,8 +138,8 @@ public abstract class AstUtils { } /** - * Extract a top-level {@code name} closure from inside this block if there is - * one, optionally removing it from the block at the same time. + * Extract a top-level {@code name} closure from inside this block if there is one, + * optionally removing it from the block at the same time. * @param block a block statement (class definition) * @param name the name to look for * @param remove whether or not the extracted closure should be removed diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java index 50258a9173..227a81771e 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java @@ -105,7 +105,8 @@ public class GroovyCompiler { } this.transformations = new ArrayList(); - this.transformations.add(new DependencyManagementBomTransformation(resolutionContext)); + this.transformations.add(new DependencyManagementBomTransformation( + resolutionContext)); this.transformations.add(new DependencyAutoConfigurationTransformation( this.loader, resolutionContext, this.compilerAutoConfigurations)); this.transformations.add(new GroovyBeansTransformation()); diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java index 79bfe13449..6424a073e0 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java @@ -31,7 +31,8 @@ public class SpringSecurityCompilerAutoConfiguration extends CompilerAutoConfigu @Override public boolean matches(ClassNode classNode) { - return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableWebSecurity", "EnableGlobalMethodSecurity"); + return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableWebSecurity", + "EnableGlobalMethodSecurity"); } @Override @@ -44,7 +45,8 @@ public class SpringSecurityCompilerAutoConfiguration extends CompilerAutoConfigu @Override public void applyImports(ImportCustomizer imports) { - imports.addImports("org.springframework.security.core.Authentication", + imports.addImports( + "org.springframework.security.core.Authentication", "org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity", "org.springframework.security.core.authority.AuthorityUtils") .addStarImports( diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java index d03befe9b2..437d46a81b 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java @@ -24,7 +24,7 @@ import org.springframework.http.ResponseEntity; import static org.junit.Assert.assertEquals; /** - * Integration Tests for {@link SampleTomcatDeployApplication}. + * Integration Tests for {@link SampleTomcatDeployApplication}. */ public class SampleTomcatDeployApplicationIT { diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java index 50ecb7b6e6..f531df7c88 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java @@ -24,7 +24,7 @@ import org.springframework.http.ResponseEntity; import static org.junit.Assert.assertEquals; /** - * Integration Tests for {@link SampleTomEEDeployApplication}. + * Integration Tests for {@link SampleTomEEDeployApplication}. */ public class SampleTomEEDeployApplicationIT { diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java index fd1a068e83..824c6d07e9 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java @@ -83,8 +83,8 @@ class ConnectionInputStream extends FilterInputStream { } /** - * Read a number of bytes from the stream (checking that the end of the stream - * hasn't been reached) + * Read a number of bytes from the stream (checking that the end of the stream hasn't + * been reached) * @param buffer the destination buffer * @param offset the buffer offset * @param length the length to read diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java index 5fdaa3e661..a5e653a377 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java @@ -33,16 +33,16 @@ public class HttpStatusHandler implements Handler { private final HttpStatus status; /** - * Create a new {@link HttpStatusHandler} instance that will respond with a HTTP OK 200 - * status. + * Create a new {@link HttpStatusHandler} instance that will respond with a HTTP OK + * 200 status. */ public HttpStatusHandler() { this(HttpStatus.OK); } /** - * Create a new {@link HttpStatusHandler} instance that will respond with the specified - * status. + * Create a new {@link HttpStatusHandler} instance that will respond with the + * specified status. * @param status the status */ public HttpStatusHandler(HttpStatus status) { diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java index 0bb5757305..2016174f1d 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java @@ -33,8 +33,8 @@ import java.util.regex.Pattern; class ChangeableUrls implements Iterable { private static final String[] SKIPPED_PROJECTS = { "spring-boot", - "spring-boot-devtools", "spring-boot-autoconfigure", - "spring-boot-actuator", "spring-boot-starter" }; + "spring-boot-devtools", "spring-boot-autoconfigure", "spring-boot-actuator", + "spring-boot-starter" }; private static final Pattern STARTER_PATTERN = Pattern .compile("\\/spring-boot-starter-[\\w-]+\\/"); diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java index 0580a23de3..64f1f830af 100755 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java @@ -119,7 +119,7 @@ public class LocalDevToolsAutoConfigurationTests { LiveReloadServer server = this.context.getBean(LiveReloadServer.class); reset(server); ClassPathChangedEvent event = new ClassPathChangedEvent(this.context, - Collections. emptySet(), false); + Collections.emptySet(), false); this.context.publishEvent(event); verify(server).triggerReload(); } @@ -130,7 +130,7 @@ public class LocalDevToolsAutoConfigurationTests { LiveReloadServer server = this.context.getBean(LiveReloadServer.class); reset(server); ClassPathChangedEvent event = new ClassPathChangedEvent(this.context, - Collections. emptySet(), true); + Collections.emptySet(), true); this.context.publishEvent(event); verify(server, never()).triggerReload(); } @@ -148,7 +148,7 @@ public class LocalDevToolsAutoConfigurationTests { public void restartTriggeredOnClassPathChangeWithRestart() throws Exception { this.context = initializeAndRun(Config.class); ClassPathChangedEvent event = new ClassPathChangedEvent(this.context, - Collections. emptySet(), true); + Collections.emptySet(), true); this.context.publishEvent(event); verify(this.mockRestarter.getMock()).restart(any(FailureHandler.class)); } @@ -157,7 +157,7 @@ public class LocalDevToolsAutoConfigurationTests { public void restartNotTriggeredOnClassPathChangeWithRestart() throws Exception { this.context = initializeAndRun(Config.class); ClassPathChangedEvent event = new ClassPathChangedEvent(this.context, - Collections. emptySet(), false); + Collections.emptySet(), false); this.context.publishEvent(event); verify(this.mockRestarter.getMock(), never()).restart(); } @@ -211,7 +211,7 @@ public class LocalDevToolsAutoConfigurationTests { } private ConfigurableApplicationContext initializeAndRun(Class config) { - return initializeAndRun(config, Collections. emptyMap()); + return initializeAndRun(config, Collections.emptyMap()); } private ConfigurableApplicationContext initializeAndRun(Class config, diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java index 9d32e6ca5f..cdf2f75591 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java @@ -79,7 +79,7 @@ public class DispatcherTests { public void accessManagerMustNotBeNull() throws Exception { this.thrown.expect(IllegalArgumentException.class); this.thrown.expectMessage("AccessManager must not be null"); - new Dispatcher(null, Collections. emptyList()); + new Dispatcher(null, Collections.emptyList()); } @Test diff --git a/spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java b/spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java index 5b03436d77..55b2e059f9 100644 --- a/spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java +++ b/spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java @@ -48,10 +48,12 @@ public class SampleAntApplicationIT { }); assertThat("Number of jars", jarFiles.length, equalTo(1)); - Process process = new JavaExecutable().processBuilder("-jar", jarFiles[0].getName()).directory(target).start(); + Process process = new JavaExecutable() + .processBuilder("-jar", jarFiles[0].getName()).directory(target).start(); process.waitFor(5, TimeUnit.MINUTES); assertThat(process.exitValue(), equalTo(0)); - String output = FileCopyUtils.copyToString(new InputStreamReader(process.getInputStream())); + String output = FileCopyUtils.copyToString(new InputStreamReader(process + .getInputStream())); assertThat(output, containsString("Spring Boot Ant Example")); } diff --git a/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneService.java b/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneService.java index 3cb569fba2..dac72615e0 100644 --- a/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneService.java +++ b/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneService.java @@ -50,8 +50,8 @@ public interface GemstoneService { /** * Return a listing of Gemstones currently stored in the GemFire Cache. - * @return an Iterable object to iterate over the list of Gemstones currently stored in - * the GemFire Cache. + * @return an Iterable object to iterate over the list of Gemstones currently stored + * in the GemFire Cache. * @see java.lang.Iterable * @see sample.data.gemfire.domain.Gemstone */ diff --git a/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneServiceImpl.java index 1f3d26346e..4761769725 100644 --- a/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneServiceImpl.java +++ b/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneServiceImpl.java @@ -97,8 +97,8 @@ public class GemstoneServiceImpl implements GemstoneService { * Return a listing of Gemstones currently stored in the GemFire Cache. *

* - * @return an Iterable object to iterate over the list of Gemstones currently stored in - * the GemFire Cache. + * @return an Iterable object to iterate over the list of Gemstones currently stored + * in the GemFire Cache. * @see java.lang.Iterable * @see sample.data.gemfire.domain.Gemstone */ diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java index 6a6fde5c32..bb09d7ea56 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain; - import javax.annotation.Generated; import org.jooq.ForeignKey; @@ -21,18 +20,11 @@ import sample.jooq.domain.tables.records.BookStoreRecord; import sample.jooq.domain.tables.records.BookToBookStoreRecord; import sample.jooq.domain.tables.records.LanguageRecord; - /** - * A class modelling foreign key relationships between tables of the PUBLIC + * A class modelling foreign key relationships between tables of the PUBLIC * schema */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Keys { @@ -40,7 +32,6 @@ public class Keys { // IDENTITY definitions // ------------------------------------------------------------------------- - // ------------------------------------------------------------------------- // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- @@ -65,17 +56,30 @@ public class Keys { // ------------------------------------------------------------------------- private static class UniqueKeys0 extends AbstractKeys { - public static final UniqueKey CONSTRAINT_C = createUniqueKey(Language.LANGUAGE, Language.LANGUAGE.ID); - public static final UniqueKey CONSTRAINT_7 = createUniqueKey(Author.AUTHOR, Author.AUTHOR.ID); - public static final UniqueKey CONSTRAINT_1 = createUniqueKey(Book.BOOK, Book.BOOK.ID); - public static final UniqueKey CONSTRAINT_F = createUniqueKey(BookStore.BOOK_STORE, BookStore.BOOK_STORE.NAME); - public static final UniqueKey CONSTRAINT_2 = createUniqueKey(BookToBookStore.BOOK_TO_BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE.NAME, BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID); + public static final UniqueKey CONSTRAINT_C = createUniqueKey( + Language.LANGUAGE, Language.LANGUAGE.ID); + public static final UniqueKey CONSTRAINT_7 = createUniqueKey( + Author.AUTHOR, Author.AUTHOR.ID); + public static final UniqueKey CONSTRAINT_1 = createUniqueKey( + Book.BOOK, Book.BOOK.ID); + public static final UniqueKey CONSTRAINT_F = createUniqueKey( + BookStore.BOOK_STORE, BookStore.BOOK_STORE.NAME); + public static final UniqueKey CONSTRAINT_2 = createUniqueKey( + BookToBookStore.BOOK_TO_BOOK_STORE, + BookToBookStore.BOOK_TO_BOOK_STORE.NAME, + BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID); } private static class ForeignKeys0 extends AbstractKeys { - public static final ForeignKey FK_BOOK_AUTHOR = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_7, Book.BOOK, Book.BOOK.AUTHOR_ID); - public static final ForeignKey FK_BOOK_LANGUAGE = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_C, Book.BOOK, Book.BOOK.LANGUAGE_ID); - public static final ForeignKey FK_B2BS_BOOK_STORE = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_F, BookToBookStore.BOOK_TO_BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE.NAME); - public static final ForeignKey FK_B2BS_BOOK = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_1, BookToBookStore.BOOK_TO_BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID); + public static final ForeignKey FK_BOOK_AUTHOR = createForeignKey( + sample.jooq.domain.Keys.CONSTRAINT_7, Book.BOOK, Book.BOOK.AUTHOR_ID); + public static final ForeignKey FK_BOOK_LANGUAGE = createForeignKey( + sample.jooq.domain.Keys.CONSTRAINT_C, Book.BOOK, Book.BOOK.LANGUAGE_ID); + public static final ForeignKey FK_B2BS_BOOK_STORE = createForeignKey( + sample.jooq.domain.Keys.CONSTRAINT_F, BookToBookStore.BOOK_TO_BOOK_STORE, + BookToBookStore.BOOK_TO_BOOK_STORE.NAME); + public static final ForeignKey FK_B2BS_BOOK = createForeignKey( + sample.jooq.domain.Keys.CONSTRAINT_1, BookToBookStore.BOOK_TO_BOOK_STORE, + BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID); } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java index 68dd8675b6..3c43375981 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -19,17 +18,10 @@ import sample.jooq.domain.tables.BookStore; import sample.jooq.domain.tables.BookToBookStore; import sample.jooq.domain.tables.Language; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Public extends SchemaImpl { @@ -55,11 +47,7 @@ public class Public extends SchemaImpl { } private final List> getTables0() { - return Arrays.>asList( - Language.LANGUAGE, - Author.AUTHOR, - Book.BOOK, - BookStore.BOOK_STORE, - BookToBookStore.BOOK_TO_BOOK_STORE); + return Arrays.>asList(Language.LANGUAGE, Author.AUTHOR, Book.BOOK, + BookStore.BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE); } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java index e9888a06cd..77eb1563e9 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain; - import javax.annotation.Generated; import sample.jooq.domain.tables.Author; @@ -12,17 +11,10 @@ import sample.jooq.domain.tables.BookStore; import sample.jooq.domain.tables.BookToBookStore; import sample.jooq.domain.tables.Language; - /** * Convenience access to all tables in PUBLIC */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Author.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Author.java index 5bef981db9..9aac8f29ce 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Author.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Author.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables; - import java.sql.Date; import java.util.Arrays; import java.util.List; @@ -20,17 +19,10 @@ import sample.jooq.domain.Keys; import sample.jooq.domain.Public; import sample.jooq.domain.tables.records.AuthorRecord; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Author extends TableImpl { @@ -52,32 +44,38 @@ public class Author extends TableImpl { /** * The column PUBLIC.AUTHOR.ID. */ - public final TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField ID = createField("ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column PUBLIC.AUTHOR.FIRST_NAME. */ - public final TableField FIRST_NAME = createField("FIRST_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + public final TableField FIRST_NAME = createField("FIRST_NAME", + org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); /** * The column PUBLIC.AUTHOR.LAST_NAME. */ - public final TableField LAST_NAME = createField("LAST_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, ""); + public final TableField LAST_NAME = createField("LAST_NAME", + org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, ""); /** * The column PUBLIC.AUTHOR.DATE_OF_BIRTH. */ - public final TableField DATE_OF_BIRTH = createField("DATE_OF_BIRTH", org.jooq.impl.SQLDataType.DATE, this, ""); + public final TableField DATE_OF_BIRTH = createField( + "DATE_OF_BIRTH", org.jooq.impl.SQLDataType.DATE, this, ""); /** * The column PUBLIC.AUTHOR.YEAR_OF_BIRTH. */ - public final TableField YEAR_OF_BIRTH = createField("YEAR_OF_BIRTH", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField YEAR_OF_BIRTH = createField( + "YEAR_OF_BIRTH", org.jooq.impl.SQLDataType.INTEGER, this, ""); /** * The column PUBLIC.AUTHOR.DISTINGUISHED. */ - public final TableField DISTINGUISHED = createField("DISTINGUISHED", org.jooq.impl.SQLDataType.TINYINT, this, ""); + public final TableField DISTINGUISHED = createField( + "DISTINGUISHED", org.jooq.impl.SQLDataType.TINYINT, this, ""); /** * Create a PUBLIC.AUTHOR table reference diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Book.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Book.java index a4fb3fad4c..f8d2929a1f 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Book.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Book.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables; - import java.util.Arrays; import java.util.List; @@ -20,17 +19,10 @@ import sample.jooq.domain.Keys; import sample.jooq.domain.Public; import sample.jooq.domain.tables.records.BookRecord; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Book extends TableImpl { @@ -52,27 +44,32 @@ public class Book extends TableImpl { /** * The column PUBLIC.BOOK.ID. */ - public final TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField ID = createField("ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column PUBLIC.BOOK.AUTHOR_ID. */ - public final TableField AUTHOR_ID = createField("AUTHOR_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField AUTHOR_ID = createField("AUTHOR_ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column PUBLIC.BOOK.TITLE. */ - public final TableField TITLE = createField("TITLE", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); + public final TableField TITLE = createField("TITLE", + org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); /** * The column PUBLIC.BOOK.PUBLISHED_IN. */ - public final TableField PUBLISHED_IN = createField("PUBLISHED_IN", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField PUBLISHED_IN = createField( + "PUBLISHED_IN", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column PUBLIC.BOOK.LANGUAGE_ID. */ - public final TableField LANGUAGE_ID = createField("LANGUAGE_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField LANGUAGE_ID = createField("LANGUAGE_ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * Create a PUBLIC.BOOK table reference @@ -117,7 +114,8 @@ public class Book extends TableImpl { */ @Override public List> getReferences() { - return Arrays.>asList(Keys.FK_BOOK_AUTHOR, Keys.FK_BOOK_LANGUAGE); + return Arrays.>asList(Keys.FK_BOOK_AUTHOR, + Keys.FK_BOOK_LANGUAGE); } /** diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookStore.java index 988cdbeba5..7639b342b6 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookStore.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables; - import java.util.Arrays; import java.util.List; @@ -19,17 +18,10 @@ import sample.jooq.domain.Keys; import sample.jooq.domain.Public; import sample.jooq.domain.tables.records.BookStoreRecord; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BookStore extends TableImpl { @@ -51,7 +43,8 @@ public class BookStore extends TableImpl { /** * The column PUBLIC.BOOK_STORE.NAME. */ - public final TableField NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); + public final TableField NAME = createField("NAME", + org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); /** * Create a PUBLIC.BOOK_STORE table reference diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookToBookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookToBookStore.java index 71f2e2cac8..11086720ad 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookToBookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookToBookStore.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables; - import java.util.Arrays; import java.util.List; @@ -20,17 +19,10 @@ import sample.jooq.domain.Keys; import sample.jooq.domain.Public; import sample.jooq.domain.tables.records.BookToBookStoreRecord; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BookToBookStore extends TableImpl { @@ -52,17 +44,20 @@ public class BookToBookStore extends TableImpl { /** * The column PUBLIC.BOOK_TO_BOOK_STORE.NAME. */ - public final TableField NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); + public final TableField NAME = createField("NAME", + org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); /** * The column PUBLIC.BOOK_TO_BOOK_STORE.BOOK_ID. */ - public final TableField BOOK_ID = createField("BOOK_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField BOOK_ID = createField( + "BOOK_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column PUBLIC.BOOK_TO_BOOK_STORE.STOCK. */ - public final TableField STOCK = createField("STOCK", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField STOCK = createField("STOCK", + org.jooq.impl.SQLDataType.INTEGER, this, ""); /** * Create a PUBLIC.BOOK_TO_BOOK_STORE table reference @@ -82,7 +77,8 @@ public class BookToBookStore extends TableImpl { this(alias, aliased, null); } - private BookToBookStore(String alias, Table aliased, Field[] parameters) { + private BookToBookStore(String alias, Table aliased, + Field[] parameters) { super(alias, Public.PUBLIC, aliased, parameters, ""); } @@ -107,7 +103,8 @@ public class BookToBookStore extends TableImpl { */ @Override public List> getReferences() { - return Arrays.>asList(Keys.FK_B2BS_BOOK_STORE, Keys.FK_B2BS_BOOK); + return Arrays.>asList( + Keys.FK_B2BS_BOOK_STORE, Keys.FK_B2BS_BOOK); } /** diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Language.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Language.java index e34784d859..5b8c23b05a 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Language.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Language.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables; - import java.util.Arrays; import java.util.List; @@ -19,17 +18,10 @@ import sample.jooq.domain.Keys; import sample.jooq.domain.Public; import sample.jooq.domain.tables.records.LanguageRecord; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Language extends TableImpl { @@ -51,17 +43,20 @@ public class Language extends TableImpl { /** * The column PUBLIC.LANGUAGE.ID. */ - public final TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + public final TableField ID = createField("ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); /** * The column PUBLIC.LANGUAGE.CD. */ - public final TableField CD = createField("CD", org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, ""); + public final TableField CD = createField("CD", + org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, ""); /** * The column PUBLIC.LANGUAGE.DESCRIPTION. */ - public final TableField DESCRIPTION = createField("DESCRIPTION", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + public final TableField DESCRIPTION = createField( + "DESCRIPTION", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); /** * Create a PUBLIC.LANGUAGE table reference diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/AuthorRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/AuthorRecord.java index b6190a7286..6dcca764d6 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/AuthorRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/AuthorRecord.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables.records; - import java.sql.Date; import javax.annotation.Generated; @@ -16,19 +15,13 @@ import org.jooq.impl.UpdatableRecordImpl; import sample.jooq.domain.tables.Author; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class AuthorRecord extends UpdatableRecordImpl implements Record6 { +public class AuthorRecord extends UpdatableRecordImpl implements + Record6 { private static final long serialVersionUID = -983051550; @@ -302,7 +295,8 @@ public class AuthorRecord extends UpdatableRecordImpl implements R * {@inheritDoc} */ @Override - public AuthorRecord values(Integer value1, String value2, String value3, Date value4, Integer value5, Byte value6) { + public AuthorRecord values(Integer value1, String value2, String value3, Date value4, + Integer value5, Byte value6) { value1(value1); value2(value2); value3(value3); @@ -326,7 +320,8 @@ public class AuthorRecord extends UpdatableRecordImpl implements R /** * Create a detached, initialised AuthorRecord */ - public AuthorRecord(Integer id, String firstName, String lastName, Date dateOfBirth, Integer yearOfBirth, Byte distinguished) { + public AuthorRecord(Integer id, String firstName, String lastName, Date dateOfBirth, + Integer yearOfBirth, Byte distinguished) { super(Author.AUTHOR); setValue(0, id); diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookRecord.java index f55c6509df..c543cfab3c 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookRecord.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables.records; - import javax.annotation.Generated; import org.jooq.Field; @@ -14,19 +13,13 @@ import org.jooq.impl.UpdatableRecordImpl; import sample.jooq.domain.tables.Book; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class BookRecord extends UpdatableRecordImpl implements Record5 { +public class BookRecord extends UpdatableRecordImpl implements + Record5 { private static final long serialVersionUID = 220424682; @@ -261,7 +254,8 @@ public class BookRecord extends UpdatableRecordImpl implements Recor * {@inheritDoc} */ @Override - public BookRecord values(Integer value1, Integer value2, String value3, Integer value4, Integer value5) { + public BookRecord values(Integer value1, Integer value2, String value3, + Integer value4, Integer value5) { value1(value1); value2(value2); value3(value3); @@ -284,7 +278,8 @@ public class BookRecord extends UpdatableRecordImpl implements Recor /** * Create a detached, initialised BookRecord */ - public BookRecord(Integer id, Integer authorId, String title, Integer publishedIn, Integer languageId) { + public BookRecord(Integer id, Integer authorId, String title, Integer publishedIn, + Integer languageId) { super(Book.BOOK); setValue(0, id); diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookStoreRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookStoreRecord.java index c119cc5527..f934a8499c 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookStoreRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookStoreRecord.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables.records; - import javax.annotation.Generated; import org.jooq.Field; @@ -13,19 +12,13 @@ import org.jooq.impl.TableRecordImpl; import sample.jooq.domain.tables.BookStore; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class BookStoreRecord extends TableRecordImpl implements Record1 { +public class BookStoreRecord extends TableRecordImpl implements + Record1 { private static final long serialVersionUID = -1969224219; diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookToBookStoreRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookToBookStoreRecord.java index 2da6f1f9e8..fe2c6f6c1a 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookToBookStoreRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookToBookStoreRecord.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables.records; - import javax.annotation.Generated; import org.jooq.Field; @@ -14,19 +13,13 @@ import org.jooq.impl.UpdatableRecordImpl; import sample.jooq.domain.tables.BookToBookStore; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class BookToBookStoreRecord extends UpdatableRecordImpl implements Record3 { +public class BookToBookStoreRecord extends UpdatableRecordImpl + implements Record3 { private static final long serialVersionUID = 1124329527; diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/LanguageRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/LanguageRecord.java index bb23679ce7..c85c6f90c1 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/LanguageRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/LanguageRecord.java @@ -3,7 +3,6 @@ */ package sample.jooq.domain.tables.records; - import javax.annotation.Generated; import org.jooq.Field; @@ -14,19 +13,13 @@ import org.jooq.impl.UpdatableRecordImpl; import sample.jooq.domain.tables.Language; - /** * This class is generated by jOOQ. */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.6.2" - }, - comments = "This class is generated by jOOQ" -) +@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class LanguageRecord extends UpdatableRecordImpl implements Record3 { +public class LanguageRecord extends UpdatableRecordImpl implements + Record3 { private static final long serialVersionUID = -1003202585; diff --git a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java index d96aef57be..e6dbb1f5b2 100644 --- a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java @@ -43,8 +43,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration({ SampleSecureApplication.class, - TestConfiguration.class }) +@SpringApplicationConfiguration({ SampleSecureApplication.class, TestConfiguration.class }) public class SampleSecureApplicationTests { @Autowired diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java index 62faf6c792..e7d4032528 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java +++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java @@ -31,7 +31,7 @@ import java.util.Map; * @since 1.3.0 */ @SuppressWarnings("serial") -public class ValueProvider implements Serializable{ +public class ValueProvider implements Serializable { private String name; diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java index 899baa14be..e9b4eb3cfc 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java @@ -138,18 +138,18 @@ public class ConfigurationMetadata { it.remove(); } } - if (candidates.size() == 1) { + if (candidates.size() == 1) { return candidates.get(0); } for (ItemMetadata candidate : candidates) { - if (ObjectUtils.nullSafeEquals(candidate.getSourceType(), metadata.getSourceType())) { + if (ObjectUtils.nullSafeEquals(candidate.getSourceType(), + metadata.getSourceType())) { return candidate; } } return null; } - public static String nestedPrefix(String prefix, String name) { String nestedPrefix = (prefix == null ? "" : prefix); String dashedName = toDashedCase(name); diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java index 3eccec00b1..ab24934b69 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java @@ -79,7 +79,7 @@ public class ItemHint implements Comparable { public static ItemHint newHint(String name, ValueHint... values) { return new ItemHint(name, Arrays.asList(values), - Collections. emptyList()); + Collections.emptyList()); } @Override diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index 739c303137..435d71adf7 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -348,8 +348,8 @@ public class ConfigurationMetadataAnnotationProcessorTests { @Test public void mergingOfAdditionalProperty() throws Exception { - ItemMetadata property = ItemMetadata.newProperty(null, "foo", - "java.lang.String", AdditionalMetadata.class.getName(), null, null, null,null); + ItemMetadata property = ItemMetadata.newProperty(null, "foo", "java.lang.String", + AdditionalMetadata.class.getName(), null, null, null, null); writeAdditionalMetadata(property); ConfigurationMetadata metadata = compile(SimpleProperties.class); assertThat(metadata, containsProperty("simple.comparator")); @@ -360,16 +360,15 @@ public class ConfigurationMetadataAnnotationProcessorTests { @Test public void mergeExistingPropertyDefaultValue() throws Exception { - ItemMetadata property = ItemMetadata.newProperty("simple", "flag", null, - null, null, null, true, null); + ItemMetadata property = ItemMetadata.newProperty("simple", "flag", null, null, + null, null, true, null); writeAdditionalMetadata(property); ConfigurationMetadata metadata = compile(SimpleProperties.class); assertThat( metadata, containsProperty("simple.flag", Boolean.class) .fromSource(SimpleProperties.class) - .withDescription("A simple flag.") - .withDefaultValue(is(true))); + .withDescription("A simple flag.").withDefaultValue(is(true))); assertThat(metadata.getItems().size(), is(4)); } @@ -382,8 +381,8 @@ public class ConfigurationMetadataAnnotationProcessorTests { assertThat( metadata, containsProperty("simple.comparator", "java.util.Comparator") - .fromSource(SimpleProperties.class) - .withDescription("A nice comparator.")); + .fromSource(SimpleProperties.class).withDescription( + "A nice comparator.")); assertThat(metadata.getItems().size(), is(4)); } @@ -397,23 +396,23 @@ public class ConfigurationMetadataAnnotationProcessorTests { assertThat( metadata, containsProperty("simple.comparator", "java.util.Comparator") - .fromSource(SimpleProperties.class) - .withDeprecation("Don't use this.", "simple.complex-comparator")); + .fromSource(SimpleProperties.class).withDeprecation( + "Don't use this.", "simple.complex-comparator")); assertThat(metadata.getItems().size(), is(4)); } @Test public void mergeExistingPropertyDeprecationOverride() throws Exception { - ItemMetadata property = ItemMetadata.newProperty("singledeprecated", "name", null, - null, null, null, null, new ItemDeprecation("Don't use this.", + ItemMetadata property = ItemMetadata.newProperty("singledeprecated", "name", + null, null, null, null, null, new ItemDeprecation("Don't use this.", "single.name")); writeAdditionalMetadata(property); ConfigurationMetadata metadata = compile(DeprecatedSingleProperty.class); assertThat( metadata, containsProperty("singledeprecated.name", String.class.getName()) - .fromSource(DeprecatedSingleProperty.class) - .withDeprecation("Don't use this.", "single.name")); + .fromSource(DeprecatedSingleProperty.class).withDeprecation( + "Don't use this.", "single.name")); assertThat(metadata.getItems().size(), is(3)); } @@ -461,9 +460,9 @@ public class ConfigurationMetadataAnnotationProcessorTests { @Test public void mergingOfHintWithProvider() throws Exception { writeAdditionalHints(new ItemHint("simple.theName", - Collections. emptyList(), Arrays.asList( + Collections.emptyList(), Arrays.asList( new ItemHint.ValueProvider("first", Collections - . singletonMap("target", "org.foo")), + .singletonMap("target", "org.foo")), new ItemHint.ValueProvider("second", null)))); ConfigurationMetadata metadata = compile(SimpleProperties.class); assertThat( diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java index db4d93dc86..81b2dafe69 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java @@ -60,7 +60,7 @@ public class JsonMarshallerTests { metadata.add(ItemHint.newHint("c", new ItemHint.ValueHint(123, "hey"), new ItemHint.ValueHint(456, null))); metadata.add(new ItemHint("d", null, Arrays.asList(new ItemHint.ValueProvider( - "first", Collections. singletonMap("target", "foo")), + "first", Collections.singletonMap("target", "foo")), new ItemHint.ValueProvider("second", null)))); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); JsonMarshaller marshaller = new JsonMarshaller(); diff --git a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/ManagedDependencies.java b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/ManagedDependencies.java index e584147e18..3602a9521c 100644 --- a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/ManagedDependencies.java +++ b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/ManagedDependencies.java @@ -93,7 +93,7 @@ public abstract class ManagedDependencies implements Dependencies { * @see #get(Collection) */ public static ManagedDependencies get() { - return get(Collections.emptySet()); + return get(Collections. emptySet()); } /** diff --git a/spring-boot-tools/spring-boot-dependency-tools/src/test/java/org/springframework/boot/dependency/tools/ManagedDependenciesDelegateTests.java b/spring-boot-tools/spring-boot-dependency-tools/src/test/java/org/springframework/boot/dependency/tools/ManagedDependenciesDelegateTests.java index d090f80f05..0e322ce53e 100644 --- a/spring-boot-tools/spring-boot-dependency-tools/src/test/java/org/springframework/boot/dependency/tools/ManagedDependenciesDelegateTests.java +++ b/spring-boot-tools/spring-boot-dependency-tools/src/test/java/org/springframework/boot/dependency/tools/ManagedDependenciesDelegateTests.java @@ -35,7 +35,7 @@ public class ManagedDependenciesDelegateTests { PropertiesFileDependencies extra = new PropertiesFileDependencies(getClass() .getResourceAsStream("additional-external.properties")); this.dependencies = new ManagedDependenciesDelegate(root, - Collections.singleton(extra)); + Collections. singleton(extra)); } @Test diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java index e598f08d34..6557e51db8 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java @@ -54,7 +54,7 @@ public class BootRunTask extends JavaExec { @Override public void exec() { - if(System.console() != null) { + if (System.console() != null) { // Record that the console is available here for AnsiOutput to detect later this.getEnvironment().put("spring.output.ansi.console-available", true); } diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java index d1380e298d..be05d03be8 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java @@ -167,8 +167,8 @@ public abstract class SystemPropertyUtils { /** * Search the System properties and environment variables for a value with the - * provided key. Environment variables in {@code UPPER_CASE} style are allowed - * where System properties would normally be {@code lower.case}. + * provided key. Environment variables in {@code UPPER_CASE} style are allowed where + * System properties would normally be {@code lower.case}. * @param key the key to resolve * @param defaultValue the default value * @param text optional extra context for an error message if the key resolution fails diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index 6466234250..3d8ed4956d 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -121,9 +121,10 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { private LayoutType layout; /** - * A list of the libraries that must be unpacked from fat jars in order to run. Specify - * each library as a <dependency> with a <groupId> and a - * <artifactId> and they will be unpacked at runtime in $TMPDIR/spring-boot-libs. + * A list of the libraries that must be unpacked from fat jars in order to run. + * Specify each library as a <dependency> with a + * <groupId> and a <artifactId> and they will be + * unpacked at runtime in $TMPDIR/spring-boot-libs. * @since 1.1 */ @Parameter diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java index 1c14719d4e..9a90d36b0b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java @@ -83,7 +83,7 @@ public class PropertySourcesPropertyValues implements PropertyValues { Assert.notNull(propertySources, "PropertySources must not be null"); Assert.notNull(includes, "Includes must not be null"); this.propertySources = propertySources; - this.propertyNames = (propertyNames == null ? Collections. emptySet() + this.propertyNames = (propertyNames == null ? Collections.emptySet() : propertyNames); this.includes = includes; PropertySourcesPropertyResolver resolver = new PropertySourcesPropertyResolver( diff --git a/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java b/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java index 57be0bda89..f89b5a0653 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java @@ -22,8 +22,8 @@ import org.springframework.context.ConfigurableApplicationContext; /** * Event published as late as conceivably possible to indicate that the application is * ready to service requests. The source of the event is the {@link SpringApplication} - * itself, but beware of modifying its internal state since all initialization steps - * will have been completed by then. + * itself, but beware of modifying its internal state since all initialization steps will + * have been completed by then. * * @author Stephane Nicoll * @since 1.3.0 diff --git a/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java b/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java index fbbad162cb..1d8b3eb933 100644 --- a/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java @@ -74,7 +74,7 @@ public class DefaultApplicationArgumentsTests { ApplicationArguments arguments = new DefaultApplicationArguments(ARGS); assertThat(arguments.getOptionValues("foo"), equalTo(Arrays.asList("bar", "baz"))); assertThat(arguments.getOptionValues("debug"), - equalTo(Collections. emptyList())); + equalTo(Collections.emptyList())); assertThat(arguments.getOptionValues("spring"), equalTo(null)); } @@ -88,8 +88,7 @@ public class DefaultApplicationArgumentsTests { public void getNoNonOptionArgs() throws Exception { ApplicationArguments arguments = new DefaultApplicationArguments( new String[] { "--debug" }); - assertThat(arguments.getNonOptionArgs(), - equalTo(Collections. emptyList())); + assertThat(arguments.getNonOptionArgs(), equalTo(Collections.emptyList())); } }