From 0a0247975c11f976acc3cb0210aac862aea699d4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 4 May 2018 12:00:50 -0700 Subject: [PATCH] Formatting --- .../ConfigurationPropertiesReportEndpoint.java | 2 ++ .../actuate/endpoint/DataSourcePublicMetrics.java | 4 ++-- .../boot/actuate/endpoint/FlywayEndpoint.java | 1 + .../endpoint/mvc/MvcEndpointSecurityInterceptor.java | 1 + ...intWebMvcManagementContextConfigurationTests.java | 3 +++ .../actuate/endpoint/mvc/HealthMvcEndpointTests.java | 1 + .../autoconfigure/cache/CacheAutoConfiguration.java | 3 +-- .../cassandra/CassandraDataAutoConfiguration.java | 4 ++-- .../integration/IntegrationAutoConfiguration.java | 1 + .../IntegrationAutoConfigurationScanRegistrar.java | 1 + .../client/OAuth2RestOperationsConfiguration.java | 3 +++ .../oauth2/resource/ResourceServerProperties.java | 1 + .../ResourceServerTokenServicesConfiguration.java | 2 ++ .../transaction/TransactionAutoConfiguration.java | 1 + .../cache/CacheAutoConfigurationTests.java | 12 ++++++------ .../CouchbaseDataAutoConfigurationTests.java | 1 + .../TransactionAutoConfigurationTests.java | 1 + .../validation/ValidationAutoConfigurationTests.java | 3 +++ .../boot/cli/command/archive/ArchiveCommand.java | 7 ++++--- .../cli/command/init/ProjectGenerationRequest.java | 3 ++- .../jest/JestClientCustomizationExample.java | 1 + .../boot/web/client/SampleWebClientTests.java | 4 +--- .../boot/test/context/ImportsContextCustomizer.java | 1 + .../TestMethodConfiguration.java | 1 + .../TestOrderedClassConfiguration.java | 1 + ...onfigurationMetadataAnnotationProcessorTests.java | 4 ++-- .../springframework/boot/loader/tools/Layouts.java | 1 + .../org/springframework/boot/loader/jar/JarFile.java | 2 +- .../boot/bind/PropertiesConfigurationFactory.java | 4 ++-- .../config/AnsiOutputApplicationListener.java | 4 ++-- .../AbstractEmbeddedServletContainerFactory.java | 1 - .../jetty/JettyEmbeddedServletContainerFactory.java | 1 - .../UndertowEmbeddedServletContainerFactory.java | 2 ++ ...ty8JettyEmbeddedServletContainerFactoryTests.java | 1 + ...igurationPropertiesBindingPostProcessorTests.java | 2 ++ .../boot/jackson/JsonComponentModuleTests.java | 2 ++ 36 files changed, 59 insertions(+), 28 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java index 31d148bf4c5..5223485d610 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java @@ -344,6 +344,7 @@ public class ConfigurationPropertiesReportEndpoint } super.serializeAsField(pojo, jgen, provider, writer); } + } /** @@ -395,4 +396,5 @@ public class ConfigurationPropertiesReportEndpoint } } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java index b0f45471d84..65f78d865da 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java @@ -104,8 +104,8 @@ public class DataSourcePublicMetrics implements PublicMetrics { if (primary) { return "datasource.primary"; } - if (name.length() > DATASOURCE_SUFFIX.length() - && name.toLowerCase(Locale.ENGLISH).endsWith(DATASOURCE_SUFFIX.toLowerCase())) { + if (name.length() > DATASOURCE_SUFFIX.length() && name.toLowerCase(Locale.ENGLISH) + .endsWith(DATASOURCE_SUFFIX.toLowerCase())) { name = name.substring(0, name.length() - DATASOURCE_SUFFIX.length()); } return "datasource." + name; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java index a213b9ba886..cf3b1b7b738 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java @@ -73,6 +73,7 @@ public class FlywayEndpoint extends AbstractEndpoint> { public static class FlywayReport { private final String name; + private final List migrations; public FlywayReport(String name, List migrations) { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java index a8bc37ae864..e69b0e26323 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java @@ -142,6 +142,7 @@ public class MvcEndpointSecurityInterceptor extends HandlerInterceptorAdapter { } return false; } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java index 37bb8db84d2..f0597b9e9d7 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java @@ -325,6 +325,7 @@ public class EndpointWebMvcManagementContextConfigurationTests { TestMetricsMvcEndpoint(MetricsEndpoint delegate) { super(delegate); } + } static class TestAuditEventsMvcEndpoint extends AuditEventsMvcEndpoint { @@ -332,6 +333,7 @@ public class EndpointWebMvcManagementContextConfigurationTests { TestAuditEventsMvcEndpoint(AuditEventRepository auditEventRepository) { super(auditEventRepository); } + } static class TestShutdownMvcEndpoint extends ShutdownMvcEndpoint { @@ -339,6 +341,7 @@ public class EndpointWebMvcManagementContextConfigurationTests { TestShutdownMvcEndpoint(ShutdownEndpoint delegate) { super(delegate); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java index 6f0476cc80b..d89575bd9c9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java @@ -277,4 +277,5 @@ public class HealthMvcEndpointTests { Health health = ((ResponseEntity) result).getBody(); assertThat(health.getStatus() == Status.DOWN).isTrue(); } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java index 2c29fe85250..c928d0c0c2c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java @@ -75,8 +75,7 @@ public class CacheAutoConfiguration { @Bean public CacheManagerValidator cacheAutoConfigurationValidator( - CacheProperties cacheProperties, - ObjectProvider cacheManager) { + CacheProperties cacheProperties, ObjectProvider cacheManager) { return new CacheManagerValidator(cacheProperties, cacheManager); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java index e249fbc0467..4611468a42e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java @@ -115,8 +115,8 @@ public class CassandraDataAutoConfiguration { session.setKeyspaceName(this.properties.getKeyspaceName()); String name = this.propertyResolver.getProperty("schemaAction", SchemaAction.NONE.name()); - SchemaAction schemaAction = SchemaAction.valueOf( - name.toUpperCase(Locale.ENGLISH)); + SchemaAction schemaAction = SchemaAction + .valueOf(name.toUpperCase(Locale.ENGLISH)); session.setSchemaAction(schemaAction); return session; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java index 4dae5fe9bee..6389bcbdba2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java @@ -120,6 +120,7 @@ public class IntegrationAutoConfiguration { @Configuration @EnableIntegrationManagement(defaultCountsEnabled = "true", defaultStatsEnabled = "true") protected static class EnableIntegrationManagementConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java index 87f2653b603..3647615f5c7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java @@ -77,6 +77,7 @@ class IntegrationAutoConfigurationScanRegistrar extends IntegrationComponentScan } return attributes; } + } @IntegrationComponentScan diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java index f7c15f9c51f..5ff6468d42a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java @@ -185,6 +185,7 @@ public class OAuth2RestOperationsConfiguration { @Conditional(ClientCredentialsCondition.class) static class ClientCredentialsActivated { + } } @@ -200,10 +201,12 @@ public class OAuth2RestOperationsConfiguration { @ConditionalOnProperty(prefix = "security.oauth2.client", name = "grant-type", havingValue = "client_credentials", matchIfMissing = false) static class ClientCredentialsConfigured { + } @ConditionalOnNotWebApplication static class NoWebApplication { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java index 4da99ade0cd..54b50b2ea37 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java @@ -292,6 +292,7 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware { public void setKeySetUri(String keySetUri) { this.keySetUri = keySetUri; } + } } 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 2f5d1d0ae8b..fb0f652b0d3 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 @@ -234,6 +234,7 @@ public class ResourceServerTokenServicesConfiguration { public TokenStore jwkTokenStore() { return new JwkTokenStore(this.resource.getJwk().getKeySetUri()); } + } @Configuration @@ -415,6 +416,7 @@ public class ResourceServerTokenServicesConfiguration { static class HasJwkConfiguration { } + } static class AcceptJsonRequestInterceptor implements ClientHttpRequestInterceptor { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java index f3ac1b415a6..03451c35876 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java @@ -75,6 +75,7 @@ public class TransactionAutoConfiguration { public TransactionTemplate transactionTemplate() { return new TransactionTemplate(this.transactionManager); } + } @Configuration 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 73a7f8f9452..940093ea038 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 @@ -776,8 +776,8 @@ public class CacheAutoConfigurationTests { public void autoConfiguredCacheManagerCanBeSwapped() { load(CacheManagerPostProcessorConfiguration.class, "spring.cache.type=caffeine"); validateCacheManager(SimpleCacheManager.class); - CacheManagerPostProcessor postProcessor = this.context.getBean( - CacheManagerPostProcessor.class); + CacheManagerPostProcessor postProcessor = this.context + .getBean(CacheManagerPostProcessor.class); assertThat(postProcessor.cacheManagers).hasSize(1); assertThat(postProcessor.cacheManagers.get(0)) .isInstanceOf(CaffeineCacheManager.class); @@ -1193,14 +1193,14 @@ public class CacheAutoConfigurationTests { private final List cacheManagers = new ArrayList(); @Override - public Object postProcessBeforeInitialization(Object bean, - String beanName) throws BeansException { + public Object postProcessBeforeInitialization(Object bean, String beanName) + throws BeansException { return bean; } @Override - public Object postProcessAfterInitialization(Object bean, - String beanName) throws BeansException { + public Object postProcessAfterInitialization(Object bean, String beanName) + throws BeansException { if (bean instanceof CacheManager) { this.cacheManagers.add((CacheManager) bean); return new SimpleCacheManager(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java index ef632fb8b3a..652796e86bc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java @@ -185,6 +185,7 @@ public class CouchbaseDataAutoConfigurationTests { public Boolean convert(CouchbaseProperties value) { return true; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java index e453f65b2cb..e453c128f04 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java @@ -203,6 +203,7 @@ public class TransactionAutoConfigurationTests { public AnotherServiceImpl anotherService() { return new AnotherServiceImpl(); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java index a937e88811d..35ba561fe40 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java @@ -304,6 +304,7 @@ public class ValidationAutoConfigurationTests { interface AnotherSampleService { void doSomething(@Min(42) Integer counter); + } @Validated @@ -313,6 +314,7 @@ public class ValidationAutoConfigurationTests { public void doSomething(Integer counter) { } + } @Configuration @@ -382,6 +384,7 @@ public class ValidationAutoConfigurationTests { } } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java index 9d2c7367958..3910800a5dd 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java @@ -131,9 +131,10 @@ abstract class ArchiveCommand extends OptionParsingCommand { File output = new File((String) nonOptionArguments.remove(0)); Assert.isTrue( - output.getName().toLowerCase(Locale.ENGLISH).endsWith("." + this.type), - "The output '" + output + "' is not a " + this.type.toUpperCase( - Locale.ENGLISH) + " file."); + output.getName().toLowerCase(Locale.ENGLISH) + .endsWith("." + this.type), + "The output '" + output + "' is not a " + + this.type.toUpperCase(Locale.ENGLISH) + " file."); deleteIfExists(output); GroovyCompiler compiler = createCompiler(options); diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java index 1d2f30289ed..a7b73161741 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java @@ -360,7 +360,8 @@ class ProjectGenerationRequest { return builder.build(); } catch (URISyntaxException ex) { - throw new ReportableException("Invalid service URL (" + ex.getMessage() + ")"); + throw new ReportableException( + "Invalid service URL (" + ex.getMessage() + ")"); } } diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java b/spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java index 1a4c40cc98f..a3fb30419ec 100644 --- a/spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java +++ b/spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java @@ -42,4 +42,5 @@ public class JestClientCustomizationExample { } // end::customizer[] + } diff --git a/spring-boot-docs/src/test/java/org/springframework/boot/web/client/SampleWebClientTests.java b/spring-boot-docs/src/test/java/org/springframework/boot/web/client/SampleWebClientTests.java index 67c1796f045..40703579431 100644 --- a/spring-boot-docs/src/test/java/org/springframework/boot/web/client/SampleWebClientTests.java +++ b/spring-boot-docs/src/test/java/org/springframework/boot/web/client/SampleWebClientTests.java @@ -55,9 +55,7 @@ public class SampleWebClientTests { @Bean public RestTemplateBuilder restTemplateBuilder() { - return new RestTemplateBuilder() - .setConnectTimeout(1000) - .setReadTimeout(1000); + return new RestTemplateBuilder().setConnectTimeout(1000).setReadTimeout(1000); } } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java index dd3a9323a64..f42db9d12ef 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java @@ -354,6 +354,7 @@ class ImportsContextCustomizer implements ContextCustomizer { public String toString() { return this.key.toString(); } + } /** diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java b/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java index 3793b857c0d..305c5720f70 100644 --- a/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java +++ b/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java @@ -30,4 +30,5 @@ public class TestMethodConfiguration { public Object method() { return null; } + } diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestOrderedClassConfiguration.java b/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestOrderedClassConfiguration.java index 625fd14ed0c..03992b81365 100644 --- a/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestOrderedClassConfiguration.java +++ b/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestOrderedClassConfiguration.java @@ -29,4 +29,5 @@ import java.io.OutputStream; @TestConditionalOnClass(name = "java.io.InputStream", value = OutputStream.class) @TestAutoConfigureOrder(123) public class TestOrderedClassConfiguration { + } 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 0b33682279f..9cfacf15652 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 @@ -549,8 +549,8 @@ public class ConfigurationMetadataAnnotationProcessorTests { "java.lang.String", null, null, null, null, null); writeAdditionalMetadata(property); ConfigurationMetadata metadata = compile(SimpleProperties.class); - assertThat(metadata).has(Metadata.withGroup("simple") - .fromSource(SimpleProperties.class)); + assertThat(metadata) + .has(Metadata.withGroup("simple").fromSource(SimpleProperties.class)); assertThat(metadata).has(Metadata.withProperty("simple", String.class)); } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java index 390286aa619..4ff85868599 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java @@ -160,6 +160,7 @@ public final class Layouts { /** * Module layout (designed to be used as a "plug-in"). + * * @deprecated as of 1.5 in favor of a custom {@link LayoutFactory} */ @Deprecated diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java index afb9d9bea6b..c44070d8244 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java @@ -108,7 +108,7 @@ public class JarFile extends java.util.jar.JarFile { private JarFile(RandomAccessDataFile rootFile, String pathFromRoot, RandomAccessData data, JarEntryFilter filter, JarFileType type) - throws IOException { + throws IOException { super(rootFile.getFile()); this.rootFile = rootFile; this.pathFromRoot = pathFromRoot; diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java index 7d58d9dd7cd..2c9c8dfa47b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java @@ -54,8 +54,8 @@ import org.springframework.validation.Validator; * @param the target type * @author Dave Syer */ -public class PropertiesConfigurationFactory - implements FactoryBean, ApplicationContextAware, MessageSourceAware, InitializingBean { +public class PropertiesConfigurationFactory implements FactoryBean, + ApplicationContextAware, MessageSourceAware, InitializingBean { private static final char[] EXACT_DELIMITERS = { '_', '.', '[' }; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java index 01daf51b809..b95cbea134f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java @@ -42,8 +42,8 @@ public class AnsiOutputApplicationListener event.getEnvironment(), "spring.output.ansi."); if (resolver.containsProperty("enabled")) { String enabled = resolver.getProperty("enabled"); - AnsiOutput.setEnabled(Enum.valueOf(Enabled.class, - enabled.toUpperCase(Locale.ENGLISH))); + AnsiOutput.setEnabled( + Enum.valueOf(Enabled.class, enabled.toUpperCase(Locale.ENGLISH))); } if (resolver.containsProperty("console-available")) { diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java index 83f58080193..510c3c19d69 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -130,7 +130,6 @@ public abstract class AbstractEmbeddedServletContainerFactory /** * Converts the given {@code url} into a decoded file path. - * * @param url the url to convert * @return the file path * @deprecated Since 1.5.13 in favor of {@link File#File(java.net.URI)} 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 8f83eb8fd9d..6e2748f26da 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 @@ -102,7 +102,6 @@ import org.springframework.util.StringUtils; * @author Venil Noronha * @author Henri Kerola * @author Henrich Krämer - * * @see #setPort(int) * @see #setConfigurations(Collection) * @see JettyEmbeddedServletContainer diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java index a63ca7da5c8..65dce182611 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java @@ -701,6 +701,7 @@ public class UndertowEmbeddedServletContainerFactory return null; } } + } /** @@ -722,6 +723,7 @@ public class UndertowEmbeddedServletContainerFactory initializer.onStartup(servletContext); } } + } /** diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java index 94840dd80ea..696d892025a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java @@ -112,6 +112,7 @@ public class Jetty8JettyEmbeddedServletContainerFactoryTests { resp.getWriter().print("An error occurred"); resp.flushBuffer(); } + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java index 1119b5926b4..0db11ab996a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java @@ -554,6 +554,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests { interface ValidatedProperties { String getFoo(); + } @ConfigurationProperties("test") @@ -890,6 +891,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests { } return null; } + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java index 09c842d2d48..67fe311dd25 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java @@ -117,5 +117,7 @@ public class JsonComponentModuleTests { static class ConcreteSerializer extends AbstractSerializer { } + } + }