From e578ace7d71ac8aac758fdc82f76ef438d943467 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 19 Dec 2016 10:29:42 -0800 Subject: [PATCH 1/4] Polish doc formatting --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 1 + spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 7a32c1a0633..4a2879e54c5 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -2716,6 +2716,7 @@ advanced examples, typically to take full control over the configuration of the DataSource. + [[boot-features-embedded-database-support]] ==== Embedded Database Support It's often convenient to develop applications using an in-memory embedded database. diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index b6f90a430a7..5b2905ab731 100644 --- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -781,7 +781,7 @@ will cache compiled templates to avoid repeatedly parsing template files. Also, Spring MVC can add HTTP caching headers to responses when serving static resources. Whilst caching is very beneficial in production, it can be counter productive during -development, preventing you from seeing the changes you just made in your application. +development, preventing you from seeing the changes you just made in your application. For this reason, spring-boot-devtools will disable those caching options by default. Cache options are usually configured by settings in your `application.properties` file. From bd74c3d327f0ee704d89dce957f3783b4195eef7 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 19 Dec 2016 10:30:48 -0800 Subject: [PATCH 2/4] Polish formatting --- .../CacheStatisticsAutoConfiguration.java | 1 + .../autoconfigure/CrshAutoConfiguration.java | 2 ++ .../EndpointMBeanExportProperties.java | 1 + .../EndpointWebMvcAutoConfiguration.java | 1 + .../autoconfigure/JolokiaProperties.java | 1 + ...anagementWebSecurityAutoConfiguration.java | 1 + .../MetricRepositoryAutoConfiguration.java | 2 +- .../actuate/autoconfigure/MetricsFilter.java | 3 ++- .../autoconfigure/ShellProperties.java | 1 + .../AutoConfigurationReportEndpoint.java | 1 + .../boot/actuate/endpoint/BeansEndpoint.java | 1 + ...ConfigurationPropertiesReportEndpoint.java | 1 + .../boot/actuate/endpoint/HealthEndpoint.java | 1 + .../boot/actuate/endpoint/TraceEndpoint.java | 1 + .../endpoint/jmx/ShutdownEndpointMBean.java | 1 + .../endpoint/mvc/HalJsonMvcEndpoint.java | 1 + .../endpoint/mvc/JolokiaMvcEndpoint.java | 1 + .../endpoint/mvc/ShutdownMvcEndpoint.java | 1 + .../health/AbstractHealthIndicator.java | 1 + .../health/DiskSpaceHealthIndicator.java | 1 + .../boot/actuate/health/Health.java | 1 + .../boot/actuate/health/HealthAggregator.java | 1 + .../dropwizard/DropwizardMetricServices.java | 1 + .../metrics/export/MetricCopyExporter.java | 1 + .../metrics/opentsdb/OpenTsdbGaugeWriter.java | 1 - .../redis/RedisMetricRepository.java | 3 --- .../metrics/repository/redis/RedisUtils.java | 1 + .../rich/InMemoryRichGaugeRepository.java | 1 + .../util/SimpleInMemoryRepository.java | 1 + .../AuditAutoConfigurationTests.java | 1 + ...HealthIndicatorAutoConfigurationTests.java | 1 + ...mentWebSecurityAutoConfigurationTests.java | 2 ++ .../PublicMetricsAutoConfigurationTests.java | 5 ++++ .../autoconfigure/ShellPropertiesTests.java | 2 ++ .../AutoConfigurationReportEndpointTests.java | 1 + ...onPropertiesReportEndpointParentTests.java | 4 ++++ ...rtiesReportEndpointSerializationTests.java | 2 ++ ...gurationPropertiesReportEndpointTests.java | 3 +++ .../actuate/endpoint/DumpEndpointTests.java | 1 + .../endpoint/EnvironmentEndpointTests.java | 1 + .../actuate/endpoint/HealthEndpointTests.java | 2 ++ .../endpoint/MetricsEndpointTests.java | 1 + .../endpoint/RequestMappingEndpointTests.java | 3 +++ .../endpoint/ShutdownEndpointTests.java | 1 + .../endpoint/ShutdownParentEndpointTests.java | 3 +++ .../actuate/endpoint/TraceEndpointTests.java | 2 ++ .../mvc/EndpointHandlerMappingTests.java | 1 + .../JolokiaMvcEndpointContextPathTests.java | 3 +++ .../endpoint/mvc/MvcEndpointsTests.java | 1 + .../ElasticsearchHealthIndicatorTests.java | 1 + .../DropwizardMetricServicesTests.java | 2 +- .../SpringIntegrationMetricReaderTests.java | 2 ++ .../rich/MultiMetricRichGaugeReaderTests.java | 3 +++ ...ractDependsOnBeanFactoryPostProcessor.java | 1 + .../AutoConfigurationSorter.java | 1 + .../amqp/RabbitAutoConfiguration.java | 1 + .../aop/AopAutoConfiguration.java | 2 ++ .../autoconfigure/batch/BatchProperties.java | 1 + .../cache/CacheAutoConfiguration.java | 3 +++ .../cache/HazelcastInstanceConfiguration.java | 1 + .../cache/JCacheCacheConfiguration.java | 2 ++ .../condition/ConditionEvaluationReport.java | 1 + .../condition/ConditionMessage.java | 24 +++++++++---------- .../ConditionalOnWebApplication.java | 1 + .../condition/OnBeanCondition.java | 1 + .../couchbase/CouchbaseAutoConfiguration.java | 2 ++ ...draRepositoriesAutoConfigureRegistrar.java | 1 + ...JpaRepositoriesAutoConfigureRegistrar.java | 2 ++ ...ngoRepositoriesAutoConfigureRegistrar.java | 1 + .../data/redis/RedisProperties.java | 1 + .../flyway/FlywayProperties.java | 1 + .../FreeMarkerAutoConfiguration.java | 1 + .../autoconfigure/h2/H2ConsoleProperties.java | 1 + .../hateoas/HypermediaAutoConfiguration.java | 1 + .../IntegrationAutoConfiguration.java | 1 + .../jdbc/DataSourceAutoConfiguration.java | 4 ++++ .../jdbc/DataSourceConfiguration.java | 3 +++ .../jdbc/EmbeddedDatabaseConnection.java | 3 +-- .../jersey/JerseyAutoConfiguration.java | 1 + .../jersey/JerseyProperties.java | 2 ++ .../jms/JmsAnnotationDrivenConfiguration.java | 1 + .../jms/JmsAutoConfiguration.java | 1 + .../boot/autoconfigure/jms/JmsProperties.java | 2 ++ ...ndiConnectionFactoryAutoConfiguration.java | 2 ++ .../HornetQEmbeddedConfigurationFactory.java | 1 + .../jms/hornetq/HornetQProperties.java | 1 - ...rnetQXAConnectionFactoryConfiguration.java | 1 + .../jooq/JooqExceptionTranslator.java | 4 ++-- .../liquibase/LiquibaseAutoConfiguration.java | 1 + .../mail/MailSenderAutoConfiguration.java | 2 ++ .../autoconfigure/mongo/MongoProperties.java | 1 - .../mustache/MustacheAutoConfiguration.java | 1 + .../jpa/DataSourceInitializedPublisher.java | 1 + .../FallbackWebSecurityAutoConfiguration.java | 1 + .../security/SecurityProperties.java | 2 ++ .../SpringBootWebSecurityConfiguration.java | 2 ++ .../OAuth2RestOperationsConfiguration.java | 1 + .../resource/ResourceServerProperties.java | 1 + .../UserInfoRestTemplateCustomizer.java | 1 - .../sendgrid/SendGridAutoConfiguration.java | 3 +++ .../HazelcastSessionConfiguration.java | 1 + .../social/LinkedInAutoConfiguration.java | 1 + .../social/SocialWebAutoConfiguration.java | 2 ++ .../thymeleaf/ThymeleafAutoConfiguration.java | 1 + .../jta/BitronixJtaConfiguration.java | 2 ++ .../web/DefaultErrorViewResolver.java | 1 + .../web/HttpEncodingProperties.java | 2 ++ .../autoconfigure/web/ServerProperties.java | 1 + .../AutoConfigurationReproTests.java | 1 + .../AutoConfigurationSorterTests.java | 12 ++++++++++ .../ImportAutoConfigurationTests.java | 4 ++++ ...urceAutoConfigurationIntegrationTests.java | 1 + .../MessageSourceAutoConfigurationTests.java | 1 + .../amqp/RabbitAutoConfigurationTests.java | 3 +++ .../aop/AopAutoConfigurationTests.java | 6 +++++ .../batch/BatchAutoConfigurationTests.java | 9 +++++++ .../cache/CacheAutoConfigurationTests.java | 1 + .../cache/CacheManagerCustomizersTests.java | 2 +- .../ConditionEvaluationReportTests.java | 1 + .../condition/ConditionalOnBeanTests.java | 4 ++++ .../condition/ConditionalOnClassTests.java | 1 + .../ConditionalOnExpressionTests.java | 5 ++++ .../condition/ConditionalOnJavaTests.java | 6 +++++ .../condition/ConditionalOnJndiTests.java | 3 +++ .../ConditionalOnMissingBeanTests.java | 2 ++ .../ConditionalOnMissingClassTests.java | 6 +++++ .../ConditionalOnNotWebApplicationTests.java | 5 ++++ .../condition/ConditionalOnPropertyTests.java | 1 + .../condition/ConditionalOnResourceTests.java | 7 ++++++ .../ConditionalOnSingleCandidateTests.java | 1 + .../ConditionalOnWebApplicationTests.java | 5 ++++ .../condition/ResourceConditionTests.java | 4 ++++ ...ationPropertiesAutoConfigurationTests.java | 1 + .../couchbase/CouchbaseTestServer.java | 1 + ...tionTranslationAutoConfigurationTests.java | 2 ++ .../couchbase/CityCouchbaseRepository.java | 1 + .../data/cassandra/city/City.java | 1 + ...rchRepositoriesAutoConfigurationTests.java | 1 + .../data/elasticsearch/city/City.java | 1 + ...JpaRepositoriesAutoConfigurationTests.java | 1 + .../autoconfigure/data/jpa/city/City.java | 1 + ...ngoRepositoriesAutoConfigurationTests.java | 1 + .../MongoDataAutoConfigurationTests.java | 2 ++ ...ngoRepositoriesAutoConfigurationTests.java | 1 + .../autoconfigure/data/mongo/city/City.java | 1 + .../data/mongo/country/Country.java | 1 + ...o4jRepositoriesAutoConfigurationTests.java | 1 + ...olrRepositoriesAutoConfigurationTests.java | 2 ++ .../data/solr/city/CityRepository.java | 1 + .../flyway/FlywayAutoConfigurationTests.java | 2 ++ .../JacksonAutoConfigurationTests.java | 2 ++ .../DataSourceJsonSerializationTests.java | 1 + .../JndiDataSourceAutoConfigurationTests.java | 1 + .../HikariDataSourcePoolMetadataTests.java | 1 + ...igurationCustomFilterContextPathTests.java | 1 + ...utoConfigurationCustomFilterPathTests.java | 1 + ...ConfigurationCustomLoadOnStartupTests.java | 2 ++ ...gurationCustomServletContextPathTests.java | 1 + ...toConfigurationCustomServletPathTests.java | 1 + ...toConfigurationDefaultFilterPathTests.java | 1 + ...oConfigurationDefaultServletPathTests.java | 1 + ...figurationWithoutApplicationPathTests.java | 1 + .../jms/JmsAutoConfigurationTests.java | 2 ++ .../ArtemisAutoConfigurationTests.java | 3 +++ .../HornetQAutoConfigurationTests.java | 5 ++++ .../jmx/JmxAutoConfigurationTests.java | 1 + ...gurationReportLoggingInitializerTests.java | 2 ++ ...acheAutoConfigurationIntegrationTests.java | 2 ++ .../web/MustacheWebIntegrationTests.java | 2 ++ .../AbstractJpaAutoConfigurationTests.java | 1 + ...tomHibernateJpaAutoConfigurationTests.java | 1 + .../boot/autoconfigure/orm/jpa/test/City.java | 1 + .../ReactorAutoConfigurationTests.java | 1 + .../SecurityAutoConfigurationTests.java | 1 + ...ringBootWebSecurityConfigurationTests.java | 1 + .../security/jpa/JpaUserDetailsTests.java | 1 + .../oauth2/OAuth2AutoConfigurationTests.java | 1 + .../FacebookAutoConfigurationTests.java | 1 + .../TransactionAutoConfigurationTests.java | 2 ++ .../jta/JtaAutoConfigurationTests.java | 1 + ...cityTemplateAvailabilityProviderTests.java | 1 + ...asicErrorControllerDirectMockMvcTests.java | 1 + .../web/BasicErrorControllerMockMvcTests.java | 1 + .../web/DefaultErrorViewIntegrationTests.java | 1 + ...spatcherServletAutoConfigurationTests.java | 1 + ...ervletContainerAutoConfigurationTests.java | 2 ++ ...ssageConvertersAutoConfigurationTests.java | 7 ++++++ .../web/MultipartAutoConfigurationTests.java | 5 ++++ .../web/WebMvcAutoConfigurationTests.java | 3 +++ .../boot/cli/command/HelpExample.java | 1 + .../boot/cli/command/core/HintCommand.java | 1 + .../cli/command/options/OptionHandler.java | 2 ++ .../OptionSetGroovyCompilerConfiguration.java | 1 + .../boot/cli/command/run/RunCommand.java | 2 ++ .../command/run/SpringApplicationRunner.java | 2 +- .../SpringApplicationRunnerConfiguration.java | 1 + .../boot/cli/command/shell/AnsiString.java | 1 + .../cli/command/shell/CommandCompleter.java | 2 ++ .../boot/cli/command/shell/ShellPrompts.java | 1 + .../boot/cli/command/test/TestCommand.java | 1 + .../boot/cli/command/test/TestRunner.java | 1 + .../AnnotatedNodeASTTransformation.java | 1 + ...ndencyAutoConfigurationTransformation.java | 1 + .../cli/compiler/DependencyCustomizer.java | 2 +- .../compiler/ExtendedGroovyClassLoader.java | 2 ++ ...veDependencyCoordinatesTransformation.java | 1 + .../JUnitCompilerAutoConfiguration.java | 1 + .../JmsCompilerAutoConfiguration.java | 1 + .../RabbitCompilerAutoConfiguration.java | 1 + .../SpringBatchCompilerAutoConfiguration.java | 1 + .../SpringBootCompilerAutoConfiguration.java | 1 + ...gIntegrationCompilerAutoConfiguration.java | 1 + .../SpringRetryCompilerAutoConfiguration.java | 1 + ...ringSecurityCompilerAutoConfiguration.java | 1 + .../SpringTestCompilerAutoConfiguration.java | 1 + .../ArtifactCoordinatesResolver.java | 1 + .../grape/AetherGrapeEngineFactory.java | 1 + ...ositorySystemSessionAutoConfiguration.java | 1 + .../grape/DetailedProgressReporter.java | 1 + .../compiler/grape/GrapeEngineInstaller.java | 1 + .../grape/SummaryProgressReporter.java | 1 + .../compiler/maven/MavenSettingsReader.java | 1 + .../springframework/boot/cli/CliTester.java | 1 + .../boot/cli/GrabCommandIntegrationTests.java | 1 + .../app/SpringApplicationLauncherTests.java | 1 + .../CommandRunnerIntegrationTests.java | 1 + .../boot/cli/command/CommandRunnerTests.java | 3 +++ .../grape/AetherGrapeEngineTests.java | 1 + ...rySystemSessionAutoConfigurationTests.java | 1 + .../boot/cli/testutil/SystemProperties.java | 2 +- .../boot/devtools/filewatch/ChangedFiles.java | 1 + .../devtools/livereload/LiveReloadServer.java | 1 + .../restart/RestartScopeInitializer.java | 1 + .../ClassLoaderFileURLStreamHandler.java | 1 + .../devtools/tunnel/client/TunnelClient.java | 3 +++ .../DevToolPropertiesIntegrationTests.java | 2 ++ ...ToolsHomePropertiesPostProcessorTests.java | 1 + ...RestTemplateProxyCustomizationExample.java | 1 + .../gradle/MixedVersionRepackagingTests.java | 1 + .../boot/gradle/SpringLoadedTests.java | 1 + .../StarterDependenciesIntegrationTests.java | 1 + .../secure/SampleSecureApplicationTests.java | 3 +-- .../RestDocsTestExecutionListener.java | 1 + .../SpringBootMockMvcBuilderCustomizer.java | 1 + ...cyInjectionTestExecutionListenerTests.java | 1 + ...yMappingContextCustomizerFactoryTests.java | 4 ++++ .../web/servlet/ExampleControllerAdvice.java | 3 ++- ...stomDispatcherServletIntegrationTests.java | 3 +-- .../boot/test/OutputCapture.java | 1 + .../context/ImportsContextCustomizer.java | 1 + .../SpringBootConfigurationFinder.java | 1 + .../boot/test/context/SpringBootTest.java | 4 ++-- .../test/json/AbstractJsonMarshalTester.java | 1 + .../boot/test/json/GsonTester.java | 1 + .../web/SpringBootMockServletContext.java | 1 + ...ileApplicationContextInitializerTests.java | 1 + .../SpringApplicationMockServletTests.java | 1 - ...ileApplicationContextInitializerTests.java | 1 + ...hAsyncInterfaceMethodIntegrationTests.java | 1 + .../web/client/TestRestTemplateTests.java | 1 + .../boot/configurationmetadata/ValueHint.java | 1 + .../configurationprocessor/TestProject.java | 2 ++ .../incremental/BarProperties.java | 1 + .../incremental/RenamedBarProperties.java | 1 + .../lombok/LombokInnerClassProperties.java | 2 ++ .../method/MethodAndClassConfig.java | 1 + .../method/SimpleMethodConfig.java | 1 + .../specific/BuilderPojo.java | 1 + .../specific/GenericConfig.java | 2 ++ .../specific/InnerClassProperties.java | 3 +++ .../specific/InnerClassRootConfig.java | 1 + .../InvalidDoubleRegistrationProperties.java | 1 + .../gradle/repackage/ProjectLibraries.java | 1 + .../boot/gradle/run/RunPluginFeatures.java | 1 + .../loader/tools/BuildPropertiesWriter.java | 2 +- .../boot/loader/tools/FileUtils.java | 1 + .../boot/loader/tools/JarWriter.java | 2 ++ .../boot/loader/tools/LogbackInitializer.java | 3 +++ .../boot/loader/tools/MainClassFinder.java | 1 + .../boot/loader/tools/RepackagerTests.java | 1 + .../boot/loader/PropertiesLauncher.java | 1 + .../boot/loader/jar/JarFile.java | 2 ++ .../boot/loader/util/SystemPropertyUtils.java | 1 - .../boot/loader/InternalOutputCapture.java | 1 + .../boot/loader/PropertiesLauncherTests.java | 1 + .../boot/loader/WarLauncherTests.java | 1 + .../maven/AbstractDependencyFilterMojo.java | 1 + .../boot/maven/AbstractRunMojo.java | 1 + .../boot/maven/RepackageMojo.java | 1 + .../boot/maven/DependencyFilterMojoTests.java | 1 + .../springframework/boot/maven/Verify.java | 4 ++++ .../boot/SpringBootConfiguration.java | 6 ++--- .../boot/bind/PropertySourceUtils.java | 1 - .../boot/bind/RelaxedNames.java | 1 + .../bind/YamlJavaBeanPropertyConstructor.java | 1 + .../boot/context/embedded/Compression.java | 1 + .../JettyEmbeddedServletContainerFactory.java | 1 + ...ervletContextInitializerConfiguration.java | 1 + .../embedded/tomcat/TomcatResources.java | 1 + .../UndertowEmbeddedServletContainer.java | 1 + .../PoolingConnectionFactoryBean.java | 1 + .../springframework/boot/logging/LogFile.java | 1 + .../boot/logging/log4j2/ColorConverter.java | 1 - .../logback/LevelRemappingAppender.java | 1 + .../logging/logback/SpringPropertyAction.java | 1 + .../boot/web/client/RestTemplateBuilder.java | 2 -- .../yaml/SpringProfileDocumentMatcher.java | 2 ++ .../boot/ApplicationPidTests.java | 1 + .../boot/OverrideSourcesTests.java | 3 +++ .../org/springframework/boot/ReproTests.java | 1 + .../boot/SpringApplicationTests.java | 7 ++++++ .../boot/bind/BindingPreparationTests.java | 13 ++++++++++ ...ropertiesConfigurationFactoryMapTests.java | 2 ++ .../PropertiesConfigurationFactoryTests.java | 1 + .../bind/PropertySourcesBindingTests.java | 3 +++ .../boot/bind/RelaxedDataBinderTests.java | 3 +++ .../bind/YamlConfigurationFactoryTests.java | 5 ++++ .../SpringApplicationBuilderTests.java | 2 ++ ...ndryVcapEnvironmentPostProcessorTests.java | 1 + .../FileEncodingApplicationListenerTests.java | 2 ++ .../AnsiOutputApplicationListenerTests.java | 1 + .../DelegatingApplicationListenerTests.java | 3 +++ .../dflt/InDefaultPackageConfiguration.java | 1 + ...geWithBasePackageClassesConfiguration.java | 1 + ...tPackageWithBasePackagesConfiguration.java | 1 + ...ackageWithMetaAnnotationConfiguration.java | 1 + ...nDefaultPackageWithValueConfiguration.java | 1 + ...efaultPackageWithoutScanConfiguration.java | 1 + .../InOrgSpringPackageConfiguration.java | 1 + .../real/InRealPackageConfiguration.java | 1 + ...figEmbeddedWebApplicationContextTests.java | 1 + ...edServletContainerMvcIntegrationTests.java | 8 +++++++ .../boot/context/embedded/ExampleFilter.java | 1 + .../MockEmbeddedServletContainerFactory.java | 5 ++++ ...XmlEmbeddedWebApplicationContextTests.java | 1 + ...onPropertiesBindingPostProcessorTests.java | 3 +++ .../EnableConfigurationPropertiesTests.java | 2 ++ .../diagnostics/FailureAnalyzersTests.java | 1 + ...NotOfRequiredTypeFailureAnalyzerTests.java | 1 + .../boot/jdbc/DatabaseDriverTests.java | 13 +++++----- .../logging/logback/ColorConverterTests.java | 3 +++ .../logback/LevelRemappingAppenderTests.java | 1 + .../boot/orm/jpa/EntityScanTests.java | 3 +++ .../testutil/FilteredClassPathRunner.java | 1 + .../boot/testutil/MockFilter.java | 1 + .../SpringBootServletInitializerTests.java | 2 ++ 346 files changed, 578 insertions(+), 53 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java index 99ee83f9eeb..25252238168 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java @@ -95,6 +95,7 @@ public class CacheStatisticsAutoConfiguration { public HazelcastCacheStatisticsProvider hazelcastCacheStatisticsProvider() { return new HazelcastCacheStatisticsProvider(); } + } @Configuration diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java index 319a11e27ab..d950f1ac89d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java @@ -429,6 +429,7 @@ public class CrshAutoConfiguration { } return true; } + } /** @@ -540,6 +541,7 @@ public class CrshAutoConfiguration { } return false; } + } /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java index 4c8a51dd417..1d7ad9f7f53 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java @@ -83,4 +83,5 @@ public class EndpointMBeanExportProperties { public void setStaticNames(String[] staticNames) { this.staticNames = StringUtils.splitArrayElementsIntoProperties(staticNames, "="); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 9ac5aba91e5..e66bc9fb0dd 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -266,6 +266,7 @@ public class EndpointWebMvcAutoConfiguration @Conditional(OnManagementMvcCondition.class) @Import(ManagementContextConfigurationsImportSelector.class) protected static class EndpointWebMvcConfiguration { + } /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java index e22f418c5c4..1fa31176c5b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java @@ -43,4 +43,5 @@ public class JolokiaProperties { public void setConfig(Map config) { this.config = config; } + } 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 85b5de2dd58..573d4531831 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 @@ -211,6 +211,7 @@ public class ManagementWebSecurityAutoConfiguration { @Conditional(WebSecurityEnablerCondition.class) @EnableWebSecurity protected static class WebSecurityEnabler extends AuthenticationManagerConfiguration { + } /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index 260aca79793..3cb66f440c0 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -73,7 +73,6 @@ import org.springframework.messaging.MessageChannel; * @see MetricWriter * @see InMemoryMetricRepository * @see Exporter - * * @author Dave Syer */ @Configuration @@ -140,6 +139,7 @@ public class MetricRepositoryAutoConfiguration { public BufferGaugeService gaugeService(GaugeBuffers writer) { return new BufferGaugeService(writer); } + } @Configuration diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java index 1d99ac715bb..81c5d048c85 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java @@ -145,7 +145,8 @@ final class MetricsFilter extends OncePerRequestFilter { suffix); } - private String determineMetricNameSuffix(HttpServletRequest request, String path, int status) { + private String determineMetricNameSuffix(HttpServletRequest request, String path, + int status) { Object bestMatchingPattern = request .getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE); if (bestMatchingPattern != null) { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java index 9852788b1ea..d18bf1917f1 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java @@ -327,6 +327,7 @@ public class ShellProperties { public void setAuthTimeout(Integer authTimeout) { this.authTimeout = authTimeout; } + } /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java index ad4239a10b4..9236842d6fc 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java @@ -146,4 +146,5 @@ public class AutoConfigurationReportEndpoint extends AbstractEndpoint { } } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java index af5fd95d916..68aa2367f20 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java @@ -59,4 +59,5 @@ public class BeansEndpoint extends AbstractEndpoint> public List invoke() { return this.parser.parseList(this.liveBeansView.getSnapshotAsJson()); } + } 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 d868f787767..958bfcce5f5 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 @@ -332,6 +332,7 @@ public class ConfigurationPropertiesReportEndpoint } return setter; } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java index 5fc355b5818..abe0b7a5256 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java @@ -93,4 +93,5 @@ public class HealthEndpoint extends AbstractEndpoint { } return name; } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java index 86d2c830e2d..eb30b9e64ed 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java @@ -47,4 +47,5 @@ public class TraceEndpoint extends AbstractEndpoint> { public List invoke() { return this.repository.findAll(); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java index 1af2ec2477f..d61642f5148 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java @@ -47,4 +47,5 @@ public class ShutdownEndpointMBean extends EndpointMBean { public Object shutdown() { return convert(getEndpoint().invoke()); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java index ec0b46185da..e64b3104342 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java @@ -58,4 +58,5 @@ public class HalJsonMvcEndpoint extends AbstractMvcEndpoint { protected final ManagementServletContext getManagementServletContext() { return this.managementServletContext; } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java index 1f63a06985b..d65e700f03e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java @@ -116,6 +116,7 @@ public class JolokiaMvcEndpoint extends AbstractMvcEndpoint implements Initializ } return value; } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java index 0ecfab43928..b334d25a565 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java @@ -49,4 +49,5 @@ public class ShutdownMvcEndpoint extends EndpointMvcAdapter { } return super.invoke(); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java index 2c4eacbfbeb..1f9483b92ae 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java @@ -50,4 +50,5 @@ public abstract class AbstractHealthIndicator implements HealthIndicator { * system status. */ protected abstract void doHealthCheck(Health.Builder builder) throws Exception; + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java index e3e4d18807a..69a6822b57a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java @@ -61,4 +61,5 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator { .withDetail("free", diskFreeInBytes) .withDetail("threshold", this.properties.getThreshold()); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java index 175681037df..310e5001346 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java @@ -299,6 +299,7 @@ public final class Health { public Health build() { return new Health(this); } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java index 24e4c1922e8..cbdfda19f07 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java @@ -42,4 +42,5 @@ public interface HealthAggregator { * @return the aggregated health */ Health aggregate(Map healths); + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java index 7e4f6c92cc3..93a6a16ee90 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java @@ -167,6 +167,7 @@ public class DropwizardMetricServices implements CounterService, GaugeService { public void setValue(double value) { this.value = value; } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java index 4f04dd98026..8c1dae70cf7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java @@ -240,4 +240,5 @@ public class MetricCopyExporter extends AbstractMetricExporter { } }; + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java index a8debd2edc2..ffad29c0d08 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java @@ -90,7 +90,6 @@ public class OpenTsdbGaugeWriter implements GaugeWriter { /** * Creates a new {@code OpenTsdbGaugeWriter} with the given millisecond * {@code connectTimeout} and {@code readTimeout}. - * * @param connectTimeout the connect timeout in milliseconds * @param readTimeout the read timeout in milliseconds */ diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java index 096f22edb46..5ce8d29d78b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java @@ -58,7 +58,6 @@ public class RedisMetricRepository implements MetricRepository { * Create a RedisMetricRepository with a default prefix to apply to all metric names. * If multiple repositories share a redis instance they will feed into the same global * metrics. - * * @param redisConnectionFactory the redis connection factory */ public RedisMetricRepository(RedisConnectionFactory redisConnectionFactory) { @@ -70,7 +69,6 @@ public class RedisMetricRepository implements MetricRepository { * unique to this repository or to a logical repository contributed to by multiple * instances, where they all see the same values). Recommended constructor for general * purpose use. - * * @param redisConnectionFactory the redis connection factory * @param prefix the prefix to set for all metrics keys */ @@ -84,7 +82,6 @@ public class RedisMetricRepository implements MetricRepository { * redis store will hold a zset under the key just so the metric names can be * enumerated. Read operations, especially {@link #findAll()} and {@link #count()}, * will only be accurate if the key is unique to the prefix of this repository. - * * @param redisConnectionFactory the redis connection factory * @param prefix the prefix to set for all metrics keys * @param key the key to set diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java index 7a58c5aae22..ac1fb0b55f6 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java @@ -51,4 +51,5 @@ final class RedisUtils { RedisConnectionFactory redisConnectionFactory) { return new StringRedisTemplate(redisConnectionFactory); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java index 67f0c703b1f..bfb62155b7d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java @@ -78,4 +78,5 @@ public class InMemoryRichGaugeRepository implements RichGaugeRepository { public long count() { return this.repository.count(); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java index 0c37cdb5246..cb420b6b8af 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java @@ -99,6 +99,7 @@ public class SimpleInMemoryRepository { /** * Callback used to update a value. + * * @param the value type */ public interface Callback { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java index 41040404cc0..44be6a71d21 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java @@ -101,6 +101,7 @@ public class AuditAutoConfigurationTests { } public static class TestAuditEventRepository extends InMemoryAuditEventRepository { + } @Configuration diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java index 937ab513a1c..fdf70a9f15a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java @@ -528,6 +528,7 @@ public class HealthIndicatorAutoConfigurationTests { public JestClient jestClient() { return mock(JestClient.class); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java index 731e3bd81b5..3b16e8c8d60 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java @@ -274,11 +274,13 @@ public class ManagementWebSecurityAutoConfigurationTests { @EnableGlobalAuthentication @Configuration static class AuthenticationConfig { + @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication().withUser("user").password("password") .roles("USER"); } + } @Configuration diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java index aeaa626c3c4..0fdf50c53f7 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java @@ -279,6 +279,7 @@ public class PublicMetricsAutoConfigurationTests { public DataSource commonsDbcpDataSource() { return InitializedBuilder.create().type(BasicDataSource.class).build(); } + } @Configuration @@ -295,6 +296,7 @@ public class PublicMetricsAutoConfigurationTests { public DataSource commonsDbcpDataSource() { return InitializedBuilder.create().type(BasicDataSource.class).build(); } + } @Configuration @@ -311,6 +313,7 @@ public class PublicMetricsAutoConfigurationTests { public DataSource dataSource() { return InitializedBuilder.create().type(BasicDataSource.class).build(); } + } @Configuration @@ -326,6 +329,7 @@ public class PublicMetricsAutoConfigurationTests { } }; } + } @Configuration @@ -386,4 +390,5 @@ public class PublicMetricsAutoConfigurationTests { } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java index 577265879dc..11d41b4e8e2 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java @@ -266,5 +266,7 @@ public class ShellPropertiesTests { } }; } + } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpointTests.java index 375d184ea6b..71221802e28 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpointTests.java @@ -84,6 +84,7 @@ public class AutoConfigurationReportEndpointTests public AutoConfigurationReportEndpoint endpoint() { return new AutoConfigurationReportEndpoint(); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java index 1e04a313cd0..75157a987a5 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java @@ -87,10 +87,12 @@ public class ConfigurationPropertiesReportEndpointParentTests { @Configuration @EnableConfigurationProperties public static class Parent { + @Bean public TestProperties testProperties() { return new TestProperties(); } + } @Configuration @@ -127,6 +129,7 @@ public class ConfigurationPropertiesReportEndpointParentTests { } public static class OtherProperties { + } @ConfigurationProperties(prefix = "test") @@ -143,4 +146,5 @@ public class ConfigurationPropertiesReportEndpointParentTests { } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java index d3f488b7b5d..2c9535437e3 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java @@ -318,6 +318,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } public static class Bar { + private String name = "123456"; public String getName() { @@ -327,6 +328,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java index a5da90428bf..b8ebfe91d9a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java @@ -186,10 +186,12 @@ public class ConfigurationPropertiesReportEndpointTests @Configuration @EnableConfigurationProperties public static class Parent { + @Bean public TestProperties testProperties() { return new TestProperties(); } + } @Configuration @@ -281,4 +283,5 @@ public class ConfigurationPropertiesReportEndpointTests } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java index e95b5e3561f..40cc2233b32 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java @@ -54,4 +54,5 @@ public class DumpEndpointTests extends AbstractEndpointTests { } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java index f642dcdcfa9..9a4a82a33f5 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java @@ -197,4 +197,5 @@ public class EnvironmentEndpointTests extends AbstractEndpointTests { public HealthAggregator healthAggregator() { return new OrderedHealthAggregator(); } + } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java index dbf0edc3e7b..38819cd6aee 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java @@ -111,4 +111,5 @@ public class MetricsEndpointTests extends AbstractEndpointTests } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java index 569d64f338c..9b7b0dacb10 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java @@ -126,6 +126,7 @@ public class RequestMappingEndpointTests { @Configuration protected static class MappingConfiguration { + @Bean @Lazy @Scope(proxyMode = ScopedProxyMode.TARGET_CLASS) @@ -134,5 +135,7 @@ public class RequestMappingEndpointTests { mapping.setUrlMap(Collections.singletonMap("/foo", new Object())); return mapping; } + } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java index ccb9f79c02c..93d6f24577b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java @@ -102,4 +102,5 @@ public class ShutdownEndpointTests extends AbstractEndpointTests { repository.add(Collections.singletonMap("a", "b")); return new TraceEndpoint(repository); } + } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java index 8e162f97f4d..2b7a6aedcc6 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java @@ -41,6 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class EndpointHandlerMappingTests { private final StaticApplicationContext context = new StaticApplicationContext(); + private Method method; @Before diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java index a0a5e8c22e4..d5164306f0e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java @@ -88,14 +88,17 @@ public class JolokiaMvcEndpointContextPathTests { EndpointWebMvcAutoConfiguration.class, JolokiaAutoConfiguration.class, ManagementServerPropertiesAutoConfiguration.class }) public static class Config { + } public static class ContextPathListener implements ApplicationContextInitializer { + @Override public void initialize(ConfigurableApplicationContext context) { EnvironmentTestUtils.addEnvironment(context, "management.contextPath:/admin"); } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java index 25322c32bb0..e0545ff90a0 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java @@ -89,6 +89,7 @@ public class MvcEndpointsTests { public String invoke() { return "foo"; } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java index dd390199876..2879828095c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java @@ -235,4 +235,5 @@ public class ElasticsearchHealthIndicatorTests { } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java index 6eee34fc3a5..ec745b16461 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java @@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DropwizardMetricServicesTests { private final MetricRegistry registry = new MetricRegistry(); + private final DropwizardMetricServices writer = new DropwizardMetricServices( this.registry); @@ -89,7 +90,6 @@ public class DropwizardMetricServicesTests { * thread is updating the same set of metrics. This would be an example case of the * writer being used with the MetricsFilter handling several requests/sec to the same * URL. - * * @throws Exception if an error occurs */ @Test diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java index 12d4c2279c6..9f4ba580ac5 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java @@ -53,10 +53,12 @@ public class SpringIntegrationMetricReaderTests { @Configuration @Import({ JmxAutoConfiguration.class, IntegrationAutoConfiguration.class }) protected static class TestConfiguration { + @Bean public SpringIntegrationMetricReader reader(IntegrationMBeanExporter exporter) { return new SpringIntegrationMetricReader(exporter); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java index 5e829531fa1..3a7afaee1f9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java @@ -32,9 +32,12 @@ import static org.assertj.core.api.Assertions.assertThat; public class MultiMetricRichGaugeReaderTests { private InMemoryMetricRepository repository = new InMemoryMetricRepository(); + private MultiMetricRichGaugeReader reader = new MultiMetricRichGaugeReader( this.repository); + private InMemoryRichGaugeRepository data = new InMemoryRichGaugeRepository(); + private RichGaugeExporter exporter = new RichGaugeExporter(this.data, this.repository); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java index eebf2ccb6d9..1c9c2580a23 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java @@ -95,4 +95,5 @@ public abstract class AbstractDependsOnBeanFactoryPostProcessor throw ex; } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java index af0a279c2e2..62a307520a7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java @@ -127,6 +127,7 @@ class AutoConfigurationSorter { } return rtn; } + } private static class AutoConfigurationClass { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java index 39005cd230a..0ea5a3e4e3f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java @@ -71,6 +71,7 @@ import org.springframework.retry.support.RetryTemplate; *
  • {@literal spring.rabbitmq.virtualHost} is used to specify the (optional) virtual * host to which the client should connect.
    • * + * * @author Greg Turnquist * @author Josh Long * @author Stephane Nicoll diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java index 45ec3688c37..094b46cbb76 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java @@ -47,12 +47,14 @@ public class AopAutoConfiguration { @EnableAspectJAutoProxy(proxyTargetClass = false) @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false", matchIfMissing = true) public static class JdkDynamicAutoProxyConfiguration { + } @Configuration @EnableAspectJAutoProxy(proxyTargetClass = true) @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "true", matchIfMissing = false) public static class CglibAutoProxyConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java index bf92b24e35d..9582a05f347 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java @@ -111,4 +111,5 @@ public class BatchProperties { } } + } 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 a086b465733..f30dc360674 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 @@ -101,6 +101,7 @@ public class CacheAutoConfiguration { * instantiation. */ static class CacheManagerValidatorPostProcessor implements BeanFactoryPostProcessor { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { @@ -120,6 +121,7 @@ public class CacheAutoConfiguration { result[result.length - 1] = value; return result; } + } /** @@ -141,6 +143,7 @@ public class CacheAutoConfiguration { + "be auto-configured, check your configuration (caching " + "type is '" + this.cacheProperties.getType() + "')"); } + } /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java index bc528d1aa3f..667f6e29b3f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java @@ -67,6 +67,7 @@ abstract class HazelcastInstanceConfiguration { existingHazelcastInstance); return this.customizers.customize(cacheManager); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java index 8d6538d3201..907e65310d5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java @@ -159,10 +159,12 @@ class JCacheCacheConfiguration { @Conditional(JCacheProviderAvailableCondition.class) static class JCacheProvider { + } @ConditionalOnSingleCandidate(CacheManager.class) static class CustomJCacheCacheManager { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java index 17cecda76a4..05ab9e995a4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java @@ -264,6 +264,7 @@ public final class ConditionEvaluationReport { public String toString() { return this.condition.getClass() + " " + this.outcome; } + } private static class AncestorsMatchedCondition implements Condition { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java index 65a410892c6..0b45d2f6299 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java @@ -228,8 +228,8 @@ public final class ConditionMessage { /** * Indicate that one or more results were found. For example - * {@code found("bean", "beans").items("x", "y")} results in the message - * "found beans x, y". + * {@code found("bean", "beans").items("x", "y")} results in the message "found + * beans x, y". * @param singular the article found in singular form * @param plural the article found in plural form * @return an {@link ItemsBuilder} @@ -240,8 +240,8 @@ public final class ConditionMessage { /** * Indicate that one or more results were not found. For example - * {@code didNotFind("bean").items("x")} results in the message - * "did not find bean x". + * {@code didNotFind("bean").items("x")} results in the message "did not find bean + * x". * @param article the article found * @return an {@link ItemsBuilder} */ @@ -251,8 +251,8 @@ public final class ConditionMessage { /** * Indicate that one or more results were found. For example - * {@code didNotFind("bean", "beans").items("x", "y")} results in the message - * "did not find beans x, y". + * {@code didNotFind("bean", "beans").items("x", "y")} results in the message "did + * not find beans x, y". * @param singular the article found in singular form * @param plural the article found in plural form * @return an {@link ItemsBuilder} @@ -330,8 +330,8 @@ public final class ConditionMessage { /** * Used when no items are available. For example - * {@code didNotFind("any beans").atAll()} results in the message - * "did not find any beans". + * {@code didNotFind("any beans").atAll()} results in the message "did not find + * any beans". * @return a built {@link ConditionMessage} */ public ConditionMessage atAll() { @@ -340,8 +340,8 @@ public final class ConditionMessage { /** * Indicate the items. For example - * {@code didNotFind("bean", "beans").items("x", "y")} results in the message - * "did not find beans x, y". + * {@code didNotFind("bean", "beans").items("x", "y")} results in the message "did + * not find beans x, y". * @param items the items (may be {@code null}) * @return a built {@link ConditionMessage} */ @@ -351,8 +351,8 @@ public final class ConditionMessage { /** * Indicate the items. For example - * {@code didNotFind("bean", "beans").items("x", "y")} results in the message - * "did not find beans x, y". + * {@code didNotFind("bean", "beans").items("x", "y")} results in the message "did + * not find beans x, y". * @param style the render style * @param items the items (may be {@code null}) * @return a built {@link ConditionMessage} diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java index 08ac22aba79..4bfa2abf059 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java @@ -35,4 +35,5 @@ import org.springframework.context.annotation.Conditional; @Documented @Conditional(OnWebApplicationCondition.class) public @interface ConditionalOnWebApplication { + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index 5ec455115bc..99c828412a6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -439,6 +439,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit Assert.isTrue(getTypes().size() == 1, annotationName() + " annotations must " + "specify only one type (got " + getTypes() + ")"); } + } static final class BeanTypeDeductionException extends RuntimeException { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java index 2437740a2ca..aee7c60c34f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java @@ -134,10 +134,12 @@ public class CouchbaseAutoConfiguration { @Conditional(OnBootstrapHostsCondition.class) static class BootstrapHostsProperty { + } @ConditionalOnBean(type = "org.springframework.data.couchbase.config.CouchbaseConfigurer") static class CouchbaseConfigurerAvailable { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java index 406a0211667..82b922ef9e9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java @@ -51,6 +51,7 @@ class CassandraRepositoriesAutoConfigureRegistrar @EnableCassandraRepositories private static class EnableCassandraRepositoriesConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java index c95daf527a9..d9883ef0ef1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java @@ -51,5 +51,7 @@ class JpaRepositoriesAutoConfigureRegistrar @EnableJpaRepositories private static class EnableJpaRepositoriesConfiguration { + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigureRegistrar.java index 16d44ccba2b..52ec64be5e1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigureRegistrar.java @@ -50,6 +50,7 @@ class MongoRepositoriesAutoConfigureRegistrar @EnableMongoRepositories private static class EnableMongoRepositoriesConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java index 2239cc4bc7f..8c6d3ddfdfe 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java @@ -256,4 +256,5 @@ public class RedisProperties { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java index 537ce836a80..f63a4f6b714 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java @@ -133,4 +133,5 @@ public class FlywayProperties { public boolean isCreateDataSource() { return this.url != null && this.user != null; } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java index 6022fd34418..5dd6281f52f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java @@ -164,4 +164,5 @@ public class FreeMarkerAutoConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java index b4cf1b6cc05..a4827c0be82 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java @@ -95,4 +95,5 @@ public class H2ConsoleProperties { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java index 02a2489513f..06e8b9b2f9f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java @@ -126,4 +126,5 @@ public class HypermediaAutoConfiguration { } } + } 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 7bee106b3b1..619f8c91a7c 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 @@ -57,6 +57,7 @@ public class IntegrationAutoConfiguration { @Configuration @EnableIntegration protected static class IntegrationConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java index f3d1217b59e..18c11fae02e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -95,6 +95,7 @@ public class DataSourceAutoConfiguration { @ConditionalOnMissingBean({ DataSource.class, XADataSource.class }) @Import(EmbeddedDataSourceConfiguration.class) protected static class EmbeddedDatabaseConfiguration { + } @Configuration @@ -141,10 +142,12 @@ public class DataSourceAutoConfiguration { @ConditionalOnProperty(prefix = "spring.datasource", name = "type") static class ExplicitType { + } @Conditional(PooledDataSourceAvailableCondition.class) static class PooledDataSourceAvailable { + } } @@ -178,6 +181,7 @@ public class DataSourceAutoConfiguration { .findType(); return (dataSourceClass == null ? null : dataSourceClass.getClassLoader()); } + } /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java index 9f5c0d30872..a83d32ed2ac 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java @@ -73,6 +73,7 @@ abstract class DataSourceConfiguration { public HikariDataSource dataSource(DataSourceProperties properties) { return createDataSource(properties, HikariDataSource.class); } + } @ConditionalOnClass(org.apache.commons.dbcp.BasicDataSource.class) @@ -94,6 +95,7 @@ abstract class DataSourceConfiguration { } return dataSource; } + } @ConditionalOnClass(org.apache.commons.dbcp2.BasicDataSource.class) @@ -107,6 +109,7 @@ abstract class DataSourceConfiguration { return createDataSource(properties, org.apache.commons.dbcp2.BasicDataSource.class); } + } @ConditionalOnMissingBean(DataSource.class) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java index 8391a080101..988cce147a1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java @@ -117,7 +117,6 @@ public enum EmbeddedDatabaseConnection { /** * Convenience method to determine if a given driver class name represents an embedded * database type. - * * @param driverClass the driver class * @return true if the driver class is one of the embedded types */ @@ -130,7 +129,6 @@ public enum EmbeddedDatabaseConnection { /** * Convenience method to determine if a given data source represents an embedded * database type. - * * @param dataSource the data source to interrogate * @return true if the data source is one of the embedded types */ @@ -186,4 +184,5 @@ public enum EmbeddedDatabaseConnection { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index 348e09e822a..357aafa42a2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -228,6 +228,7 @@ public class JerseyAutoConfiguration implements ServletContextAware { // will try and register a ContextLoaderListener which we don't need servletContext.setInitParameter("contextConfigLocation", ""); } + } @ConditionalOnClass(JacksonFeature.class) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java index f66daadedae..77e56b032e0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java @@ -85,7 +85,9 @@ public class JerseyProperties { } public enum Type { + SERVLET, FILTER + } public static class Filter { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java index 3a3a3a89573..5a83a027923 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java @@ -85,6 +85,7 @@ class JmsAnnotationDrivenConfiguration { @EnableJms @ConditionalOnMissingBean(name = JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) protected static class EnableJmsConfiguration { + } @ConditionalOnJndi diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java index 814bab43384..546c6274e36 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java @@ -81,6 +81,7 @@ public class JmsAutoConfiguration { return jmsTemplate; } + } @ConditionalOnClass(JmsMessagingTemplate.class) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index ac28329c7bf..ca6d78f3cd9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -124,6 +124,7 @@ public class JmsProperties { ? this.concurrency + "-" + this.maxConcurrency : String.valueOf(this.concurrency)); } + } /** @@ -164,6 +165,7 @@ public class JmsProperties { public int getMode() { return this.mode; } + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java index 9e5b32fb10d..6d96d8ed16f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java @@ -95,10 +95,12 @@ public class JndiConnectionFactoryAutoConfiguration { @ConditionalOnJndi({ "java:/JmsXA", "java:/XAConnectionFactory" }) static class Jndi { + } @ConditionalOnProperty(prefix = "spring.jms", name = "jndi-name") static class Property { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java index 8208bf97efc..be383fcb254 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java @@ -87,4 +87,5 @@ class HornetQEmbeddedConfigurationFactory { String tempDirectory = System.getProperty("java.io.tmpdir"); return new File(tempDirectory, "hornetq-data").getAbsolutePath(); } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQProperties.java index 69800d8cf70..6212a2f3a2f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQProperties.java @@ -215,7 +215,6 @@ public class HornetQProperties { /** * Creates the minimal transport parameters for an embedded transport * configuration. - * * @return the transport parameters * @see TransportConstants#SERVER_ID_PROP_NAME */ diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQXAConnectionFactoryConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQXAConnectionFactoryConfiguration.java index bd5b92b1b94..a2dbcaf8c4a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQXAConnectionFactoryConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQXAConnectionFactoryConfiguration.java @@ -61,4 +61,5 @@ class HornetQXAConnectionFactoryConfiguration { return new HornetQConnectionFactoryFactory(beanFactory, properties) .createConnectionFactory(SpringBootHornetQConnectionFactory.class); } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java index d1f9de39138..aedeee00bc0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java @@ -66,8 +66,8 @@ class JooqExceptionTranslator extends DefaultExecuteListener { /** * Handle a single exception in the chain. SQLExceptions might be nested multiple - * levels deep. The outermost exception is usually the least interesting one ( - * "Call getNextException to see the cause."). Therefore the innermost exception is + * levels deep. The outermost exception is usually the least interesting one ("Call + * getNextException to see the cause."). Therefore the innermost exception is * propagated and all other exceptions are logged. * @param context the execute context * @param translator the exception translator diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index 7c3f3e007aa..62ad24bd91a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -122,6 +122,7 @@ public class LiquibaseAutoConfiguration { .username(this.properties.getUser()) .password(this.properties.getPassword()).build(); } + } /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java index f595cb6c017..a14095ba853 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java @@ -110,10 +110,12 @@ public class MailSenderAutoConfiguration { @ConditionalOnProperty(prefix = "spring.mail", name = "host") static class HostProperty { + } @ConditionalOnProperty(prefix = "spring.mail", name = "jndi-name") static class JndiNameProperty { + } } 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 caeb476a27f..e4a778d0dbc 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 @@ -188,7 +188,6 @@ public class MongoProperties { * {@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. - * * @param options the options * @param environment the environment * @return the Mongo client diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java index 6668bf5d772..dab227d2da3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java @@ -121,4 +121,5 @@ public class MustacheAutoConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java index f8768a92627..0a714869c10 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java @@ -106,6 +106,7 @@ class DataSourceInitializedPublisher implements BeanPostProcessor { registry.registerBeanDefinition(BEAN_NAME, beanDefinition); } } + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java index be747339aa2..e9d16accde3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java @@ -43,4 +43,5 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur @AutoConfigureAfter(SecurityAutoConfiguration.class) @EnableWebSecurity public class FallbackWebSecurityAutoConfiguration { + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java index 6126f619662..6a2771b91b2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java @@ -171,7 +171,9 @@ public class SecurityProperties implements SecurityPrerequisite { public static class Headers { public enum HSTS { + NONE, DOMAIN, ALL + } /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java index 22747e1ad7e..7fe836c57ab 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java @@ -175,6 +175,7 @@ public class SpringBootWebSecurityConfiguration { @Order(SecurityProperties.BASIC_AUTH_ORDER) protected static class ApplicationNoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { + @Override protected void configure(HttpSecurity http) throws Exception { http.requestMatcher(new RequestMatcher() { @@ -184,6 +185,7 @@ public class SpringBootWebSecurityConfiguration { } }); } + } @Configuration 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 03899630fa1..50ea0bc30ae 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 @@ -173,4 +173,5 @@ public class OAuth2RestOperationsConfiguration { } } + } 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 03b2456f286..056f73a3f3f 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 @@ -251,6 +251,7 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware { } return null; } + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateCustomizer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateCustomizer.java index ad9074743bc..0dc06f404f7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateCustomizer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateCustomizer.java @@ -33,7 +33,6 @@ public interface UserInfoRestTemplateCustomizer { /** * Customize the rest template before it is initialized. - * * @param template the rest template */ void customize(OAuth2RestTemplate template); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java index 9b8ab21e9c9..cc178685de3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java @@ -77,11 +77,14 @@ public class SendGridAutoConfiguration { @ConditionalOnProperty(prefix = "spring.sendgrid", value = "username") static class SendGridUserProperty { + } @ConditionalOnProperty(prefix = "spring.sendgrid", value = "api-key") static class SendGridApiKeyProperty { + } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java index 09331e224a0..dff1f884223 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java @@ -53,4 +53,5 @@ class HazelcastSessionConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java index ef447937a29..48866c2a84e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java @@ -84,6 +84,7 @@ public class LinkedInAutoConfiguration { return new LinkedInConnectionFactory(this.properties.getAppId(), this.properties.getAppSecret()); } + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java index 44c00d7c535..0a76f81f1a8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java @@ -146,6 +146,7 @@ public class SocialWebAutoConfiguration { } }; } + } @Configuration @@ -186,4 +187,5 @@ public class SocialWebAutoConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 064840d6e3b..1b4f1d7a670 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -84,6 +84,7 @@ public class ThymeleafAutoConfiguration { public SpringResourceResourceResolver thymeleafResourceResolver() { return new SpringResourceResourceResolver(); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index 7d4580fc376..c10098ce14a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -116,5 +116,7 @@ class BitronixJtaConfiguration { public BitronixXAConnectionFactoryWrapper xaConnectionFactoryWrapper() { return new BitronixXAConnectionFactoryWrapper(); } + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java index 0bf9a78f987..c481ff290b0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java @@ -167,4 +167,5 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java index 22563b78f05..ba2d7970889 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java @@ -113,7 +113,9 @@ public class HttpEncodingProperties { } enum Type { + REQUEST, RESPONSE + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 4579f32d04d..22c7f5169ac 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -1461,4 +1461,5 @@ public class ServerProperties } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java index c19631475f9..b25d4523f6b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java @@ -58,6 +58,7 @@ public class AutoConfigurationReproTests { @Configuration public static class Config { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java index 670ea46d217..5e76e1ed724 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java @@ -37,17 +37,29 @@ import static org.assertj.core.api.Assertions.assertThat; public class AutoConfigurationSorterTests { private static final String LOWEST = OrderLowest.class.getName(); + private static final String HIGHEST = OrderHighest.class.getName(); + private static final String A = AutoConfigureA.class.getName(); + private static final String B = AutoConfigureB.class.getName(); + private static final String C = AutoConfigureC.class.getName(); + private static final String D = AutoConfigureD.class.getName(); + private static final String E = AutoConfigureE.class.getName(); + private static final String W = AutoConfigureW.class.getName(); + private static final String X = AutoConfigureX.class.getName(); + private static final String Y = AutoConfigureY.class.getName(); + private static final String Z = AutoConfigureZ.class.getName(); + private static final String A2 = AutoConfigureA2.class.getName(); + private static final String W2 = AutoConfigureW2.class.getName(); @Rule diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java index af4c26e174a..8cd11c1a366 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java @@ -79,21 +79,25 @@ public class ImportAutoConfigurationTests { @Configuration static class ConfigA { + } @Configuration @AutoConfigureAfter(ConfigA.class) static class ConfigB { + } @Configuration @AutoConfigureAfter(ConfigB.class) static class ConfigC { + } @Configuration @AutoConfigureAfter(ConfigC.class) static class ConfigD { + } } 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 07a9380190c..40c514aac99 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 @@ -55,4 +55,5 @@ public class MessageSourceAutoConfigurationIntegrationTests { protected static class Config { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java index 68d2cf80040..da2dda0ae0d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java @@ -204,4 +204,5 @@ public class MessageSourceAutoConfigurationTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index 26ecd062c98..2fa7b39a2cc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -418,10 +418,12 @@ public class RabbitAutoConfigurationTests { @Configuration protected static class TestConfiguration2 { + @Bean ConnectionFactory aDifferentConnectionFactory() { return new CachingConnectionFactory("otherserver", 8001); } + } @Configuration @@ -451,6 +453,7 @@ public class RabbitAutoConfigurationTests { messagingTemplate.setDefaultDestination("fooBar"); return messagingTemplate; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java index 2e1740b28b7..ac756aabdbc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java @@ -83,6 +83,7 @@ public class AopAutoConfigurationTests { @Configuration protected static class TestConfiguration { + @Bean public TestAspect aspect() { return new TestAspect(); @@ -92,16 +93,20 @@ public class AopAutoConfigurationTests { public TestInterface bean() { return new TestBean(); } + } protected static class TestBean implements TestInterface { + @Override public void foo() { } + } @Aspect protected static class TestAspect { + private boolean called; public boolean isCalled() { @@ -112,6 +117,7 @@ public class AopAutoConfigurationTests { public void before() { this.called = true; } + } public interface TestInterface { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java index 3647b6a1f9d..c668df50198 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -269,11 +269,13 @@ public class BatchAutoConfigurationTests { @Configuration protected static class EmptyConfiguration { + } @EnableBatchProcessing @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { + } @EnableBatchProcessing @@ -281,6 +283,7 @@ public class BatchAutoConfigurationTests { protected static class TestCustomConfiguration implements BatchConfigurer { private JobRepository jobRepository; + private MapJobRepositoryFactoryBean factory = new MapJobRepositoryFactoryBean(); @Override @@ -311,10 +314,12 @@ public class BatchAutoConfigurationTests { explorer.afterPropertiesSet(); return explorer.getObject(); } + } @EnableBatchProcessing protected static class NamedJobConfigurationWithRegisteredJob { + @Autowired private JobRegistry jobRegistry; @@ -351,6 +356,7 @@ public class BatchAutoConfigurationTests { job.setJobRepository(this.jobRepository); return job; } + } @EnableBatchProcessing @@ -382,10 +388,12 @@ public class BatchAutoConfigurationTests { job.setJobRepository(this.jobRepository); return job; } + } @EnableBatchProcessing protected static class JobConfiguration { + @Autowired private JobRepository jobRepository; @@ -412,6 +420,7 @@ public class BatchAutoConfigurationTests { job.setJobRepository(this.jobRepository); return job; } + } } 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 959b2a17b32..d2c5f12de95 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 @@ -804,6 +804,7 @@ public class CacheAutoConfigurationTests { @Import({ GenericCacheConfiguration.class, CacheManagerCustomizersConfiguration.class }) static class GenericCacheAndCustomizersConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java index db65307cd7a..eef34e9a64e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java @@ -35,7 +35,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; /** - * * @author Stephane Nicoll */ public class CacheManagerCustomizersTests { @@ -92,4 +91,5 @@ public class CacheManagerCustomizersTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java index 5639723bd23..e0378993bb7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java @@ -278,6 +278,7 @@ public class ConditionEvaluationReportTests { } } + } static class TestMatchCondition extends SpringBootCondition diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java index 8ac249f7406..7a5aa7f43c8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java @@ -160,19 +160,23 @@ public class ConditionalOnBeanTests { @Configuration @ConditionalOnBean(String.class) protected static class OnBeanClassConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnBean(type = "java.lang.String") protected static class OnBeanClassNameConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java index 16227d18b2f..e4b68522875 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java @@ -111,4 +111,5 @@ public class ConditionalOnClassTests { protected static class CombinedXmlConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java index 1acc974f35a..b85966e7d10 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java @@ -51,18 +51,23 @@ public class ConditionalOnExpressionTests { @Configuration @ConditionalOnExpression("false") protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnExpression("true") protected static class BasicConfiguration { + @Bean public String foo() { return "foo"; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java index 6458a32a7f9..a8cff97d2ed 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java @@ -174,28 +174,34 @@ public class ConditionalOnJavaTests { @Configuration @ConditionalOnJava(JavaVersion.NINE) static class Java9Required { + @Bean String foo() { return "foo"; } + } @Configuration @ConditionalOnJava(range = Range.OLDER_THAN, value = JavaVersion.SIX) static class Java5Required { + @Bean String foo() { return "foo"; } + } @Configuration @ConditionalOnJava(JavaVersion.SIX) static class Java6Required { + @Bean String foo() { return "foo"; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java index b148a14091b..73b026face8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java @@ -157,6 +157,7 @@ public class ConditionalOnJndiTests { public String foo() { return "foo"; } + } @Configuration @@ -167,6 +168,7 @@ public class ConditionalOnJndiTests { public String foo() { return "foo"; } + } private static class MockableOnJndi extends OnJndiCondition { @@ -193,6 +195,7 @@ public class ConditionalOnJndiTests { public void setFoundLocation(String foundLocation) { this.foundLocation = foundLocation; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index ef48fa8e6b3..0e289c00cae 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -423,6 +423,7 @@ public class ConditionalOnMissingBeanTests { @Configuration @Import(FactoryBeanRegistrar.class) protected static class RegisteredFactoryBeanConfiguration { + } protected static class FactoryBeanRegistrar implements ImportBeanDefinitionRegistrar { @@ -621,4 +622,5 @@ public class ConditionalOnMissingBeanTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java index c88c2c100f8..1ca9e64b6e4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java @@ -52,27 +52,33 @@ public class ConditionalOnMissingClassTests { @Configuration @ConditionalOnMissingClass("org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClassTests") protected static class BasicConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnMissingClass("FOO") protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration protected static class FooConfiguration { + @Bean public String foo() { return "foo"; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java index 3e65cf9b720..862a90e8614 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java @@ -51,18 +51,23 @@ public class ConditionalOnNotWebApplicationTests { @Configuration @ConditionalOnWebApplication protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnNotWebApplication protected static class BasicConfiguration { + @Bean public String foo() { return "foo"; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java index 738d35b6493..13ae5bb448e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java @@ -461,4 +461,5 @@ public class ConditionalOnPropertyTests { public @interface ConditionalOnMyFeature { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java index fcc544bd5af..9f1d1335666 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java @@ -61,27 +61,34 @@ public class ConditionalOnResourceTests { @Configuration @ConditionalOnResource(resources = "foo") protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnResource(resources = "schema.sql") protected static class BasicConfiguration { + @Bean public String foo() { return "foo"; } + } @Configuration @ConditionalOnResource(resources = "${schema}") protected static class PlaceholderConfiguration { + @Bean public String foo() { return "foo"; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java index 1877b70fbba..681f779d5be 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java @@ -240,4 +240,5 @@ public class ConditionalOnSingleCandidateTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java index ce27493d329..4da7bd11560 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java @@ -54,18 +54,23 @@ public class ConditionalOnWebApplicationTests { @Configuration @ConditionalOnNotWebApplication protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnWebApplication protected static class BasicConfiguration { + @Bean public String foo() { return "foo"; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java index 69b3766fe9a..7cfd5440df4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java @@ -79,6 +79,7 @@ public class ResourceConditionTests { public String foo() { return "foo"; } + } @Configuration @@ -89,6 +90,7 @@ public class ResourceConditionTests { public String foo() { return "foo"; } + } private static class DefaultLocationResourceCondition extends ResourceCondition { @@ -96,6 +98,7 @@ public class ResourceConditionTests { DefaultLocationResourceCondition() { super("test", "spring.foo.test.", "config", "classpath:/logging.properties"); } + } private static class UnknownDefaultLocationResourceCondition @@ -107,4 +110,5 @@ public class ResourceConditionTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java index ea0745eaf7e..a8eec3cb9b2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java @@ -82,6 +82,7 @@ public class ConfigurationPropertiesAutoConfigurationTests { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java index 2e948be8f9a..6c5584a6462 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java @@ -117,6 +117,7 @@ public class CouchbaseTestServer implements TestRule { } } } + } private static class SkipStatement extends Statement { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java index 655a5b86bb1..a8f9065bc46 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java @@ -99,6 +99,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests { public TestRepository testRepository(EntityManagerFactory entityManagerFactory) { return new TestRepository(entityManagerFactory.createEntityManager()); } + } @Repository @@ -113,6 +114,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests { public void doSomething() { this.entityManager.persist(null); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java index 5abd9020c95..c7f1200b6fc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java @@ -23,4 +23,5 @@ import org.springframework.data.repository.Repository; * @author Eddú Meléndez */ public interface CityCouchbaseRepository extends Repository { + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/city/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/city/City.java index 2ddbe1c7b6b..09d49e9cdc9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/city/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/city/City.java @@ -81,4 +81,5 @@ public class City { public void setMap(String map) { this.map = map; } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java index 03fc86bbf2a..dd670900974 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java @@ -110,4 +110,5 @@ public class ElasticsearchRepositoriesAutoConfigurationTests { protected static class CustomizedConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java index ed5cd9f9d82..f4da81c4e4c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java @@ -66,4 +66,5 @@ public class City implements Serializable { public String toString() { return getName() + "," + getState() + "," + getCountry(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java index 7c90cb449cf..b10d2e4538d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java @@ -112,4 +112,5 @@ public class JpaRepositoriesAutoConfigurationTests { protected static class SortOfInvalidCustomConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/city/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/city/City.java index cc26cf7294b..756fce5e327 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/city/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/city/City.java @@ -73,4 +73,5 @@ public class City implements Serializable { public String toString() { return getName() + "," + getState() + "," + getCountry(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java index efc6fe60d02..eb0ef6f0656 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java @@ -210,6 +210,7 @@ public class MixedMongoRepositoriesAutoConfigurationTests { } return names.toArray(new String[0]); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java index e7f728cf1b6..566751c01f0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java @@ -201,6 +201,7 @@ public class MongoDataAutoConfigurationTests { public CustomConversions customConversions() { return new CustomConversions(Arrays.asList(new MyConverter())); } + } @Configuration @@ -223,4 +224,5 @@ public class MongoDataAutoConfigurationTests { LocalDateTime date; } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java index 42f851f6b6f..c86dfeb0561 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java @@ -127,4 +127,5 @@ public class MongoRepositoriesAutoConfigurationTests { protected static class SortOfInvalidCustomConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/city/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/city/City.java index b73e8962817..8485f092278 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/city/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/city/City.java @@ -74,4 +74,5 @@ public class City implements Serializable { public String toString() { return getName() + "," + getState() + "," + getCountry(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/country/Country.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/country/Country.java index 2700efc4afc..7279d7c12b5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/country/Country.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/country/Country.java @@ -52,4 +52,5 @@ public class Country implements Serializable { public String toString() { return getName(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java index 327fdfe0789..821b791c248 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java @@ -165,6 +165,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { } return names.toArray(new String[names.size()]); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java index 778ee1b864b..32254294553 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java @@ -111,5 +111,7 @@ public class SolrRepositoriesAutoConfigurationTests { // To not find any repositories @EnableSolrRepositories("foo.bar") protected static class SortOfInvalidCustomConfiguration { + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java index 22fb4b46a28..d2557dee36d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java @@ -26,4 +26,5 @@ import org.springframework.data.repository.Repository; public interface CityRepository extends Repository { Page findByNameStartingWith(String name, Pageable page); + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java index 6890bf20a9a..c9426e61717 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java @@ -269,6 +269,7 @@ public class FlywayAutoConfigurationTests { initializer.setOrder(Ordered.HIGHEST_PRECEDENCE); return initializer; } + } @Configuration @@ -310,6 +311,7 @@ public class FlywayAutoConfigurationTests { public void assertCalled() { assertThat(this.called).isTrue(); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index 9dc026d804e..a90d6a33d19 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -456,6 +456,7 @@ public class JacksonAutoConfigurationTests { public MyDateFormat() { super("yyyy-MM-dd HH:mm:ss"); } + } @Configuration @@ -568,6 +569,7 @@ public class JacksonAutoConfigurationTests { public void setPropertyName(String propertyName) { this.propertyName = propertyName; } + } @JsonComponent diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java index 3c382e2b8dd..60bf306a410 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java @@ -76,6 +76,7 @@ public class DataSourceJsonSerializationTests { @JsonSerialize(using = TomcatDataSourceSerializer.class) protected interface DataSourceJson { + } protected static class TomcatDataSourceSerializer extends JsonSerializer { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java index 3e9c33e01aa..3c439624d35 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java @@ -148,6 +148,7 @@ public class JndiDataSourceAutoConfigurationTests { MBeanExporter mbeanExporter() { return new MBeanExporter(); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/metadata/HikariDataSourcePoolMetadataTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/metadata/HikariDataSourcePoolMetadataTests.java index a17bbdcdd9e..49ce2cf3701 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/metadata/HikariDataSourcePoolMetadataTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/metadata/HikariDataSourcePoolMetadataTests.java @@ -57,4 +57,5 @@ public class HikariDataSourcePoolMetadataTests dataSource.setMaximumPoolSize(maxSize); return dataSource; } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java index 77837a5dcc9..5d5fd9b1090 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java @@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomFilterContextPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java index 8f6d2358385..32afffbe3be 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java @@ -99,6 +99,7 @@ public class JerseyAutoConfigurationCustomFilterPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java index ef2aa7baf7a..d6f6974e19e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java @@ -43,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link JerseyAutoConfiguration} when using custom load on startup. + * * @author Stephane Nicoll */ @RunWith(SpringRunner.class) @@ -77,6 +78,7 @@ public class JerseyAutoConfigurationCustomLoadOnStartupTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java index 0bc1a88e89b..2ea08f65734 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java @@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomServletContextPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java index eecfe983b05..88c2b740a4a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java @@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomServletPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java index 7e869d7eb2d..2b331d96476 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java @@ -97,6 +97,7 @@ public class JerseyAutoConfigurationDefaultFilterPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java index 57169bddd33..1e5b79f671e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java @@ -98,6 +98,7 @@ public class JerseyAutoConfigurationDefaultServletPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java index 7f278fbb6b4..489597b39bd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java @@ -97,6 +97,7 @@ public class JerseyAutoConfigurationWithoutApplicationPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java index 3ec1efa9308..da2adfdcea6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java @@ -382,6 +382,7 @@ public class JmsAutoConfigurationTests { @Configuration protected static class TestConfiguration { + } @Configuration @@ -506,6 +507,7 @@ public class JmsAutoConfigurationTests { return factory; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java index 37c45cfb450..0398a035d4a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java @@ -359,6 +359,7 @@ public class ArtemisAutoConfigurationTests { } }); } + } @Configuration @@ -386,6 +387,7 @@ public class ArtemisAutoConfigurationTests { topicConfiguration.setBindings("/topic/1"); return topicConfiguration; } + } @Configuration @@ -400,6 +402,7 @@ public class ArtemisAutoConfigurationTests { config.getQueueConfigurations().add(jmsQueueConfiguration); return config; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java index 2a0795fae0a..0f696b86fcf 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java @@ -383,10 +383,12 @@ public class HornetQAutoConfigurationTests { } }); } + } @Configuration protected static class EmptyConfiguration { + } @Configuration @@ -402,6 +404,7 @@ public class HornetQAutoConfigurationTests { TopicConfiguration sampleTopicConfiguration() { return new TopicConfigurationImpl("sampleTopic", "/topic/1"); } + } @Configuration @@ -414,6 +417,7 @@ public class HornetQAutoConfigurationTests { .add(new JMSQueueConfigurationImpl("custom", null, false)); return config; } + } @Configuration @@ -430,6 +434,7 @@ public class HornetQAutoConfigurationTests { } }; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java index d6ae1815036..0be6348e35f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java @@ -177,4 +177,5 @@ public class JmxAutoConfigurationTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java index 952444ebd61..4e38cd9bba9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java @@ -220,10 +220,12 @@ public class AutoConfigurationReportLoggingInitializerTests { @Configuration @Import(WebMvcAutoConfiguration.class) static class ErrorConfig { + @Bean public String iBreak() { throw new RuntimeException(); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java index 1b9ae164670..19104e9f4a5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java @@ -60,6 +60,7 @@ public class MustacheAutoConfigurationIntegrationTests { @Autowired private EmbeddedWebApplicationContext context; + private int port; @Before @@ -117,6 +118,7 @@ public class MustacheAutoConfigurationIntegrationTests { DispatcherServletAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java index b1a3784b79f..9bd164815da 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java @@ -66,6 +66,7 @@ public class MustacheWebIntegrationTests { @Autowired private EmbeddedWebApplicationContext context; + private int port; @Before @@ -143,6 +144,7 @@ public class MustacheWebIntegrationTests { DispatcherServletAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java index dc079933bf7..56c866708e1 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java @@ -308,6 +308,7 @@ public abstract class AbstractJpaAutoConfigurationTests { @SuppressWarnings("serial") static class CustomJpaTransactionManager extends JpaTransactionManager { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index 9daadab838b..fb5fbf1f0a9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -106,4 +106,5 @@ public class CustomHibernateJpaAutoConfigurationTests { protected static class TestConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java index 4708c9e6e61..d32fda35233 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java @@ -75,4 +75,5 @@ public class City implements Serializable { public String toString() { return getName() + "," + getState() + "," + getCountry(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java index ef562c1a2a9..f0130bf6249 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java @@ -68,6 +68,7 @@ public class ReactorAutoConfigurationTests { public EventBus customEventBus() { return EventBus.create(dispatcher()); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java index 8c4f534ff37..e4395a3d407 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java @@ -410,6 +410,7 @@ public class SecurityAutoConfigurationTests { public void onApplicationEvent(AbstractAuthenticationEvent event) { this.event = event; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java index 82d69565469..0bcc19af862 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java @@ -268,6 +268,7 @@ public class SpringBootWebSecurityConfigurationTests { @MinimalWebConfiguration @Import(SecurityAutoConfiguration.class) protected static class VanillaWebConfiguration { + } @MinimalWebConfiguration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java index d06d6fdff64..4a6e447d887 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java @@ -59,6 +59,7 @@ public class JpaUserDetailsTests { PropertyPlaceholderAutoConfiguration.class, SecurityAutoConfiguration.class }) @ComponentScan(basePackageClasses = SecurityConfig.class) public static class Main { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java index 32a6807bef8..f5a75ebdccd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java @@ -425,6 +425,7 @@ public class OAuth2AutoConfigurationTests { @Configuration @EnableOAuth2Client protected static class ClientConfiguration extends TestSecurityConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java index e25a2a4060a..f2af3edc662 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java @@ -54,4 +54,5 @@ public class FacebookAutoConfigurationTests extends AbstractSocialAutoConfigurat assertNoConnectionFrameworkBeans(); assertMissingBean(Facebook.class); } + } 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 99202004ef2..cbb9ed50a23 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 @@ -94,6 +94,7 @@ public class TransactionAutoConfigurationTests { @Configuration static class EmptyConfiguration { + } @Configuration @@ -108,6 +109,7 @@ public class TransactionAutoConfigurationTests { public PlatformTransactionManager transactionManagerTwo() { return mock(PlatformTransactionManager.class); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java index e0a7a7b097d..f57b84e2fa2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java @@ -284,6 +284,7 @@ public class JtaAutoConfigurationTests { XADataSource dataSource = mock(XADataSource.class); return wrapper.wrapDataSource(dataSource); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/velocity/VelocityTemplateAvailabilityProviderTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/velocity/VelocityTemplateAvailabilityProviderTests.java index 870729f9156..30c7eb906f6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/velocity/VelocityTemplateAvailabilityProviderTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/velocity/VelocityTemplateAvailabilityProviderTests.java @@ -72,4 +72,5 @@ public class VelocityTemplateAvailabilityProviderTests { assertThat(this.provider.isTemplateAvailable("suffixed", this.environment, getClass().getClassLoader(), this.resourceLoader)).isTrue(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java index c1f81808400..d57fd82acf8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java @@ -130,6 +130,7 @@ public class BasicErrorControllerDirectMockMvcTests { HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java index 031460be0fd..6bcea6e7cd2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java @@ -132,6 +132,7 @@ public class BasicErrorControllerMockMvcTests { HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java index 7559dfea28f..edc47133d46 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java @@ -114,6 +114,7 @@ public class DefaultErrorViewIntegrationTests { HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java index 6e3b7475e7d..17ee52e46b7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java @@ -243,6 +243,7 @@ public class DispatcherServletAutoConfigurationTests { public String dispatcherServlet() { return "spring"; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java index a9830559539..eff864c1e0f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java @@ -247,10 +247,12 @@ public class EmbeddedServletContainerAutoConfigurationTests { @Component public static class CallbackEmbeddedContainerCustomizer implements EmbeddedServletContainerCustomizer { + @Override public void customize(ConfigurableEmbeddedServletContainer container) { container.setPort(9000); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java index c3ac6b32827..b8a879aaa59 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java @@ -240,10 +240,12 @@ public class HttpMessageConvertersAutoConfigurationTests { @Configuration protected static class JacksonObjectMapperConfig { + @Bean public ObjectMapper objectMapper() { return new ObjectMapper(); } + } @Configuration @@ -258,6 +260,7 @@ public class HttpMessageConvertersAutoConfigurationTests { public Jackson2ObjectMapperBuilder builder() { return new Jackson2ObjectMapperBuilder(); } + } @Configuration @@ -270,6 +273,7 @@ public class HttpMessageConvertersAutoConfigurationTests { converter.setObjectMapper(objectMapper); return converter; } + } @Configuration @@ -281,6 +285,7 @@ public class HttpMessageConvertersAutoConfigurationTests { converter.setGson(gson); return converter; } + } @Configuration @@ -290,6 +295,7 @@ public class HttpMessageConvertersAutoConfigurationTests { public StringHttpMessageConverter customStringMessageConverter() { return new StringHttpMessageConverter(); } + } @Configuration @@ -300,6 +306,7 @@ public class HttpMessageConvertersAutoConfigurationTests { return new TypeConstrainedMappingJackson2HttpMessageConverter( ResourceSupport.class); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java index 943ba048062..ae64e4427c2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java @@ -223,10 +223,12 @@ public class MultipartAutoConfigurationTests { @Configuration public static class ContainerWithNothing { + } @Configuration public static class ContainerWithNoMultipartJetty { + @Bean JettyEmbeddedServletContainerFactory containerFactory() { return new JettyEmbeddedServletContainerFactory(); @@ -236,10 +238,12 @@ public class MultipartAutoConfigurationTests { WebController controller() { return new WebController(); } + } @Configuration public static class ContainerWithNoMultipartUndertow { + @Bean UndertowEmbeddedServletContainerFactory containerFactory() { return new UndertowEmbeddedServletContainerFactory(); @@ -249,6 +253,7 @@ public class MultipartAutoConfigurationTests { WebController controller() { return new WebController(); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java index 9b17db8c2f3..25f9c18bbbb 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -754,6 +754,7 @@ public class WebMvcAutoConfigurationTests { private static class CustomWebBindingInitializer extends ConfigurableWebBindingInitializer { + } @Configuration @@ -780,6 +781,7 @@ public class WebMvcAutoConfigurationTests { }; } + } private static class MyRequestMappingHandlerMapping @@ -801,6 +803,7 @@ public class WebMvcAutoConfigurationTests { }; } + } private static class MyRequestMappingHandlerAdapter diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java index 5cd224a0ce3..06f041bd62d 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java @@ -45,4 +45,5 @@ public class HelpExample { public String getExample() { return this.example; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java index ab0723e6f24..ca9ffef8941 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java @@ -111,4 +111,5 @@ public class HintCommand extends AbstractCommand { } return false; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java index 8da6a669b1c..305938d0f82 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java @@ -182,5 +182,7 @@ public class OptionHandler { public String getUsageHelp() { return this.description; } + } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java index d6e76aae76a..cd7cc9f2580 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java @@ -91,4 +91,5 @@ public class OptionSetGroovyCompilerConfiguration implements GroovyCompilerConfi public List getRepositoryConfiguration() { return this.repositoryConfiguration; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java index 7878b6293dc..8f301372d05 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java @@ -148,7 +148,9 @@ public class RunCommand extends OptionParsingCommand { } return Level.INFO; } + } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java index 162fe15e1b7..a7920921c3c 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java @@ -92,7 +92,6 @@ public class SpringApplicationRunner { /** * Compile and run the application. - * * @throws Exception on error */ public void compileAndRun() throws Exception { @@ -203,6 +202,7 @@ public class SpringApplicationRunner { } } } + } /** diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerConfiguration.java index 354f38d28d3..462d7675a83 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerConfiguration.java @@ -40,4 +40,5 @@ public interface SpringApplicationRunnerConfiguration * @return the logging level */ Level getLogLevel(); + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java index 7a7fd90579a..4a2f62d5354 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java @@ -77,4 +77,5 @@ class AnsiString { public String toString() { return this.value.toString(); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java index a5e4463b2e9..de0bc000f99 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java @@ -143,5 +143,7 @@ public class CommandCompleter extends StringsCompleter { public String getUsage() { return this.usage; } + } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java index 3b2109b2598..ed4f2a0b698 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java @@ -55,4 +55,5 @@ public class ShellPrompts { public String getPrompt() { return this.prompts.isEmpty() ? DEFAULT_PROMPT : this.prompts.peek(); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java index 459c7052c9f..f594a729c5f 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java @@ -68,6 +68,7 @@ public class TestCommand extends OptionParsingCommand { CompilerOptionHandler optionHandler) { super(options, optionHandler); } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java index 484191c0ba7..a3db15b2900 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java @@ -170,6 +170,7 @@ public class TestRunner { ReflectionUtils.rethrowRuntimeException(ex); } } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java index 124dd4726cb..d0eb45e69ad 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java @@ -131,4 +131,5 @@ public abstract class AnnotatedNodeASTTransformation implements ASTTransformatio } } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java index 7e018af4bdd..22ea8674d41 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java @@ -78,4 +78,5 @@ public class DependencyAutoConfigurationTransformation implements ASTTransformat } } } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java index cf9921d46c3..102c2b4d05e 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java @@ -253,7 +253,6 @@ public class DependencyCustomizer { /** * Strategy called to test if dependencies can be added. Subclasses override as * required. Returns {@code true} by default. - * * @return {@code true} if dependencies can be added, otherwise {@code false} */ protected boolean canAdd() { @@ -267,4 +266,5 @@ public class DependencyCustomizer { public DependencyResolutionContext getDependencyResolutionContext() { return this.dependencyResolutionContext; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java index 8f34802f2ce..493aa5cd34c 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java @@ -164,6 +164,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader { .put(classNode.getName().replace(".", "/") + ".class", code); return createdClass; } + } /** @@ -238,6 +239,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader { this.groovyOnlyClassLoader.loadClass(name); return super.loadClass(name, resolve); } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java index e1ea17cd351..2e2791e499b 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java @@ -108,4 +108,5 @@ public class ResolveDependencyCoordinatesTransformation ConstantExpression expression = new ConstantExpression(value); annotation.setMember(name, expression); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JUnitCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JUnitCompilerAutoConfiguration.java index bc801844eaf..29d2ce8ca78 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JUnitCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JUnitCompilerAutoConfiguration.java @@ -48,4 +48,5 @@ public class JUnitCompilerAutoConfiguration extends CompilerAutoConfiguration { .addStaticStars("org.hamcrest.MatcherAssert") .addStaticStars("org.hamcrest.Matchers"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java index 5d85e52b54e..81167fa0f7f 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java @@ -51,4 +51,5 @@ public class JmsCompilerAutoConfiguration extends CompilerAutoConfiguration { "org.springframework.jms.listener", "org.springframework.jms.listener.adapter"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java index fc9b3ce815b..2c122c626b0 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java @@ -55,4 +55,5 @@ public class RabbitCompilerAutoConfiguration extends CompilerAutoConfiguration { "org.springframework.amqp.rabbit.listener.adapter", "org.springframework.amqp.core"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java index 952af620ec8..aea223bf026 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java @@ -64,4 +64,5 @@ public class SpringBatchCompilerAutoConfiguration extends CompilerAutoConfigurat "org.springframework.batch.core.converter.JobParametersConverter", "org.springframework.batch.core.converter.DefaultJobParametersConverter"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java index ae19f42494c..fa1a120898b 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java @@ -102,4 +102,5 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati } return false; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java index 010928bc951..4bb9627f04f 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java @@ -61,4 +61,5 @@ public class SpringIntegrationCompilerAutoConfiguration "org.springframework.integration.config.EnableIntegration"); imports.addStarImports("org.springframework.integration.annotation"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringRetryCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringRetryCompilerAutoConfiguration.java index d3fec159ce3..c8b35e1b3cf 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringRetryCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringRetryCompilerAutoConfiguration.java @@ -48,4 +48,5 @@ public class SpringRetryCompilerAutoConfiguration extends CompilerAutoConfigurat public void applyImports(ImportCustomizer imports) { imports.addStarImports("org.springframework.retry.annotation"); } + } 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 172d61f3890..90d89753f0f 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 @@ -55,4 +55,5 @@ public class SpringSecurityCompilerAutoConfiguration extends CompilerAutoConfigu "org.springframework.security.config.annotation.web", "org.springframework.security.config.annotation.web.builders"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java index 672c55c111a..3fe62888852 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java @@ -72,4 +72,5 @@ public class SpringTestCompilerAutoConfiguration extends CompilerAutoConfigurati "org.springframework.boot.test.context.SpringBootTest.WebEnvironment", "org.springframework.boot.test.web.client.TestRestTemplate"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java index dcf5755fe38..2d57cea5304 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java @@ -51,4 +51,5 @@ public interface ArtifactCoordinatesResolver { * @return The version of the module */ String getVersion(String module); + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java index b691ca59460..df620034577 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java @@ -95,4 +95,5 @@ public abstract class AetherGrapeEngineFactory { } return repositories; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DefaultRepositorySystemSessionAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DefaultRepositorySystemSessionAutoConfiguration.java index d3fc4bf3502..c744360bfbf 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DefaultRepositorySystemSessionAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DefaultRepositorySystemSessionAutoConfiguration.java @@ -68,4 +68,5 @@ public class DefaultRepositorySystemSessionAutoConfiguration } return new File(System.getProperty("user.home"), ".m2"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporter.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporter.java index 1d6426bfc76..25997cee9f7 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporter.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporter.java @@ -66,4 +66,5 @@ final class DetailedProgressReporter implements ProgressReporter { @Override public void finished() { } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java index c2c1ba5592c..d1c039c3fd8 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java @@ -40,4 +40,5 @@ public abstract class GrapeEngineInstaller { } } } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SummaryProgressReporter.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SummaryProgressReporter.java index 6ad5ca9d817..0ee7bc2cfd6 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SummaryProgressReporter.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SummaryProgressReporter.java @@ -98,4 +98,5 @@ final class SummaryProgressReporter implements ProgressReporter { System.out.println(""); } } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java index 97d0fa7196d..125d2fcf908 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java @@ -120,6 +120,7 @@ public class MavenSettingsReader { throw new IllegalStateException(e); } } + } } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java index 8448ee3f4bb..13e37821fd5 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java @@ -225,6 +225,7 @@ public class CliTester implements TestRule { throw new IllegalStateException(ex); } } + } } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java index 2528d75261c..659f91a34d5 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java @@ -85,4 +85,5 @@ public class GrabCommandIntegrationTests { assertThat(new File("target/repository/javax/ejb/ejb-api/3.0").isDirectory()) .isTrue(); } + } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java index d2bb9247cc9..959cd0d7a68 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java @@ -140,6 +140,7 @@ public class SpringApplicationLauncherTests { public void run(String[] args) { TestSpringApplication.args = args; } + } private class TestSpringApplicationLauncher extends SpringApplicationLauncher { diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java index ecbc620ed3e..301d133aeff 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java @@ -49,4 +49,5 @@ public class CommandRunnerIntegrationTests { runner.runAndHandleErrors("run", "samples/app.groovy", "--", "-d"); assertThat(this.output.toString()).doesNotContain("Negative matches:"); } + } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java index 3738b5f4760..d8027cf011d 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java @@ -199,6 +199,9 @@ public class CommandRunnerTests { } private enum Call { + SHOW_USAGE, ERROR_MESSAGE, PRINT_STACK_TRACE + } + } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java index de40b02aa15..928e4c06b0d 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java @@ -263,4 +263,5 @@ public class AetherGrapeEngineTests { } return System.clearProperty(key); } + } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java index 6d0680cc343..51dfa021d90 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java @@ -105,6 +105,7 @@ public class GrapeRootRepositorySystemSessionAutoConfigurationTests { } private class LocalRepositoryManagerAnswer implements Answer { + @Override public LocalRepositoryManager answer(InvocationOnMock invocation) throws Throwable { diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java index 962a329ad77..f9e336fc1a3 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java @@ -33,7 +33,6 @@ public final class SystemProperties { /** * Performs the given {@code action} with the given system properties set. System * properties are restored to their previous values once the action has run. - * * @param action The action to perform * @param systemPropertyPairs The system properties, each in the form * {@code key:value} @@ -61,4 +60,5 @@ public final class SystemProperties { } } } + } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java index 67052e8fc43..ece34e2887f 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java @@ -86,4 +86,5 @@ public final class ChangedFiles implements Iterable { public String toString() { return this.sourceFolder + " " + this.files; } + } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java index 65b2676e18f..b4ed90b8f8f 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java @@ -249,6 +249,7 @@ public class LiveReloadServer { /** * {@link Runnable} to handle a single connection. + * * @see Connection */ private class ConnectionHandler implements Runnable { diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java index 894117f419b..bdb0cc07adf 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java @@ -63,6 +63,7 @@ public class RestartScopeInitializer public String getConversationId() { return null; } + } } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java index 9ae99c8b550..a3e594717f7 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java @@ -65,4 +65,5 @@ public class ClassLoaderFileURLStreamHandler extends URLStreamHandler { } } + } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java index f139a0a73dc..9d0a0620c19 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java @@ -198,6 +198,7 @@ public class TunnelClient implements SmartInitializingSingleton { protected void stopAcceptingConnections() { this.acceptConnections = false; } + } /** @@ -221,5 +222,7 @@ public class TunnelClient implements SmartInitializingSingleton { this.closed = true; } } + } + } diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java index 7fa890e2729..afc8e47fad7 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java @@ -118,6 +118,7 @@ public class DevToolPropertiesIntegrationTests { public MyBean myBean() { return new MyBean(); } + } static class MyBean { @@ -132,4 +133,5 @@ public class DevToolPropertiesIntegrationTests { } } + } diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java index 5f86db5e146..d52de196a52 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java @@ -79,6 +79,7 @@ public class DevToolsHomePropertiesPostProcessorTests { protected File getHomeFolder() { return DevToolsHomePropertiesPostProcessorTests.this.home; } + } } diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java b/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java index 157258eebb7..49bebf3256b 100644 --- a/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java +++ b/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java @@ -64,4 +64,5 @@ public class RestTemplateProxyCustomizationExample { } // end::customizer[] + } diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MixedVersionRepackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MixedVersionRepackagingTests.java index 394176375ca..f4d0832f509 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MixedVersionRepackagingTests.java +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MixedVersionRepackagingTests.java @@ -78,6 +78,7 @@ public class MixedVersionRepackagingTests { public boolean matches(JarFile jarFile) { return jarFile.getEntry(this.entryName) != null; } + } } diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java index f81f2a26a5a..7e00690a159 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java @@ -91,4 +91,5 @@ public class SpringLoadedTests { } fail("Required pattern '" + requiredPattern + "' not matched in " + actualOutput); } + } diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java index e14f698b2e0..dfe84ad31cb 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java @@ -116,4 +116,5 @@ public class StarterDependenciesIntegrationTests { fail(root.getMessage()); } } + } 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 a5b6c50081a..cdb339f609d 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.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = { SampleSecureApplication.class, - TestConfiguration.class }) +@SpringBootTest(classes = { SampleSecureApplication.class, TestConfiguration.class }) public class SampleSecureApplicationTests { @Autowired diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java index 0c8fb183c5f..e041eec1524 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java @@ -82,6 +82,7 @@ public class RestDocsTestExecutionListener extends AbstractTestExecutionListener return null; } } + } } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java index 22574273bfc..590510f6417 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java @@ -229,6 +229,7 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi /** * {@link LinesWriter} used to defer writing until errors are detected. + * * @see MockMvcPrintOnlyOnFailureTestExecutionListener */ static class DeferredLinesWriter implements LinesWriter { diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java index 9fe7a813fa9..db0df23cedf 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java @@ -76,6 +76,7 @@ public class SpringBootDependencyInjectionTestExecutionListenerTests { @Configuration @ImportAutoConfiguration(JacksonAutoConfiguration.class) static class Config { + } } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java index c99cae6d181..cf1d1d1c34e 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java @@ -115,6 +115,7 @@ public class PropertyMappingContextCustomizerFactoryTests { @NoMappingAnnotation static class NoMapping { + } @Retention(RetentionPolicy.RUNTIME) @@ -124,6 +125,7 @@ public class PropertyMappingContextCustomizerFactoryTests { @TypeMappingAnnotation static class TypeMapping { + } @Configuration @@ -142,10 +144,12 @@ public class PropertyMappingContextCustomizerFactoryTests { @AttributeMappingAnnotation static class AttributeMapping { + } @AttributeMappingAnnotation("Other") static class OtherMapping { + } @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/ExampleControllerAdvice.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/ExampleControllerAdvice.java index 34433465ee9..d8975c23475 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/ExampleControllerAdvice.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/ExampleControllerAdvice.java @@ -39,7 +39,8 @@ public class ExampleControllerAdvice { @ExceptionHandler(NoHandlerFoundException.class) @ResponseStatus(HttpStatus.BAD_REQUEST) - public ResponseEntity noHandlerFoundHandler(NoHandlerFoundException exception) { + public ResponseEntity noHandlerFoundHandler( + NoHandlerFoundException exception) { return ResponseEntity.badRequest() .body("Invalid request: " + exception.getRequestURL()); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestCustomDispatcherServletIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestCustomDispatcherServletIntegrationTests.java index a4a407626af..9b7187b81a1 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestCustomDispatcherServletIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestCustomDispatcherServletIntegrationTests.java @@ -45,8 +45,7 @@ public class WebMvcTestCustomDispatcherServletIntegrationTests { @Test public void dispatcherServletIsCustomized() throws Exception { - this.mvc.perform(get("/does-not-exist")) - .andExpect(status().isBadRequest()) + this.mvc.perform(get("/does-not-exist")).andExpect(status().isBadRequest()) .andExpect(content().string("Invalid request: /does-not-exist")); } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/OutputCapture.java b/spring-boot-test/src/main/java/org/springframework/boot/test/OutputCapture.java index 030ba3a89d6..3f66351ac3e 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/OutputCapture.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/OutputCapture.java @@ -26,4 +26,5 @@ package org.springframework.boot.test; */ @Deprecated public class OutputCapture extends org.springframework.boot.test.rule.OutputCapture { + } 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 61ddf064830..17eea896f9f 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 @@ -276,6 +276,7 @@ class ImportsContextCustomizer implements ContextCustomizer { return (obj != null && getClass().equals(obj.getClass()) && this.annotations.equals(((ContextCustomizerKey) obj).annotations)); } + } /** diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java index 4c26c9f3d98..61329056a48 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java @@ -100,4 +100,5 @@ final class SpringBootConfigurationFinder { } } + } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java index 28fd9088fd4..14d3a9b75a2 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java @@ -38,8 +38,8 @@ import org.springframework.web.context.WebApplicationContext; /** * Annotation that can be specified on a test class that runs Spring Boot based tests. - * Provides the following features over and above the regular - * Spring TestContext Framework: + * Provides the following features over and above the regular Spring TestContext + * Framework: *
      *
    • Uses {@link SpringBootContextLoader} as the default {@link ContextLoader} when no * specific {@link ContextConfiguration#loader() @ContextConfiguration(loader=...)} is diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java index e1b1cfd6a47..e5aaf8b1e72 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java @@ -345,6 +345,7 @@ public abstract class AbstractJsonMarshalTester { /** * Utility class used to support field initialization. Used by subclasses to support * {@code initFields}. + * * @param The marshaller type */ protected static abstract class FieldInitializer { diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java index 52adec92ed5..688b833ca3e 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java @@ -125,4 +125,5 @@ public class GsonTester extends AbstractJsonMarshalTester { } } + } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java index eb1a6de2189..161066e6d29 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java @@ -110,4 +110,5 @@ public class SpringBootMockServletContext extends MockServletContext { } return resource; } + } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/ConfigFileApplicationContextInitializerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/ConfigFileApplicationContextInitializerTests.java index a9c176a6ba1..f1880a24288 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/ConfigFileApplicationContextInitializerTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/ConfigFileApplicationContextInitializerTests.java @@ -52,4 +52,5 @@ public class ConfigFileApplicationContextInitializerTests { public static class Config { } + } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockServletTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockServletTests.java index ddc6cb6b1eb..55edba00b96 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockServletTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockServletTests.java @@ -36,7 +36,6 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link WebAppConfiguration} using {@link SpringApplicationContextLoader} with * a plain mock Servlet environment. * - * * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java index a40736f3932..fc18241a6ee 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java @@ -50,4 +50,5 @@ public class ConfigFileApplicationContextInitializerTests { public static class Config { } + } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java index f42c82fd413..970496b865c 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java @@ -78,6 +78,7 @@ public class MockBeanWithAsyncInterfaceMethodIntegrationTests { public MyService myService(Transformer transformer) { return new MyService(transformer); } + } } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java index 81796e2963d..4a7a4a4d5a3 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java @@ -201,4 +201,5 @@ public class TestRestTemplateTests { .isEqualTo(password); } + } diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java index 48d5260a071..b87b076e7e8 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java +++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java @@ -77,4 +77,5 @@ public class ValueHint implements Serializable { return "ValueHint{" + "value=" + this.value + ", description='" + this.description + '\'' + '}'; } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java index 094280df776..d908cdc9992 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java @@ -62,6 +62,7 @@ public class TestProject { * incremental builds. */ private File sourceFolder; + private TestCompiler compiler; private Set sourceFiles = new LinkedHashSet(); @@ -202,4 +203,5 @@ public class TestProject { private static String getContents(File file) throws Exception { return FileCopyUtils.copyToString(new FileReader(file)); } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java index f0f143a1625..cd8a9d451fa 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java @@ -53,4 +53,5 @@ public class BarProperties { public void setCounter(Integer counter) { this.counter = counter; } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java index 8dc73f04e53..d4b30bb2a13 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java @@ -53,4 +53,5 @@ public class RenamedBarProperties { public void setCounter(Integer counter) { this.counter = counter; } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java index 3294d8e514a..9af47e63946 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java @@ -57,7 +57,9 @@ public class LombokInnerClassProperties { } public enum Fourth { + YES, NO + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java index d59d120a739..41cd6b0779f 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java @@ -62,6 +62,7 @@ public class MethodAndClassConfig { public void setFlag(boolean flag) { this.flag = flag; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SimpleMethodConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SimpleMethodConfig.java index 93b6755d371..f2bdce9db26 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SimpleMethodConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SimpleMethodConfig.java @@ -51,6 +51,7 @@ public class SimpleMethodConfig { public void setFlag(boolean flag) { this.flag = flag; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java index 6d8d49498e1..73ca89846cd 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java @@ -36,4 +36,5 @@ public class BuilderPojo { this.name = name; return this; } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java index 53c48eafd79..28de281047b 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java @@ -67,6 +67,7 @@ public class GenericConfig { public Map getStringToInteger() { return this.stringToInteger; } + } public static class Bar { @@ -99,6 +100,7 @@ public class GenericConfig { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java index d64f8e2042e..b152754ee07 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java @@ -89,12 +89,15 @@ public class InnerClassProperties { public void setName(String name) { this.name = name; } + } } public enum Fourth { + YES, NO + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java index 6910b57f555..d26ec476a25 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java @@ -37,6 +37,7 @@ public class InnerClassRootConfig { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java index d8a9e33b941..88285a2af61 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java @@ -42,6 +42,7 @@ public class InvalidDoubleRegistrationProperties { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java index db01938f5f0..d1c4eef608d 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java @@ -233,6 +233,7 @@ class ProjectLibraries implements Libraries { public String toString() { return getFile().getAbsolutePath(); } + } /** diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/RunPluginFeatures.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/RunPluginFeatures.java index b2967eab8d0..ad913dbefe4 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/RunPluginFeatures.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/RunPluginFeatures.java @@ -99,4 +99,5 @@ public class RunPluginFeatures implements PluginFeatures { } }); } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java index 39ebbcbd718..2f95a3b6391 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java @@ -39,7 +39,6 @@ public final class BuildPropertiesWriter { /** * Creates a new {@code BuildPropertiesWriter} that will write to the given * {@code outputFile}. - * * @param outputFile the output file */ public BuildPropertiesWriter(File outputFile) { @@ -168,4 +167,5 @@ public final class BuildPropertiesWriter { } } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java index 0b0535e2bc9..cad69386e1f 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java @@ -89,4 +89,5 @@ public abstract class FileUtils { } return hex.toString(); } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java index d5a05dd0946..d4cda9dba1e 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java @@ -346,6 +346,7 @@ public class JarWriter { public boolean hasZipHeader() { return Arrays.equals(this.header, ZIP_HEADER); } + } /** @@ -386,6 +387,7 @@ public class JarWriter { entry.setCrc(this.crc.getValue()); entry.setMethod(ZipEntry.STORED); } + } /** diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java index 0bf51d2535b..c93b90f302a 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java @@ -39,10 +39,13 @@ public abstract class LogbackInitializer { } private static class Initializer { + public void setRootLogLevel() { ILoggerFactory factory = StaticLoggerBinder.getSingleton().getLoggerFactory(); Logger logger = factory.getLogger(Logger.ROOT_LOGGER_NAME); ((ch.qos.logback.classic.Logger) logger).setLevel(Level.INFO); } + } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index d9d09426368..8c35cce7eb3 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -315,6 +315,7 @@ public abstract class MainClassFinder { /** * Callback interface used to receive class names. + * * @param the result type */ public interface ClassNameCallback { diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java index 4c3ee88ea61..a0ba79c836f 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java @@ -59,6 +59,7 @@ public class RepackagerTests { }; private static final long JAN_1_1980; + private static final long JAN_1_1985; static { diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java index 7bc2911fa70..880c33b5e35 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java @@ -631,4 +631,5 @@ public class PropertiesLauncher extends Launcher { } } + } 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 162395c295b..e0a2741dfcd 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 @@ -404,7 +404,9 @@ public class JarFile extends java.util.jar.JarFile { * The type of a {@link JarFile}. */ enum JarFileType { + DIRECT, NESTED_DIRECTORY, NESTED_JAR + } } 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 27cb0f3ec89..213bfa9fbd9 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 @@ -32,7 +32,6 @@ import java.util.Set; * @author Juergen Hoeller * @author Rob Harrop * @author Dave Syer - * * @see System#getProperty(String) */ public abstract class SystemPropertyUtils { diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/InternalOutputCapture.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/InternalOutputCapture.java index a9fc9894fc5..bf837a45128 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/InternalOutputCapture.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/InternalOutputCapture.java @@ -122,6 +122,7 @@ class InternalOutputCapture implements TestRule { this.copy.flush(); this.original.flush(); } + } } diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java index e6d91a6d070..c8e8083e418 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java @@ -253,6 +253,7 @@ public class PropertiesLauncherTests { protected Class findClass(String name) throws ClassNotFoundException { return super.findClass(name); } + } } diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java index 74bed70938d..784f8c45e30 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java @@ -60,4 +60,5 @@ public class WarLauncherTests extends AbstractExecutableArchiveLauncherTests { new URL("jar:" + jarRoot.toURI().toURL() + "!/WEB-INF/classes!/"), new URL("jar:" + jarRoot.toURI().toURL() + "!/WEB-INF/lib/foo.jar!/")); } + } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java index 91e75e10c4d..da1f4e3ed6d 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java @@ -134,4 +134,5 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo { } return cleaned.toString(); } + } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index 086664afe3f..cdb351b6539 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java @@ -486,6 +486,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { class LaunchRunner implements Runnable { private final String startClassName; + private final String[] args; LaunchRunner(String startClassName, String... args) { 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 3502ef687c4..15647355554 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 @@ -382,4 +382,5 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { } } + } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java index ae61d699b73..e4b862f8142 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java @@ -93,4 +93,5 @@ public class DependencyFilterMojoTests { } } + } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java index 85c3eee88e6..e169faed591 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java @@ -87,6 +87,7 @@ public final class Verify { public static class ArchiveVerifier { private final ZipFile zipFile; + private final Map content; public ArchiveVerifier(ZipFile zipFile) { @@ -253,6 +254,7 @@ public final class Verify { assertThat(manifest.getMainAttributes().getValue("Not-Used")) .isEqualTo("Foo"); } + } public static class WarArchiveVerification extends AbstractArchiveVerification { @@ -286,6 +288,7 @@ public final class Verify { assertThat(manifest.getMainAttributes().getValue("Not-Used")) .isEqualTo("Foo"); } + } private static class ZipArchiveVerification extends AbstractArchiveVerification { @@ -303,6 +306,7 @@ public final class Verify { assertThat(manifest.getMainAttributes().getValue("Not-Used")) .isEqualTo("Foo"); } + } private static class ModuleArchiveVerification extends AbstractArchiveVerification { diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java index 86d61192859..f0d00118ea9 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java @@ -30,9 +30,9 @@ import org.springframework.context.annotation.Configuration; * standard {@code @Configuration} annotation so that configuration can be found * automatically (for example in tests). *

      - * Application should only ever include one - * {@code @SpringBootConfiguration} and most idiomatic Spring Boot applications - * will inherit it from {@code @SpringBootApplication}. + * Application should only ever include one {@code @SpringBootConfiguration} and + * most idiomatic Spring Boot applications will inherit it from + * {@code @SpringBootApplication}. * * @author Phillip Webb * @since 1.4.0 diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java index 6c0c0e4d493..9d2e83d87ee 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java @@ -28,7 +28,6 @@ import org.springframework.core.env.PropertySources; * Convenience class for manipulating PropertySources. * * @author Dave Syer - * * @see PropertySource * @see PropertySources */ diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java index cbcd549d94d..9e21d9ca1e5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java @@ -224,6 +224,7 @@ public final class RelaxedNames implements Iterable { } return builder.toString(); } + } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java index 63a8f588cbc..dabd103dd76 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java @@ -92,4 +92,5 @@ public class YamlJavaBeanPropertyConstructor extends Constructor { } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Compression.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Compression.java index dff565c27e6..cd3c0b728ed 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Compression.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Compression.java @@ -77,4 +77,5 @@ public class Compression { public void setExcludedUserAgents(String[] excludedUserAgents) { this.excludedUserAgents = excludedUserAgents; } + } 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 f419c11ef56..43c9a116edf 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 @@ -702,6 +702,7 @@ public class JettyEmbeddedServletContainerFactory serverConnector.setPort(port); return serverConnector; } + } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java index 53694f8824d..4e61ed5fded 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java @@ -96,6 +96,7 @@ public class ServletContextInitializerConfiguration extends AbstractConfiguratio // Not available on Jetty 8 } } + } } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatResources.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatResources.java index 78df53bc1ba..a7edb2d64df 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatResources.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatResources.java @@ -157,6 +157,7 @@ abstract class TomcatResources { } } } + } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java index c84d391849d..dd3d0d49796 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java @@ -482,4 +482,5 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java index 8f0ae5fecc1..a9d70041f70 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java @@ -115,6 +115,7 @@ public class PoolingConnectionFactoryBean extends PoolingConnectionFactory /** * A {@link XAConnectionFactory} implementation that delegates to the * {@link ThreadLocal} {@link PoolingConnectionFactoryBean}. + * * @see PoolingConnectionFactoryBean#setConnectionFactory(XAConnectionFactory) */ public static class DirectXAConnectionFactory implements XAConnectionFactory { diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java b/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java index 3d68844fe75..c483387d1bf 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java @@ -120,4 +120,5 @@ public class LogFile { } return null; } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java index bd871e90e7c..8ed6a81ab63 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java @@ -85,7 +85,6 @@ public final class ColorConverter extends LogEventPatternConverter { /** * Creates a new instance of the class. Required by Log4J2. - * * @param config the configuration * @param options the options * @return a new instance, or {@code null} if the options are invalid diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java index 97ee14efdf6..a08ef6efff3 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java @@ -117,6 +117,7 @@ public class LevelRemappingAppender extends AppenderBase { this.logger.callAppenders(event); } } + } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java index f9ad96dafc7..fa5f0673e14 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java @@ -37,6 +37,7 @@ import org.springframework.core.env.Environment; class SpringPropertyAction extends Action { private static final String SOURCE_ATTRIBUTE = "source"; + private static final String DEFAULT_VALUE_ATTRIBUTE = "defaultValue"; private final Environment environment; diff --git a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java index 71479a8cb8b..0220c03edd1 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java @@ -463,7 +463,6 @@ public class RestTemplateBuilder { /** * Sets the connect timeout in milliseconds on the underlying * {@link ClientHttpRequestFactory}. - * * @param connectTimeout the connect timeout in milliseconds * @return a new builder instance. */ @@ -479,7 +478,6 @@ public class RestTemplateBuilder { /** * Sets the read timeout in milliseconds on the underlying * {@link ClientHttpRequestFactory}. - * * @param readTimeout the read timeout in milliseconds * @return a new builder instance. */ diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java index 8e0fec294e7..5c7c150a149 100644 --- a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java @@ -107,7 +107,9 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher { * Profile match types. */ enum ProfileType { + POSITIVE, NEGATIVE + } /** diff --git a/spring-boot/src/test/java/org/springframework/boot/ApplicationPidTests.java b/spring-boot/src/test/java/org/springframework/boot/ApplicationPidTests.java index fee353ecf65..3aa6b92b3f7 100644 --- a/spring-boot/src/test/java/org/springframework/boot/ApplicationPidTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/ApplicationPidTests.java @@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link ApplicationPid}. + * * @author Phillip Webb */ public class ApplicationPidTests { diff --git a/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java b/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java index 012ca9085a0..7f0e0f7694a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java @@ -87,8 +87,10 @@ public class OverrideSourcesTests { } protected static class Service { + @Autowired private TestBean bean; + } protected static class TestBean { @@ -100,4 +102,5 @@ public class OverrideSourcesTests { } } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/ReproTests.java b/spring-boot/src/test/java/org/springframework/boot/ReproTests.java index 1ce4a480e9d..d3fea91b97e 100644 --- a/spring-boot/src/test/java/org/springframework/boot/ReproTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/ReproTests.java @@ -177,4 +177,5 @@ public class ReproTests { public static class Config { } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index 10aafc820ef..917a12775ac 100644 --- a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -293,10 +293,12 @@ public class SpringApplicationTests { final AtomicReference reference = new AtomicReference(); class ApplicationReadyEventListener implements ApplicationListener { + @Override public void onApplicationEvent(ApplicationReadyEvent event) { reference.set(event.getSpringApplication()); } + } application.addListeners(new ApplicationReadyEventListener()); this.context = application.run("--foo=bar"); @@ -309,10 +311,12 @@ public class SpringApplicationTests { application.setWebEnvironment(false); final AtomicReference reference = new AtomicReference(); class InitializerListener implements ApplicationListener { + @Override public void onApplicationEvent(ContextRefreshedEvent event) { reference.set(event.getApplicationContext()); } + } application.setListeners(Arrays.asList(new InitializerListener())); this.context = application.run("--foo=bar"); @@ -328,10 +332,12 @@ public class SpringApplicationTests { final List events = new ArrayList(); class ApplicationRunningEventListener implements ApplicationListener { + @Override public void onApplicationEvent(ApplicationEvent event) { events.add((event)); } + } application.addListeners(new ApplicationRunningEventListener()); this.context = application.run(); @@ -1064,6 +1070,7 @@ public class SpringApplicationTests { public void fail() { throw new RefreshFailureException(); } + } static class ExitStatusException extends RuntimeException diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java index c49ea0f1bc9..a0bb1810fa2 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java @@ -233,6 +233,7 @@ public class BindingPreparationTests { } public static class TargetWithNestedMap { + private Map nested; public Map getNested() { @@ -242,9 +243,11 @@ public class BindingPreparationTests { public void setNested(Map nested) { this.nested = nested; } + } public static class TargetWithNestedMapOfListOfString { + private Map> nested; public Map> getNested() { @@ -254,9 +257,11 @@ public class BindingPreparationTests { public void setNested(Map> nested) { this.nested = nested; } + } public static class TargetWithNestedListOfMaps { + private List> nested; public List> getNested() { @@ -266,9 +271,11 @@ public class BindingPreparationTests { public void setNested(List> nested) { this.nested = nested; } + } public static class TargetWithNestedListOfLists { + private List> nested; public List> getNested() { @@ -278,9 +285,11 @@ public class BindingPreparationTests { public void setNested(List> nested) { this.nested = nested; } + } public static class TargetWithNestedListOfBeansWithList { + private List nested; public List getNested() { @@ -290,9 +299,11 @@ public class BindingPreparationTests { public void setNested(List nested) { this.nested = nested; } + } public static class TargetWithList { + private List list; public List getList() { @@ -306,6 +317,7 @@ public class BindingPreparationTests { } public static class TargetWithNestedMapOfBean { + private Map nested; public Map getNested() { @@ -315,6 +327,7 @@ public class BindingPreparationTests { public void setNested(Map nested) { this.nested = nested; } + } public static class VanillaTarget { diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java index 7a4bb4a6ca6..0f4bc35f787 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java @@ -113,6 +113,7 @@ public class PropertiesConfigurationFactoryMapTests { // Foo needs to be public and to have setters for all properties public static class Foo { + private Map map = new HashMap(); public Map getMap() { @@ -122,6 +123,7 @@ public class PropertiesConfigurationFactoryMapTests { public void setMap(Map map) { this.map = map; } + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java index 9a669cec6a3..09714fad702 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java @@ -228,6 +228,7 @@ public class PropertiesConfigurationFactoryTests { // Foo needs to be public and to have setters for all properties public static class Foo { + @NotNull private String name; diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java index d83fb73395c..beb00589455 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java @@ -96,10 +96,12 @@ public class PropertySourcesBindingTests { @PropertySources({ @PropertySource("classpath:/override.properties"), @PropertySource("classpath:/some.properties") }) public static class SomeConfig { + } @ConfigurationProperties public static class Wrapper { + private String foo; private String bar; @@ -139,6 +141,7 @@ public class PropertySourcesBindingTests { public void setTheName(String theName) { this.theName = theName; } + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java index 2a8716df60b..3c3665891d4 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java @@ -852,6 +852,7 @@ public class RelaxedDataBinderTests { public void setNested(Map nested) { this.nested = nested; } + } public static class TargetWithNestedMapOfListOfString { @@ -1101,7 +1102,9 @@ public class RelaxedDataBinderTests { } enum Bingo { + THIS, or, THAT, THE_OTHER, THAT_OTHER + } public static class ValidatedTarget { diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java index ae159d11857..36ee414ab61 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java @@ -100,13 +100,18 @@ public class YamlConfigurationFactoryTests { } private static class Foo { + @NotNull public String name; public String bar; + } private static class Jee { + public Map mymap; + } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java index 7faa991f63d..55904781bd1 100644 --- a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java @@ -358,5 +358,7 @@ public class SpringApplicationBuilderTests { public ApplicationContext getParent() { return this.applicationContext.getParent(); } + } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java index f6a612fb6b2..1a972ea782f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java @@ -132,4 +132,5 @@ public class CloudFoundryVcapEnvironmentPostProcessorTests { private String getProperty(String key) { return this.context.getEnvironment().getProperty(key); } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java index 4fce2663c7c..b698a32bd73 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java @@ -33,7 +33,9 @@ import org.springframework.test.context.support.TestPropertySourceUtils; public class FileEncodingApplicationListenerTests { private final FileEncodingApplicationListener initializer = new FileEncodingApplicationListener(); + private final ConfigurableEnvironment environment = new StandardEnvironment(); + private final ApplicationEnvironmentPreparedEvent event = new ApplicationEnvironmentPreparedEvent( new SpringApplication(), new String[0], this.environment); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java index c8081956413..14434434f90 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java @@ -93,6 +93,7 @@ public class AnsiOutputApplicationListenerTests { @Configuration public static class Config { + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java index 05fc23d8a0f..a6d6bd1996b 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java @@ -83,12 +83,14 @@ public class DelegatingApplicationListenerTests { @Order(Ordered.HIGHEST_PRECEDENCE) private static class MockInitA implements ApplicationListener { + @Override public void onApplicationEvent(ContextRefreshedEvent event) { ConfigurableApplicationContext applicationContext = (ConfigurableApplicationContext) event .getApplicationContext(); applicationContext.getBeanFactory().registerSingleton("a", "a"); } + } @Order(Ordered.LOWEST_PRECEDENCE) @@ -102,6 +104,7 @@ public class DelegatingApplicationListenerTests { .isEqualTo("a"); applicationContext.getBeanFactory().registerSingleton("b", "b"); } + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java index 9f3ed92e841..a6912a6d363 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan public class InDefaultPackageConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java index 517fc19d16e..e1eb981a38c 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java @@ -23,4 +23,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan(basePackageClasses = ExampleBean.class) public class InDefaultPackageWithBasePackageClassesConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java index ec69a08f48d..4abc16bfd00 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan(basePackages = "org.springframework.boot.context.configwarnings.nested") public class InDefaultPackageWithBasePackagesConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java index 986541024c1..088334827cd 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @MetaComponentScan public class InDefaultPackageWithMetaAnnotationConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java index 49f9db90888..1987b17bda0 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan("org.springframework.boot.context.configwarnings.nested") public class InDefaultPackageWithValueConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java index 637a37f91ab..0b4e90dd34b 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java @@ -20,4 +20,5 @@ import org.springframework.context.annotation.Configuration; @Configuration public class InDefaultPackageWithoutScanConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java index 2c5ece9f4ba..b79c969481d 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan public class InOrgSpringPackageConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java index 8f6664b6d5d..cd0932b378a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan public class InRealPackageConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java index e344f189a06..a0fd5d3b1a9 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java @@ -210,4 +210,5 @@ public class AnnotationConfigEmbeddedWebApplicationContextTests { } } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java index 531fa5f0624..8e2b1c5cbae 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java @@ -121,28 +121,34 @@ public class EmbeddedServletContainerMvcIntegrationTests { @Configuration @Import(Config.class) public static class TomcatConfig { + @Bean public EmbeddedServletContainerFactory containerFactory() { return new TomcatEmbeddedServletContainerFactory(0); } + } @Configuration @Import(Config.class) public static class JettyConfig { + @Bean public EmbeddedServletContainerFactory containerFactory() { return new JettyEmbeddedServletContainerFactory(0); } + } @Configuration @Import(Config.class) public static class UndertowConfig { + @Bean public EmbeddedServletContainerFactory containerFactory() { return new UndertowEmbeddedServletContainerFactory(0); } + } @Configuration @@ -161,6 +167,7 @@ public class EmbeddedServletContainerMvcIntegrationTests { public HelloWorldController helloWorldController() { return new HelloWorldController(); } + } @Configuration @@ -201,6 +208,7 @@ public class EmbeddedServletContainerMvcIntegrationTests { public HelloWorldController helloWorldController() { return new HelloWorldController(); } + } @Controller diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java index 05853d2e926..0f78f3bdc14 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java @@ -47,4 +47,5 @@ public class ExampleFilter implements Filter { chain.doFilter(request, response); response.getWriter().write("]"); } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java index b3101ab16df..d14251a7bbb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java @@ -200,6 +200,7 @@ public class MockEmbeddedServletContainerFactory } private static class EmptyEnumeration implements Enumeration { + static final EmptyEnumeration EMPTY_ENUMERATION = new EmptyEnumeration(); @Override @@ -211,6 +212,7 @@ public class MockEmbeddedServletContainerFactory public E nextElement() { throw new NoSuchElementException(); } + } } @@ -233,6 +235,7 @@ public class MockEmbeddedServletContainerFactory public Servlet getServlet() { return this.servlet; } + } public static class RegisteredFilter { @@ -253,5 +256,7 @@ public class MockEmbeddedServletContainerFactory public Filter getFilter() { return this.filter; } + } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java index 775e8756115..41cb73f76fb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java @@ -87,4 +87,5 @@ public class XmlEmbeddedWebApplicationContextTests { Servlet servlet = this.context.getBean(Servlet.class); verify(containerFactory.getServletContext()).addServlet("servlet", servlet); } + } 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 f327c535b96..76e568bda39 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 @@ -522,6 +522,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests { public void setFoo(String foo) { this.foo = foo; } + } public static class CustomPropertyValidator implements Validator { @@ -600,7 +601,9 @@ public class ConfigurationPropertiesBindingPostProcessorTests { } enum FooEnum { + FOO, BAZ, BAR + } @Configuration diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java index 86b5d42bf4a..883c0c52648 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java @@ -755,6 +755,7 @@ public class EnableConfigurationPropertiesTests { } // No getter - you should be able to bind to a write-only bean + } // No annotation @@ -782,6 +783,7 @@ public class EnableConfigurationPropertiesTests { } // No getter - you should be able to bind to a write-only bean + } @EnableConfigurationProperties diff --git a/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java b/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java index eae067faf1f..83aa28cf80f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java @@ -94,6 +94,7 @@ public class FailureAnalyzersTests { public FailureAnalysis analyze(Throwable failure) { return null; } + } interface BeanFactoryAwareFailureAnalyzer extends BeanFactoryAware, FailureAnalyzer { diff --git a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java index 417ced254bc..7975125075c 100644 --- a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java @@ -82,6 +82,7 @@ public class BeanNotOfRequiredTypeFailureAnalyzerTests { public AsyncBean asyncBean() { return new AsyncBean(); } + } @Configuration diff --git a/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java b/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java index d93113aeb1a..5333b4785ad 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java @@ -73,8 +73,7 @@ public class DatabaseDriverTests { .isEqualTo(DatabaseDriver.UNKNOWN); assertThat(DatabaseDriver.fromProductName("Apache Derby")) .isEqualTo(DatabaseDriver.DERBY); - assertThat(DatabaseDriver.fromProductName("H2")) - .isEqualTo(DatabaseDriver.H2); + assertThat(DatabaseDriver.fromProductName("H2")).isEqualTo(DatabaseDriver.H2); assertThat(DatabaseDriver.fromProductName("HSQL Database Engine")) .isEqualTo(DatabaseDriver.HSQLDB); assertThat(DatabaseDriver.fromProductName("SQLite")) @@ -122,8 +121,9 @@ public class DatabaseDriverTests { .isEqualTo(DatabaseDriver.ORACLE); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:postgresql://127.0.0.1:5432/sample")) .isEqualTo(DatabaseDriver.POSTGRESQL); - assertThat(DatabaseDriver.fromJdbcUrl("jdbc:jtds:sqlserver://127.0.0.1:1433/sample")) - .isEqualTo(DatabaseDriver.JTDS); + assertThat( + DatabaseDriver.fromJdbcUrl("jdbc:jtds:sqlserver://127.0.0.1:1433/sample")) + .isEqualTo(DatabaseDriver.JTDS); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:sqlserver://127.0.0.1:1433")) .isEqualTo(DatabaseDriver.SQLSERVER); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:firebirdsql://localhost/sample")) @@ -134,8 +134,9 @@ public class DatabaseDriverTests { .isEqualTo(DatabaseDriver.DB2_AS400); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:teradata://localhost/SAMPLE")) .isEqualTo(DatabaseDriver.TERADATA); - assertThat(DatabaseDriver.fromJdbcUrl("jdbc:informix-sqli://localhost:1533/sample")) - .isEqualTo(DatabaseDriver.INFORMIX); + assertThat( + DatabaseDriver.fromJdbcUrl("jdbc:informix-sqli://localhost:1533/sample")) + .isEqualTo(DatabaseDriver.INFORMIX); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:informix-direct://sample")) .isEqualTo(DatabaseDriver.INFORMIX); } diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java index f5b677f9a06..cb5404e0c50 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java @@ -37,7 +37,9 @@ import static org.assertj.core.api.Assertions.assertThat; public class ColorConverterTests { private ColorConverter converter; + private LoggingEvent event; + private final String in = "in"; @BeforeClass @@ -132,4 +134,5 @@ public class ColorConverterTests { String out = this.converter.transform(this.event, this.in); assertThat(out).isEqualTo("\033[32min\033[0;39m"); } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java index 7f4a647a40a..d0d8fd56026 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java @@ -108,4 +108,5 @@ public class LevelRemappingAppenderTests { } } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/EntityScanTests.java b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/EntityScanTests.java index f41931e6b1b..f0511fca441 100644 --- a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/EntityScanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/EntityScanTests.java @@ -107,12 +107,14 @@ public class EntityScanTests { @EntityScan("com.mycorp.entity") @SuppressWarnings("deprecation") static class ValueConfig extends BaseConfig { + } @Configuration @EntityScan("com.mycorp.entity") @SuppressWarnings("deprecation") static class MissingEntityManager { + } @Configuration @@ -144,6 +146,7 @@ public class EntityScanTests { }; } + } private static class TestLocalContainerEntityManagerFactoryBean diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/FilteredClassPathRunner.java b/spring-boot/src/test/java/org/springframework/boot/testutil/FilteredClassPathRunner.java index 84f11133836..b7ca5f51521 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/FilteredClassPathRunner.java +++ b/spring-boot/src/test/java/org/springframework/boot/testutil/FilteredClassPathRunner.java @@ -156,6 +156,7 @@ public class FilteredClassPathRunner extends BlockJUnit4ClassRunner { } return false; } + } /** diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/MockFilter.java b/spring-boot/src/test/java/org/springframework/boot/testutil/MockFilter.java index 3029c3e306f..dcda41151e5 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/MockFilter.java +++ b/spring-boot/src/test/java/org/springframework/boot/testutil/MockFilter.java @@ -44,4 +44,5 @@ public class MockFilter implements Filter { @Override public void destroy() { } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/web/support/SpringBootServletInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/web/support/SpringBootServletInitializerTests.java index c34eaebfe1d..a1ec9a16257 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/support/SpringBootServletInitializerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/support/SpringBootServletInitializerTests.java @@ -126,10 +126,12 @@ public class SpringBootServletInitializerTests { SpringApplicationBuilder application) { return application.sources(Config.class); } + } @Configuration public class WithConfigurationAnnotation extends MockSpringBootServletInitializer { + } public class WithConfiguredSource extends MockSpringBootServletInitializer { From 6121208cbb7f9ba38589ff10ba0a552babe7d62f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 19 Dec 2016 12:37:54 -0800 Subject: [PATCH 3/4] Polish formatting --- .../ManagementWebSecurityAutoConfiguration.java | 1 + .../actuate/endpoint/mvc/JolokiaMvcEndpoint.java | 4 ++-- .../security/AuthorizationAuditListener.java | 4 ++-- .../CrshAutoConfigurationTests.java | 4 ++-- .../endpoint/jmx/EndpointMBeanExporterTests.java | 11 +++++------ .../actuate/endpoint/mvc/MvcEndpointsTests.java | 2 ++ .../AuthenticationAuditListenerTests.java | 12 ++++++------ .../AuthorizationAuditListenerTests.java | 9 ++++++--- .../autoconfigure/condition/SearchStrategy.java | 1 - .../jdbc/DataSourceConfiguration.java | 1 + .../jdbc/DataSourceInitializer.java | 8 ++++---- .../boot/autoconfigure/jms/JmsProperties.java | 1 + .../jooq/JooqExceptionTranslator.java | 4 ++-- .../validation/ValidationAutoConfiguration.java | 3 ++- .../boot/autoconfigure/web/ServerProperties.java | 1 + .../jdbc/DataSourceInitializerTests.java | 5 ++--- .../ValidationAutoConfigurationTests.java | 9 +++++---- .../grape/DependencyResolutionContextTests.java | 3 ++- .../SampleHypermediaGsonApplicationTests.java | 3 ++- .../method/SampleMethodSecurityApplication.java | 4 ++-- .../autoconfigure/jdbc/AutoConfigureJdbc.java | 7 ++++--- .../jdbc/JdbcTypeExcludeFilter.java | 8 ++++---- .../orm/jpa/AutoConfigureTestDatabase.java | 3 ++- ...eWithMultipleDatasourcesIntegrationTests.java | 6 ++---- .../jdbc/ExampleJdbcApplication.java | 3 +-- .../autoconfigure/jdbc/ExampleRepository.java | 6 ++++-- ...tDatabaseReplaceExplicitIntegrationTests.java | 3 +-- ...tabaseReplacePropertyAnyIntegrationTests.java | 3 +-- .../jdbc/TestDatabaseAutoConfigurationTests.java | 3 +-- ...tDatabaseReplaceExplicitIntegrationTests.java | 3 +-- .../orm/jpa/ExampleDataJpaApplication.java | 3 +-- ...WebMvcTestAllControllersIntegrationTests.java | 3 +-- .../TypeElementMembers.java | 3 ++- ...gurationMetadataAnnotationProcessorTests.java | 16 ++++++++++++---- .../method/DeprecatedMethodConfig.java | 1 + .../simple/ClassWithNestedProperties.java | 3 +++ .../boot/loader/tools/MainClassFinder.java | 1 - .../boot/loader/archive/ExplodedArchive.java | 3 ++- .../UndertowEmbeddedServletContainerFactory.java | 4 ++-- .../boot/jdbc/DatabaseDriver.java | 2 +- .../boot/logging/AbstractLoggingSystem.java | 1 + .../boot/logging/LoggingSystem.java | 6 +++--- .../hibernate/SpringPhysicalNamingStrategy.java | 7 +++---- .../EnableConfigurationPropertiesTests.java | 1 + .../logging/java/JavaLoggingSystemTests.java | 3 ++- .../SpringPhysicalNamingStrategyTests.java | 6 ++++-- 46 files changed, 110 insertions(+), 88 deletions(-) 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 ea18f751fcb..1221fd1c763 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 @@ -126,6 +126,7 @@ public class ManagementWebSecurityAutoConfiguration { } } + } @Configuration diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java index ab4d4654be9..63fe5409f7d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java @@ -45,8 +45,8 @@ import org.springframework.web.util.UrlPathHelper; */ @ConfigurationProperties(prefix = "endpoints.jolokia", ignoreUnknownFields = false) @HypermediaDisabled -public class JolokiaMvcEndpoint extends AbstractNamedMvcEndpoint - implements InitializingBean, ApplicationContextAware, ServletContextAware, DisposableBean { +public class JolokiaMvcEndpoint extends AbstractNamedMvcEndpoint implements + InitializingBean, ApplicationContextAware, ServletContextAware, DisposableBean { private final ServletWrappingController controller = new ServletWrappingController(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java index 387cf3c42f8..324f703eb44 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java @@ -64,8 +64,8 @@ public class AuthorizationAuditListener extends AbstractAuthorizationAuditListen if (event.getAuthentication().getDetails() != null) { data.put("details", event.getAuthentication().getDetails()); } - publish(new AuditEvent(event.getAuthentication().getName(), - AUTHORIZATION_FAILURE, data)); + publish(new AuditEvent(event.getAuthentication().getName(), AUTHORIZATION_FAILURE, + data)); } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java index 20d54973fdb..37818fa174c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java @@ -346,8 +346,8 @@ public class CrshAutoConfigurationTests { && authentication.getCredentials().equals(PASSWORD)) { authentication = new UsernamePasswordAuthenticationToken( authentication.getPrincipal(), - authentication.getCredentials(), Collections - .singleton(new SimpleGrantedAuthority("ACTUATOR"))); + authentication.getCredentials(), Collections.singleton( + new SimpleGrantedAuthority("ACTUATOR"))); } else { throw new BadCredentialsException( diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java index 981459dcd2b..efc37364e8e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java @@ -269,8 +269,8 @@ public class EndpointMBeanExporterTests { MBeanExporter mbeanExporter = registerLoggersEndpoint(); Object response = mbeanExporter.getServer().invoke( getObjectName("loggersEndpoint", this.context), "setLogLevel", - new Object[]{"com.example", "trace"}, - new String[]{String.class.getName(), String.class.getName()}); + new Object[] { "com.example", "trace" }, + new String[] { String.class.getName(), String.class.getName() }); assertThat(response).isNull(); } @@ -280,10 +280,9 @@ public class EndpointMBeanExporterTests { this.thrown.expect(MBeanException.class); this.thrown.expectCause(hasMessage(containsString("No enum constant"))); this.thrown.expectCause(hasMessage(containsString("LogLevel.INVALID"))); - mbeanExporter.getServer().invoke( - getObjectName("loggersEndpoint", this.context), "setLogLevel", - new Object[]{"com.example", "invalid"}, - new String[]{String.class.getName(), String.class.getName()}); + mbeanExporter.getServer().invoke(getObjectName("loggersEndpoint", this.context), + "setLogLevel", new Object[] { "com.example", "invalid" }, + new String[] { String.class.getName(), String.class.getName() }); } private MBeanExporter registerLoggersEndpoint() { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java index e24fa49817f..c5c04e82b6d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java @@ -109,6 +109,7 @@ public class MvcEndpointsTests { TestMvcEndpoint(Endpoint delegate) { super(delegate); } + } private static class OtherTestMvcEndpoint extends EndpointMvcAdapter { @@ -116,6 +117,7 @@ public class MvcEndpointsTests { OtherTestMvcEndpoint(Endpoint delegate) { super(delegate); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java index 580477399f6..b1848800ecf 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java @@ -86,8 +86,8 @@ public class AuthenticationAuditListenerTests { AuditApplicationEvent event = handleAuthenticationEvent( new AuthenticationSwitchUserEvent( new UsernamePasswordAuthenticationToken("user", "password"), - new User("user", "password", - AuthorityUtils.commaSeparatedStringToAuthorityList("USER")))); + new User("user", "password", AuthorityUtils + .commaSeparatedStringToAuthorityList("USER")))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_SWITCH); } @@ -98,12 +98,12 @@ public class AuthenticationAuditListenerTests { UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken( "user", "password"); authentication.setDetails(details); - AuditApplicationEvent event = handleAuthenticationEvent(new AuthenticationFailureExpiredEvent( - authentication, new BadCredentialsException("Bad user"))); + AuditApplicationEvent event = handleAuthenticationEvent( + new AuthenticationFailureExpiredEvent(authentication, + new BadCredentialsException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_FAILURE); - assertThat(event.getAuditEvent().getData()) - .containsEntry("details", details); + assertThat(event.getAuditEvent().getData()).containsEntry("details", details); } private AuditApplicationEvent handleAuthenticationEvent( diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java index 7785202a521..e1410f3b37b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java @@ -56,7 +56,8 @@ public class AuthorizationAuditListenerTests { public void testAuthenticationCredentialsNotFound() { AuditApplicationEvent event = handleAuthorizationEvent( new AuthenticationCredentialsNotFoundEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), new AuthenticationCredentialsNotFoundException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_FAILURE); @@ -66,7 +67,8 @@ public class AuthorizationAuditListenerTests { public void testAuthorizationFailure() { AuditApplicationEvent event = handleAuthorizationEvent( new AuthorizationFailureEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), new UsernamePasswordAuthenticationToken("user", "password"), new AccessDeniedException("Bad user"))); assertThat(event.getAuditEvent().getType()) @@ -81,7 +83,8 @@ public class AuthorizationAuditListenerTests { authentication.setDetails(details); AuditApplicationEvent event = handleAuthorizationEvent( new AuthorizationFailureEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), authentication, new AccessDeniedException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthorizationAuditListener.AUTHORIZATION_FAILURE); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java index 2379fdb4a06..eeb9d29fe52 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java @@ -30,7 +30,6 @@ public enum SearchStrategy { /** * Search all parents and ancestors, but not the current context. - * * @deprecated since 1.5 in favor of {@link SearchStrategy#ANCESTORS} */ @Deprecated PARENTS, diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java index f10aec41ce1..1f1a3d08db5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java @@ -84,6 +84,7 @@ abstract class DataSourceConfiguration { /** * DBCP DataSource configuration. + * * @deprecated as of Spring Boot 1.5 in favor of DBCP2 */ @ConditionalOnClass(org.apache.commons.dbcp.BasicDataSource.class) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java index dde619245f5..bbe619a7bbb 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java @@ -124,8 +124,8 @@ class DataSourceInitializer implements ApplicationListener getScripts(String propertyName, - List resources, String fallback) { + private List getScripts(String propertyName, List resources, + String fallback) { if (resources != null) { return getResources(propertyName, resources, true); } @@ -136,8 +136,8 @@ class DataSourceInitializer implements ApplicationListener getResources(String propertyName, - List locations, boolean validate) { + private List getResources(String propertyName, List locations, + boolean validate) { List resources = new ArrayList(); for (String location : locations) { for (Resource resource : doGetResources(location)) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index 2dea5b54fd1..8a4b993945d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -130,6 +130,7 @@ public class JmsProperties { ? this.concurrency + "-" + this.maxConcurrency : String.valueOf(this.concurrency)); } + } public static class Template { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java index f5b735d1f69..54d580bad1a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java @@ -30,8 +30,8 @@ import org.springframework.jdbc.support.SQLExceptionTranslator; import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator; /** - * Transforms {@link java.sql.SQLException} into a Spring-specific {@link - * DataAccessException}. + * Transforms {@link java.sql.SQLException} into a Spring-specific + * {@link DataAccessException}. * * @author Lukas Eder * @author Andreas Ahlenstorf diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java index b25d8834434..628f3461540 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java @@ -56,7 +56,8 @@ public class ValidationAutoConfiguration { @Bean @ConditionalOnMissingBean - public MethodValidationPostProcessor methodValidationPostProcessor(Validator validator) { + public MethodValidationPostProcessor methodValidationPostProcessor( + Validator validator) { MethodValidationPostProcessor processor = new MethodValidationPostProcessor(); processor.setValidator(validator); return processor; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 00f9e586d10..a7def07eed3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -1554,6 +1554,7 @@ public class ServerProperties public void setRotate(boolean rotate) { this.rotate = rotate; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java index 99563aaf57f..8417a4e794c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java @@ -297,9 +297,8 @@ public class DataSourceInitializerTests { PropertyPlaceholderAutoConfiguration.class); EnvironmentTestUtils.addEnvironment(this.context, "spring.datasource.initialize:true", - "spring.datasource.schema:" - + ClassUtils.addResourcePathToPackagePath(getClass(), - "schema.sql"), + "spring.datasource.schema:" + ClassUtils + .addResourcePathToPackagePath(getClass(), "schema.sql"), "spring.datasource.data:classpath:does/not/exist.sql"); this.thrown.expect(BeanCreationException.class); 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 8bec1437e8a..b9337677ddf 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 @@ -67,14 +67,15 @@ public class ValidationAutoConfigurationTests { public void userDefinedMethodValidationPostProcessorTakesPrecedence() { load(SampleConfiguration.class); assertThat(this.context.getBeansOfType(Validator.class)).hasSize(1); - Object userMethodValidationPostProcessor = - this.context.getBean("testMethodValidationPostProcessor"); + Object userMethodValidationPostProcessor = this.context + .getBean("testMethodValidationPostProcessor"); assertThat(this.context.getBean(MethodValidationPostProcessor.class)) .isSameAs(userMethodValidationPostProcessor); assertThat(this.context.getBeansOfType(MethodValidationPostProcessor.class)) .hasSize(1); - assertThat(this.context.getBean(Validator.class)).isNotSameAs( - new DirectFieldAccessor(userMethodValidationPostProcessor).getPropertyValue("validator")); + assertThat(this.context.getBean(Validator.class)) + .isNotSameAs(new DirectFieldAccessor(userMethodValidationPostProcessor) + .getPropertyValue("validator")); } public void load(Class config) { diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java index 725437d6de8..ae25bc252c5 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java @@ -36,7 +36,8 @@ public class DependencyResolutionContextTests { @Test public void canAddSpringBootDependencies() { DependencyResolutionContext dependencyResolutionContext = new DependencyResolutionContext(); - dependencyResolutionContext.addDependencyManagement(new SpringBootDependenciesDependencyManagement()); + dependencyResolutionContext.addDependencyManagement( + new SpringBootDependenciesDependencyManagement()); assertThat(dependencyResolutionContext.getManagedDependencies()).isNotEmpty(); } diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java b/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java index 40b1680e8f6..515d8886925 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java @@ -35,7 +35,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest -@TestPropertySource(properties = {"endpoints.hypermedia.enabled: true", "management.security.enabled: false"}) +@TestPropertySource(properties = { "endpoints.hypermedia.enabled: true", + "management.security.enabled: false" }) public class SampleHypermediaGsonApplicationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java index 3dfbeffcff1..6f38b7f82c1 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java @@ -73,8 +73,8 @@ public class SampleMethodSecurityApplication extends WebMvcConfigurerAdapter { @Override public void init(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication().withUser("admin").password("admin") - .roles("ADMIN", "USER", "ACTUATOR").and().withUser("user").password("user") - .roles("USER"); + .roles("ADMIN", "USER", "ACTUATOR").and().withUser("user") + .password("user").roles("USER"); } } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java index 317afaac294..e363fb1c48a 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java @@ -25,9 +25,9 @@ import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; /** - * {@link ImportAutoConfiguration Auto-configuration imports} for typical jdbc tests. - * Most tests should consider using {@link JdbcTest @JdbcTest} rather than using - * this annotation directly. + * {@link ImportAutoConfiguration Auto-configuration imports} for typical jdbc tests. Most + * tests should consider using {@link JdbcTest @JdbcTest} rather than using this + * annotation directly. * * @author Stephane Nicoll * @since 1.5.0 @@ -38,4 +38,5 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @Documented @ImportAutoConfiguration public @interface AutoConfigureJdbc { + } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java index 8825771cdac..122b02712b7 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java @@ -49,10 +49,10 @@ class JdbcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { @Override protected ComponentScan.Filter[] getFilters(FilterType type) { switch (type) { - case INCLUDE: - return this.annotation.includeFilters(); - case EXCLUDE: - return this.annotation.excludeFilters(); + case INCLUDE: + return this.annotation.includeFilters(); + case EXCLUDE: + return this.annotation.excludeFilters(); } throw new IllegalStateException("Unsupported type " + type); } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java index 5234da155c0..09a827065d0 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java @@ -34,7 +34,8 @@ import org.springframework.boot.test.autoconfigure.properties.PropertyMapping; * instead of any application defined or auto-configured {@link DataSource}. * * @author Stephane Nicoll - * @deprecated since 1.5 in favour of {@link org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase} + * @deprecated since 1.5 in favour of + * {@link org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase} */ @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java index 6fcab228790..64264c88835 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java @@ -62,16 +62,14 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests { @Primary public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } @Bean public DataSource secondaryDataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java index d14eaf3f929..cc41a38cd7b 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java @@ -34,8 +34,7 @@ public class ExampleJdbcApplication { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java index 6247b2e4187..db6a80933cf 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java @@ -49,8 +49,9 @@ public class ExampleRepository { } public ExampleEntity findById(int id) { - return this.jdbcTemplate.queryForObject("select id, name from example where id =?", - new Object[] { id }, ROW_MAPPER); + return this.jdbcTemplate.queryForObject( + "select id, name from example where id =?", new Object[] { id }, + ROW_MAPPER); } public Collection findAll() { @@ -65,6 +66,7 @@ public class ExampleRepository { String name = rs.getString("name"); return new ExampleEntity(id, name); } + } } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java index cc4902ae6c4..218f46e4bfa 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java @@ -61,8 +61,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTest @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.H2); + .generateUniqueName(true).setType(EmbeddedDatabaseType.H2); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java index f223d8a898b..4dcad35dcef 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java @@ -63,8 +63,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationT @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.H2); + .generateUniqueName(true).setType(EmbeddedDatabaseType.H2); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java index 650bf6caa97..069310c2624 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java @@ -93,8 +93,7 @@ public class TestDatabaseAutoConfigurationTests { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java index cb84ae81eaa..9dd732b5653 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java @@ -76,8 +76,7 @@ public class DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationT @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.H2); + .generateUniqueName(true).setType(EmbeddedDatabaseType.H2); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java index 022996d0857..188f336328b 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java @@ -34,8 +34,7 @@ public class ExampleDataJpaApplication { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java index 5ea2c26a13f..c5aa5e7d162 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java @@ -68,8 +68,7 @@ public class WebMvcTestAllControllersIntegrationTests { @Test public void shouldRunValidationSuccess() throws Exception { - this.mvc.perform(get("/three/OK")) - .andExpect(status().isOk()) + this.mvc.perform(get("/three/OK")).andExpect(status().isOk()) .andExpect(content().string("Hello OK")); } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java index 7d6c662f106..1c735eebc57 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java @@ -59,7 +59,8 @@ class TypeElementMembers { private final FieldValuesParser fieldValuesParser; - TypeElementMembers(ProcessingEnvironment env, FieldValuesParser fieldValuesParser, TypeElement element) { + TypeElementMembers(ProcessingEnvironment env, FieldValuesParser fieldValuesParser, + TypeElement element) { this.env = env; this.typeUtils = new TypeUtils(this.env); this.fieldValuesParser = fieldValuesParser; 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 bf3ffba5895..69ba7d4ba07 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 @@ -357,10 +357,18 @@ public class ConfigurationMetadataAnnotationProcessorTests { ConfigurationMetadata metadata = compile(ClassWithNestedProperties.class); assertThat(metadata).has(Metadata.withGroup("nestedChildProps") .fromSource(ClassWithNestedProperties.NestedChildClass.class)); - assertThat(metadata).has(Metadata.withProperty("nestedChildProps.child-class-property", Integer.class) - .fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(20)); - assertThat(metadata).has(Metadata.withProperty("nestedChildProps.parent-class-property", Integer.class) - .fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(10)); + assertThat(metadata) + .has(Metadata + .withProperty("nestedChildProps.child-class-property", + Integer.class) + .fromSource(ClassWithNestedProperties.NestedChildClass.class) + .withDefaultValue(20)); + assertThat(metadata) + .has(Metadata + .withProperty("nestedChildProps.parent-class-property", + Integer.class) + .fromSource(ClassWithNestedProperties.NestedChildClass.class) + .withDefaultValue(10)); } @Test diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java index fc3e4abe6ad..247fcea05f1 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java @@ -52,6 +52,7 @@ public class DeprecatedMethodConfig { public void setFlag(boolean flag) { this.flag = flag; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java index 80aaa6c2f2e..bec8e0f6638 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java @@ -36,6 +36,7 @@ public class ClassWithNestedProperties { public void setParentClassProperty(int parentClassProperty) { this.parentClassProperty = parentClassProperty; } + } @ConfigurationProperties(prefix = "nestedChildProps") @@ -50,5 +51,7 @@ public class ClassWithNestedProperties { public void setChildClassProperty(int childClassProperty) { this.childClassProperty = childClassProperty; } + } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index 0612b41c186..a2f71f8c59c 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -392,7 +392,6 @@ public abstract class MainClassFinder { * Creates a new {@code MainClass} rather represents the main class with the given * {@code name}. The class is annotated with the annotations with the given * {@code annotationNames}. - * * @param name the name of the class * @param annotationNames the names of the annotations on the class */ diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java index 6efca10a316..59f94407a82 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java @@ -65,7 +65,8 @@ public class ExplodedArchive implements Archive { * Create a new {@link ExplodedArchive} instance. * @param root the root folder * @param recursive if recursive searching should be used to locate the manifest. - * Defaults to {@code true}, folders with a large tree might want to set this to {@code + * Defaults to {@code true}, folders with a large tree might want to set this to + * {@code * false}. */ public ExplodedArchive(File root, boolean recursive) { 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 4eb94098e1d..187cfdb1641 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 @@ -412,8 +412,8 @@ public class UndertowEmbeddedServletContainerFactory String prefix = (this.accessLogPrefix != null ? this.accessLogPrefix : "access_log."); AccessLogReceiver accessLogReceiver = new DefaultAccessLogReceiver( - createWorker(), this.accessLogDirectory, prefix, - this.accessLogSuffix, this.accessLogRotate); + createWorker(), this.accessLogDirectory, prefix, this.accessLogSuffix, + this.accessLogRotate); String formatString = (this.accessLogPattern != null) ? this.accessLogPattern : "common"; return new AccessLogHandler(handler, accessLogReceiver, formatString, diff --git a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java index 97deea95440..27bd772fef1 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java +++ b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java @@ -164,7 +164,7 @@ public enum DatabaseDriver { * Informix. */ INFORMIX("informix", "Informix Dynamic Server", "com.informix.jdbc.IfxDriver", null, - "select count(*) from systables") { + "select count(*) from systables") { @Override protected Collection getUrlPrefixes() { diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java index e84f025026a..376c13ef990 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java @@ -184,6 +184,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem { /** * Maintains a mapping between native levels and {@link LogLevel}. + * * @param The native level type */ protected static class LogLevels { diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java index 6f4c32d2ca3..4d33be2ff7c 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java @@ -48,9 +48,9 @@ public abstract class LoggingSystem { public static final String NONE = "none"; /** - * The name used for the root logger. LoggingSystem implementations should ensure - * that this is the name used to represent the root logger, regardless of the - * underlying implementation. + * The name used for the root logger. LoggingSystem implementations should ensure that + * this is the name used to represent the root logger, regardless of the underlying + * implementation. */ public static final String ROOT_LOGGER_NAME = "ROOT"; diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java index 281a8eabc69..aeef5859c5f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java +++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java @@ -75,16 +75,15 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy { } String text = builder.toString(); - String finalText = isCaseInsensitive(jdbcEnvironment) ? text.toLowerCase(Locale.ROOT) - : text; + String finalText = isCaseInsensitive(jdbcEnvironment) + ? text.toLowerCase(Locale.ROOT) : text; return new Identifier(finalText, name.isQuoted()); } /** * Specify whether the database is case sensitive. * @param jdbcEnvironment The JDBC environment which can be used to determine case - * @return true if the database is case insensitive - * sensitivity + * @return true if the database is case insensitive sensitivity */ protected boolean isCaseInsensitive(JdbcEnvironment jdbcEnvironment) { return true; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java index eabcf282938..492e2f81a14 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java @@ -699,6 +699,7 @@ public class EnableConfigurationPropertiesTests { } // No getter - you should be able to bind to a write-only bean + } // No annotation diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java index c6010bc8e9b..9fe1f8dcdf3 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java @@ -176,7 +176,8 @@ public class JavaLoggingSystemTests extends AbstractLoggingSystemTests { List configurations = this.loggingSystem .getLoggerConfigurations(); assertThat(configurations).isNotEmpty(); - assertThat(configurations.get(0).getName()).isEqualTo(LoggingSystem.ROOT_LOGGER_NAME); + assertThat(configurations.get(0).getName()) + .isEqualTo(LoggingSystem.ROOT_LOGGER_NAME); } @Test diff --git a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java index 39353f2103e..8adeee8bfc4 100644 --- a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java @@ -70,13 +70,14 @@ public class SpringPhysicalNamingStrategyTests { @Test public void tableNameShouldNotBeLowerCaseIfCaseSensitive() throws Exception { this.metadata = this.metadataSources.getMetadataBuilder(this.serviceRegistry) - .applyPhysicalNamingStrategy(new TestSpringPhysicalNamingStrategy()).build(); + .applyPhysicalNamingStrategy(new TestSpringPhysicalNamingStrategy()) + .build(); PersistentClass binding = this.metadata .getEntityBinding(TelephoneNumber.class.getName()); assertThat(binding.getTable().getQuotedName()).isEqualTo("Telephone_Number"); } - private class TestSpringPhysicalNamingStrategy extends SpringPhysicalNamingStrategy { + private class TestSpringPhysicalNamingStrategy extends SpringPhysicalNamingStrategy { @Override protected boolean isCaseInsensitive(JdbcEnvironment jdbcEnvironment) { @@ -84,4 +85,5 @@ public class SpringPhysicalNamingStrategyTests { } } + } From d15f3548be88a0eed528bd69aee6a4e6837763f7 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 19 Dec 2016 13:12:03 -0800 Subject: [PATCH 4/4] Polish --- ...CloudFoundryActuatorAutoConfiguration.java | 1 - .../SpringPhysicalNamingStrategy.java | 21 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java index d5b2feea7f4..9df978a816f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java @@ -101,7 +101,6 @@ public class CloudFoundryActuatorAutoConfiguration { /** * Nested configuration for ignored requests if Spring Security is present. - * */ @ConditionalOnClass(WebSecurity.class) static class CloudFoundryIgnoredRequestConfiguration { diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java index aeef5859c5f..070ccf3579a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java +++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java @@ -73,11 +73,24 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy { builder.insert(i++, '_'); } } + return getIdentifier(builder.toString(), name.isQuoted(), jdbcEnvironment); + } - String text = builder.toString(); - String finalText = isCaseInsensitive(jdbcEnvironment) - ? text.toLowerCase(Locale.ROOT) : text; - return new Identifier(finalText, name.isQuoted()); + /** + * Get an the identifier for the specified details. By default his method will return + * an identifier with the name adapted based on the result of + * {@link #isCaseInsensitive(JdbcEnvironment)} + * @param name the name of the identifier + * @param quoted if the identifier is quoted + * @param jdbcEnvironment the JDBC environment + * @return an identifier instance + */ + protected Identifier getIdentifier(String name, boolean quoted, + JdbcEnvironment jdbcEnvironment) { + if (isCaseInsensitive(jdbcEnvironment)) { + name = name.toLowerCase(Locale.ROOT); + } + return new Identifier(name, quoted); } /**