From a79131f8d2ed5817288717014f20dafdbc3e2412 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 19 Oct 2015 12:23:14 -0700 Subject: [PATCH] Organize imports with new settings See gh-4234 --- .../actuate/audit/listener/AuditListener.java | 1 + .../autoconfigure/CrshAutoConfiguration.java | 1 + .../EndpointWebMvcAutoConfiguration.java | 1 + ...dpointWebMvcChildContextConfiguration.java | 1 + .../HealthIndicatorAutoConfiguration.java | 1 + .../JolokiaAutoConfiguration.java | 1 + .../MetricRepositoryAutoConfiguration.java | 4 +-- .../actuate/autoconfigure/MetricsFilter.java | 1 + .../PublicMetricsAutoConfiguration.java | 1 + .../autoconfigure/ShellProperties.java | 1 + .../AutoConfigurationReportEndpoint.java | 8 ++--- ...ConfigurationPropertiesReportEndpoint.java | 26 ++++++++-------- .../actuate/endpoint/TomcatPublicMetrics.java | 1 + .../actuate/endpoint/jmx/EndpointMBean.java | 4 +-- .../endpoint/jmx/EndpointMBeanExporter.java | 1 + .../endpoint/mvc/JolokiaMvcEndpoint.java | 1 + .../health/DiskSpaceHealthIndicator.java | 1 + .../boot/actuate/health/Health.java | 4 +-- .../actuate/health/MongoHealthIndicator.java | 4 +-- .../actuate/health/RabbitHealthIndicator.java | 4 +-- .../boot/actuate/health/Status.java | 6 ++-- .../reader/MetricRegistryMetricReader.java | 20 ++++++------- .../metrics/writer/CodahaleMetricWriter.java | 4 +-- .../writer/DropwizardMetricWriter.java | 4 +-- .../writer/MetricWriterMessageHandler.java | 1 + .../system/ApplicationPidFileWriter.java | 1 + .../system/EmbeddedServerPortFileWriter.java | 1 + .../actuate/trace/WebRequestTraceFilter.java | 1 + .../audit/listener/AuditListenerTests.java | 1 + .../AuditAutoConfigurationTests.java | 1 + .../CrshAutoConfigurationTests.java | 1 + .../EndpointAutoConfigurationTests.java | 1 + ...ointMBeanExportAutoConfigurationTests.java | 1 + .../EndpointMvcIntegrationTests.java | 1 + .../EndpointWebMvcAutoConfigurationTests.java | 1 + ...HealthIndicatorAutoConfigurationTests.java | 1 + ...althMvcEndpointAutoConfigurationTests.java | 1 + .../JolokiaAutoConfigurationTests.java | 1 + ...agementSecurityAutoConfigurationTests.java | 1 + .../MetricFilterAutoConfigurationTests.java | 1 + ...etricRepositoryAutoConfigurationTests.java | 6 ++-- .../PublicMetricsAutoConfigurationTests.java | 4 +-- .../autoconfigure/ShellPropertiesTests.java | 1 + .../SpringApplicationHierarchyTests.java | 1 + ...TraceRepositoryAutoConfigurationTests.java | 1 + .../TraceWebFilterAutoConfigurationTests.java | 1 + .../endpoint/AbstractEndpointTests.java | 1 + .../AutoConfigurationReportEndpointTests.java | 1 + .../actuate/endpoint/BeansEndpointTests.java | 1 + ...sReportEndpointMethodAnnotationsTests.java | 1 + ...onPropertiesReportEndpointParentTests.java | 1 + ...ionPropertiesReportEndpointProxyTests.java | 1 + ...rtiesReportEndpointSerializationTests.java | 1 + ...gurationPropertiesReportEndpointTests.java | 1 + .../actuate/endpoint/DumpEndpointTests.java | 1 + .../endpoint/EnvironmentEndpointTests.java | 1 + .../actuate/endpoint/HealthEndpointTests.java | 1 + .../actuate/endpoint/InfoEndpointTests.java | 1 + .../MetricReaderPublicMetricsTests.java | 1 + .../endpoint/MetricsEndpointTests.java | 1 + .../endpoint/RequestMappingEndpointTests.java | 1 + .../RichGaugeReaderPublicMetricsTests.java | 1 + .../endpoint/ShutdownEndpointTests.java | 1 + .../endpoint/ShutdownParentEndpointTests.java | 1 + .../endpoint/SystemPublicMetricsTests.java | 1 + .../endpoint/TomcatPublicMetricsTests.java | 1 + .../actuate/endpoint/TraceEndpointTests.java | 1 + .../endpoint/VanillaPublicMetricsTests.java | 1 + .../jmx/EndpointMBeanExporterTests.java | 1 + .../mvc/EndpointHandlerMappingTests.java | 1 + .../mvc/EnvironmentMvcEndpointTests.java | 1 + .../endpoint/mvc/HealthMvcEndpointTests.java | 1 + .../JolokiaMvcEndpointContextPathTests.java | 1 + .../endpoint/mvc/JolokiaMvcEndpointTests.java | 1 + .../endpoint/mvc/MetricsMvcEndpointTests.java | 1 + .../endpoint/mvc/MvcEndpointsTests.java | 1 + .../mvc/ShutdownMvcEndpointTests.java | 1 + .../health/CompositeHealthIndicatorTests.java | 3 +- .../DataSourceHealthIndicatorTests.java | 1 + .../health/MongoHealthIndicatorTests.java | 6 ++-- .../health/RabbitHealthIndicatorTests.java | 1 + .../health/RedisHealthIndicatorTests.java | 1 + .../health/SolrHealthIndicatorTests.java | 1 + .../export/MetricCopyExporterTests.java | 1 + .../PrefixMetricGroupExporterTests.java | 1 + .../export/RichGaugeExporterTests.java | 1 + .../MetricRegistryMetricReaderTests.java | 6 ++-- .../InMemoryMetricRepositoryTests.java | 1 + .../InMemoryPrefixMetricRepositoryTests.java | 1 + .../redis/RedisMetricRepositoryTests.java | 1 + .../RedisMultiMetricRepositoryTests.java | 1 + .../metrics/repository/redis/RedisServer.java | 1 + .../InMemoryRichGaugeRepositoryTests.java | 1 + .../rich/MultiMetricRichGaugeReaderTests.java | 1 + .../metrics/util/InMemoryRepositoryTests.java | 1 + .../writer/DefaultGaugeServiceTests.java | 1 + .../writer/DropwizardMetricWriterTests.java | 6 ++-- .../MessageChannelMetricWriterTests.java | 1 + .../AuthenticationAuditListenerTests.java | 1 + .../AuthorizationAuditListenerTests.java | 1 + .../system/ApplicationPidFileWriterTests.java | 1 + .../EmbeddedServerPortFileWriterTests.java | 1 + .../trace/WebRequestTraceFilterTests.java | 1 + .../AutoConfigurationPackages.java | 1 + .../amqp/RabbitAutoConfiguration.java | 4 +-- .../aop/AopAutoConfiguration.java | 1 + .../batch/BasicBatchConfigurer.java | 1 + .../batch/JobLauncherCommandLineRunner.java | 1 + .../condition/BeanTypeRegistry.java | 1 + .../condition/OnBeanCondition.java | 1 + .../condition/SpringBootCondition.java | 1 + ...icsearchRepositoriesAutoConfiguration.java | 1 + .../MongoRepositoriesAutoConfiguration.java | 4 +-- ...ingBootRepositoryRestMvcConfiguration.java | 4 +-- .../SolrRepositoriesAutoConfiguration.java | 1 + .../ElasticsearchAutoConfiguration.java | 1 + .../ElasticsearchDataAutoConfiguration.java | 1 + .../flyway/FlywayAutoConfiguration.java | 1 + .../flyway/FlywayProperties.java | 1 + .../GroovyTemplateAutoConfiguration.java | 4 +-- .../template/GroovyTemplateResolver.java | 8 ++--- .../gson/GsonAutoConfiguration.java | 4 +-- .../hateoas/HypermediaAutoConfiguration.java | 4 +-- .../jackson/JacksonAutoConfiguration.java | 16 +++++----- .../jackson/JacksonProperties.java | 4 +-- .../jdbc/DataSourceAutoConfiguration.java | 1 + .../jdbc/DataSourceConfigMetadata.java | 4 +-- .../jdbc/DataSourceInitializer.java | 1 + ...rcePoolMetadataProvidersConfiguration.java | 4 +-- .../HikariDataSourcePoolMetadata.java | 4 +-- .../jersey/JerseyAutoConfiguration.java | 1 + .../activemq/ActiveMQAutoConfiguration.java | 1 + ...ctiveMQConnectionFactoryConfiguration.java | 1 + .../ActiveMQConnectionFactoryFactory.java | 1 + ...iveMQXAConnectionFactoryConfiguration.java | 1 + .../jms/hornetq/HornetQAutoConfiguration.java | 1 + ...HornetQConnectionFactoryConfiguration.java | 1 + .../HornetQConnectionFactoryFactory.java | 1 + .../HornetQEmbeddedConfigurationFactory.java | 1 + .../HornetQEmbeddedServerConfiguration.java | 1 + .../jms/hornetq/HornetQProperties.java | 1 + ...rnetQXAConnectionFactoryConfiguration.java | 1 + .../jta/AtomikosJtaConfiguration.java | 8 ++--- .../jta/BitronixJtaConfiguration.java | 6 ++-- .../liquibase/LiquibaseAutoConfiguration.java | 6 ++-- .../liquibase/LiquibaseProperties.java | 4 +-- ...ConfigurationReportLoggingInitializer.java | 1 + ...legatingViewResolverAutoConfiguration.java | 3 +- .../mongo/MongoAutoConfiguration.java | 6 ++-- .../mongo/MongoDataAutoConfiguration.java | 6 ++-- .../autoconfigure/mongo/MongoProperties.java | 4 +-- .../mustache/MustacheAutoConfiguration.java | 10 +++---- .../mustache/MustacheCompilerFactoryBean.java | 4 +-- .../MustacheEnvironmentCollector.java | 8 ++--- .../MustacheResourceTemplateLoader.java | 6 ++-- .../mustache/web/MustacheView.java | 4 +-- .../mustache/web/MustacheViewResolver.java | 8 ++--- .../jpa/HibernateJpaAutoConfiguration.java | 1 + .../autoconfigure/orm/jpa/JpaProperties.java | 1 + .../reactor/ReactorAutoConfiguration.java | 8 ++--- .../redis/RedisAutoConfiguration.java | 6 ++-- .../AuthenticationManagerConfiguration.java | 1 + ...BootGlobalAuthenticationConfiguration.java | 1 + .../social/SocialWebAutoConfiguration.java | 3 +- .../solr/SolrAutoConfiguration.java | 1 + .../thymeleaf/ThymeleafAutoConfiguration.java | 23 +++++++------- .../velocity/VelocityAutoConfiguration.java | 1 + ...ddedServletContainerAutoConfiguration.java | 6 ++-- ...sonHttpMessageConvertersConfiguration.java | 4 +-- .../web/GzipFilterAutoConfiguration.java | 1 + .../web/GzipFilterProperties.java | 1 + .../web/HttpMapperProperties.java | 4 +-- ...sonHttpMessageConvertersConfiguration.java | 6 ++-- .../autoconfigure/web/ServerProperties.java | 1 + .../web/WebMvcAutoConfiguration.java | 1 + .../JettyWebSocketContainerCustomizer.java | 1 + .../TomcatWebSocketContainerCustomizer.java | 1 + .../UndertowWebSocketContainerCustomizer.java | 6 ++-- .../websocket/WebSocketAutoConfiguration.java | 1 + .../WebSocketContainerCustomizer.java | 1 + .../boot/autoconfigure/AdhocTestSuite.java | 1 + .../AutoConfigurationPackagesTests.java | 1 + .../AutoConfigurationReproTests.java | 1 + .../AutoConfigurationSorterTests.java | 1 + ...urceAutoConfigurationIntegrationTests.java | 1 + ...geSourceAutoConfigurationProfileTests.java | 1 + .../MessageSourceAutoConfigurationTests.java | 1 + ...ertyPlaceholderAutoConfigurationTests.java | 1 + .../boot/autoconfigure/SpringJUnitTests.java | 1 + .../amqp/RabbitAutoConfigurationTests.java | 1 + .../aop/AopAutoConfigurationTests.java | 1 + .../batch/BatchAutoConfigurationTests.java | 1 + .../JobExecutionExitCodeGeneratorTests.java | 1 + .../JobLauncherCommandLineRunnerTests.java | 1 + .../cloud/CloudAutoConfigurationTests.java | 1 + .../condition/AnyNestedConditionTests.java | 1 + .../ConditionEvaluationReportTests.java | 1 + .../condition/ConditionalOnBeanTests.java | 1 + .../condition/ConditionalOnClassTests.java | 1 + .../ConditionalOnExpressionTests.java | 1 + .../condition/ConditionalOnJavaTests.java | 1 + .../condition/ConditionalOnJndiTests.java | 1 + .../ConditionalOnMissingBeanTests.java | 1 + .../ConditionalOnMissingClassTests.java | 1 + .../ConditionalOnNotWebApplicationTests.java | 1 + .../condition/ConditionalOnPropertyTests.java | 1 + .../condition/ConditionalOnResourceTests.java | 1 + .../ConditionalOnWebApplicationTests.java | 1 + .../condition/SpringBootConditionTests.java | 1 + ...tionTranslationAutoConfigurationTests.java | 1 + ...rchRepositoriesAutoConfigurationTests.java | 1 + ...JpaRepositoriesAutoConfigurationTests.java | 1 + .../jpa/JpaWebAutoConfigurationTests.java | 1 + ...ngoRepositoriesAutoConfigurationTests.java | 1 + ...ngoRepositoriesAutoConfigurationTests.java | 6 ++-- ...positoryRestMvcAutoConfigurationTests.java | 6 ++-- ...olrRepositoriesAutoConfigurationTests.java | 1 + .../SpringDataWebAutoConfigurationTests.java | 1 + .../ElasticsearchAutoConfigurationTests.java | 1 + ...asticsearchDataAutoConfigurationTests.java | 1 + .../flyway/FlywayAutoConfigurationTests.java | 1 + .../FreeMarkerAutoConfigurationTests.java | 1 + ...rkerTemplateAvailabilityProviderTests.java | 1 + .../GroovyTemplateAutoConfigurationTests.java | 4 +-- .../gson/GsonAutoConfigurationTests.java | 4 +-- .../HypermediaAutoConfigurationTests.java | 6 ++-- .../IntegrationAutoConfigurationTests.java | 1 + .../JacksonAutoConfigurationTests.java | 28 ++++++++--------- .../CommonsDataSourceConfigurationTests.java | 1 + .../DataSourceAutoConfigurationTests.java | 4 +-- .../jdbc/DataSourceInitializerTests.java | 1 + .../DataSourceJsonSerializationTests.java | 16 +++++----- ...nsactionManagerAutoConfigurationTests.java | 1 + .../EmbeddedDataSourceConfigurationTests.java | 1 + .../HikariDataSourceConfigurationTests.java | 4 +-- .../JndiDataSourceAutoConfigurationTests.java | 1 + .../TomcatDataSourceConfigurationTests.java | 1 + .../XADataSourceAutoConfigurationTests.java | 1 + .../AbstractDataSourcePoolMetadataTests.java | 1 + .../HikariDataSourcePoolMetadataTests.java | 3 +- ...igurationCustomFilterContextPathTests.java | 1 + ...utoConfigurationCustomFilterPathTests.java | 1 + ...gurationCustomServletContextPathTests.java | 1 + ...toConfigurationCustomServletPathTests.java | 1 + ...toConfigurationDefaultFilterPathTests.java | 1 + ...oConfigurationDefaultServletPathTests.java | 1 + .../jms/JmsAutoConfigurationTests.java | 1 + .../ActiveMQAutoConfigurationTests.java | 1 + .../HornetQAutoConfigurationTests.java | 1 + .../jmx/JmxAutoConfigurationTests.java | 1 + .../jta/JtaAutoConfigurationTests.java | 8 ++--- .../LiquibaseAutoConfigurationTests.java | 4 +-- ...gurationReportLoggingInitializerTests.java | 1 + .../MailSenderAutoConfigurationTests.java | 1 + ...ingViewResolverAutoConfigurationTests.java | 3 +- .../DeviceResolverAutoConfigurationTests.java | 1 + .../SitePreferenceAutoConfigurationTests.java | 1 + .../mongo/MongoAutoConfigurationTests.java | 6 ++-- .../MongoDataAutoConfigurationTests.java | 4 +-- .../mongo/MongoPropertiesTests.java | 8 ++--- ...acheAutoConfigurationIntegrationTests.java | 1 + .../MustacheStandaloneIntegrationTests.java | 4 +-- .../web/MustacheViewResolverTests.java | 1 + .../mustache/web/MustacheViewTests.java | 4 +-- .../web/MustacheWebIntegrationTests.java | 6 ++-- .../AbstractJpaAutoConfigurationTests.java | 1 + ...tomHibernateJpaAutoConfigurationTests.java | 1 + .../jpa/EntityManagerFactoryBuilderTests.java | 1 + .../HibernateJpaAutoConfigurationTests.java | 1 + .../ReactorAutoConfigurationTests.java | 8 ++--- .../redis/RedisAutoConfigurationTests.java | 4 +-- .../SecurityAutoConfigurationTests.java | 1 + .../security/SecurityPropertiesTests.java | 1 + ...ringBootWebSecurityConfigurationTests.java | 1 + .../security/jpa/JpaUserDetailsTests.java | 1 + .../AbstractSocialAutoConfigurationTests.java | 1 + .../FacebookAutoConfigurationTests.java | 1 + .../LinkedInAutoConfigurationTests.java | 1 + .../MultiApiAutoConfigurationTests.java | 1 + .../social/TwitterAutoConfigurationTests.java | 1 + .../ThymeleafAutoConfigurationTests.java | 13 ++++---- ...leafTemplateAvailabilityProviderTests.java | 1 + .../VelocityAutoConfigurationTests.java | 1 + ...cityTemplateAvailabilityProviderTests.java | 1 + ...asicErrorControllerDirectMockMvcTests.java | 1 + .../BasicErrorControllerIntegrationTests.java | 1 + .../web/BasicErrorControllerMockMvcTests.java | 1 + .../web/DefaultErrorAttributesTests.java | 1 + .../web/DefaultErrorViewIntegrationTests.java | 1 + ...spatcherServletAutoConfigurationTests.java | 1 + ...ervletContainerAutoConfigurationTests.java | 1 + ...tContainerServletContextListenerTests.java | 1 + .../web/GzipFilterAutoConfigurationTests.java | 1 + .../HttpEncodingAutoConfigurationTests.java | 1 + ...ssageConvertersAutoConfigurationTests.java | 6 ++-- .../web/HttpMessageConvertersTests.java | 1 + .../web/MultipartAutoConfigurationTests.java | 1 + .../RemappedErrorViewIntegrationTests.java | 1 + ...erverPropertiesAutoConfigurationTests.java | 1 + .../web/ServerPropertiesTests.java | 1 + .../web/WebMvcAutoConfigurationTests.java | 1 + .../WebSocketAutoConfigurationTests.java | 1 + .../boot/cli/CommandLineIT.java | 1 + .../boot/cli/JarCommandIT.java | 1 + .../boot/cli/command/grab/GrabCommand.java | 4 +-- .../boot/cli/command/init/InitCommand.java | 6 ++-- .../cli/command/init/InitializrService.java | 1 + .../init/ProjectGenerationRequest.java | 1 + .../install/GroovyGrabDependencyResolver.java | 1 + .../cli/command/install/InstallCommand.java | 4 +-- .../boot/cli/command/install/Installer.java | 4 +-- .../cli/command/install/UninstallCommand.java | 6 ++-- .../boot/cli/command/jar/JarCommand.java | 8 ++--- .../cli/command/options/OptionHandler.java | 6 ++-- .../OptionSetGroovyCompilerConfiguration.java | 6 ++-- .../cli/command/options/SourceOptions.java | 4 +-- .../boot/cli/command/run/RunCommand.java | 6 ++-- .../boot/cli/command/shell/AnsiString.java | 3 +- .../boot/cli/command/shell/ClearCommand.java | 4 +-- .../cli/command/shell/CommandCompleter.java | 8 ++--- .../boot/cli/command/shell/Shell.java | 6 ++-- .../boot/cli/command/test/TestCommand.java | 4 +-- .../boot/cli/compiler/AstUtils.java | 1 + .../compiler/CompilerAutoConfiguration.java | 3 +- ...ndencyAutoConfigurationTransformation.java | 4 +-- .../cli/compiler/DependencyCustomizer.java | 6 ++-- .../compiler/ExtendedGroovyClassLoader.java | 4 +-- .../compiler/GrabMetadataTransformation.java | 4 +-- .../compiler/GroovyBeansTransformation.java | 1 + .../boot/cli/compiler/GroovyCompiler.java | 8 ++--- .../RepositoryConfigurationFactory.java | 1 + ...veDependencyCoordinatesTransformation.java | 4 +-- .../CachingCompilerAutoConfiguration.java | 1 + ...ovyTemplatesCompilerAutoConfiguration.java | 1 + .../JUnitCompilerAutoConfiguration.java | 1 + .../JdbcCompilerAutoConfiguration.java | 1 + .../JmsCompilerAutoConfiguration.java | 1 + .../RabbitCompilerAutoConfiguration.java | 1 + .../ReactorCompilerAutoConfiguration.java | 1 + .../SpockCompilerAutoConfiguration.java | 1 + .../SpringBatchCompilerAutoConfiguration.java | 1 + .../SpringBootCompilerAutoConfiguration.java | 4 +-- ...gIntegrationCompilerAutoConfiguration.java | 1 + ...SpringMobileCompilerAutoConfiguration.java | 1 + .../SpringMvcCompilerAutoConfiguration.java | 1 + ...ringSecurityCompilerAutoConfiguration.java | 1 + ...cialFacebookCompilerAutoConfiguration.java | 1 + ...cialLinkedInCompilerAutoConfiguration.java | 1 + ...ocialTwitterCompilerAutoConfiguration.java | 1 + .../SpringTestCompilerAutoConfiguration.java | 4 +-- ...ingWebsocketCompilerAutoConfiguration.java | 1 + ...onManagementCompilerAutoConfiguration.java | 1 + .../cli/compiler/grape/AetherGrapeEngine.java | 5 ++-- .../grape/AetherGrapeEngineFactory.java | 3 +- ...ositorySystemSessionAutoConfiguration.java | 1 + .../grape/DependencyResolutionContext.java | 1 + ...ositorySystemSessionAutoConfiguration.java | 1 + .../grape/ManagedDependenciesFactory.java | 1 + ...ositorySystemSessionAutoConfiguration.java | 1 + .../boot/groovy/DelegateTestRunner.java | 1 + .../boot/groovy/GroovyTemplate.java | 3 +- .../springframework/boot/cli/CliTester.java | 1 + .../boot/cli/GrabCommandIntegrationTests.java | 1 + .../boot/cli/TestCommandIntegrationTests.java | 1 + .../CommandRunnerIntegrationTests.java | 1 + .../boot/cli/command/CommandRunnerTests.java | 1 + .../command/OptionParsingCommandTests.java | 1 + .../init/AbstractHttpClientMockTests.java | 1 + .../cli/command/init/InitCommandTests.java | 4 +-- .../init/InitializrServiceMetadataTests.java | 1 + .../init/ProjectGenerationRequestTests.java | 1 + .../GroovyGrabDependencyResolverTests.java | 1 + .../cli/command/install/InstallerTests.java | 1 + .../cli/command/jar/ResourceMatcherTests.java | 1 + ...AwareWhiteSpaceArgumentDelimiterTests.java | 3 +- .../compiler/DependencyCustomizerTests.java | 6 ++-- ...endencyCoordinatesTransformationTests.java | 4 +-- ...nciesArtifactCoordinatesResolverTests.java | 1 + .../grape/AetherGrapeEngineTests.java | 4 +-- .../ManagedDependenciesFactoryTests.java | 1 + .../boot/cli/util/ResourceUtilsTests.java | 1 + .../SampleTomcatDeployApplicationIT.java | 1 + .../SampleTomEEDeployApplicationIT.java | 1 + .../SampleWildFlyDeployApplicationIT.java | 1 + .../boot/gradle/BootRunResourceTests.java | 1 + .../boot/gradle/ClassifierTests.java | 1 + .../gradle/CustomVersionManagementTests.java | 1 + .../boot/gradle/FlatdirTests.java | 1 + .../boot/gradle/InstallTests.java | 1 + .../boot/gradle/MainClassTests.java | 1 + .../gradle/MultiProjectRepackagingTests.java | 1 + .../boot/gradle/NoJarTests.java | 1 + .../boot/gradle/ProjectCreator.java | 1 + .../boot/gradle/RepackagingTests.java | 1 + .../boot/gradle/SpringLoadedTests.java | 1 + .../boot/gradle/WarPackagingTests.java | 1 + .../StarterDependenciesIntegrationTests.java | 1 + .../HelloWebSecurityApplicationTests.java | 1 + .../log4j/SampleActuatorApplicationTests.java | 1 + .../SampleActuatorApplicationTests.java | 1 + .../SampleActuatorNoWebApplicationTests.java | 1 + .../SampleActuatorUiApplicationPortTests.java | 1 + .../ui/SampleActuatorUiApplicationTests.java | 1 + .../sample/actuator/SampleController.java | 1 + ...pertiesSampleActuatorApplicationTests.java | 1 + ...gementAddressActuatorApplicationTests.java | 1 + ...entPathSampleActuatorApplicationTests.java | 1 + ...entPortSampleActuatorApplicationTests.java | 1 + ...agementSampleActuatorApplicationTests.java | 1 + .../actuator/NonSensitiveHealthTests.java | 1 + .../SampleActuatorApplicationTests.java | 1 + ...letPathSampleActuatorApplicationTests.java | 1 + ...nsecureSampleActuatorApplicationTests.java | 1 + ...hutdownSampleActuatorApplicationTests.java | 1 + ...agementSampleActuatorApplicationTests.java | 1 + ...nsecureSampleActuatorApplicationTests.java | 1 + .../java/sample/aop/SampleAopApplication.java | 4 +-- .../sample/aop/monitor/ServiceMonitor.java | 1 + .../sample/aop/SampleAopApplicationTests.java | 1 + .../src/main/java/sample/ChatService.java | 3 +- .../sample/SampleAtmosphereApplication.java | 1 + .../SampleAtmosphereApplicationTests.java | 1 + .../batch/SampleBatchApplicationTests.java | 1 + .../SampleElasticsearchApplicationTests.java | 1 + .../gemfire/service/GemstoneRepository.java | 4 +-- .../gemfire/service/GemstoneServiceImpl.java | 4 +-- .../SampleDataGemFireApplicationTests.java | 8 ++--- .../data/jpa/service/CityRepository.java | 4 +-- .../sample/data/jpa/service/CityService.java | 6 ++-- .../data/jpa/service/CityServiceImpl.java | 6 ++-- .../data/jpa/service/HotelRepository.java | 10 +++---- .../sample/data/jpa/service/HotelService.java | 6 ++-- .../data/jpa/service/HotelServiceImpl.java | 14 ++++----- .../data/jpa/service/ReviewRepository.java | 6 ++-- .../sample/data/jpa/web/SampleController.java | 4 +-- .../jpa/SampleDataJpaApplicationTests.java | 1 + .../CityRepositoryIntegrationTests.java | 6 ++-- .../HotelRepositoryIntegrationTests.java | 14 ++++----- .../mongo/SampleMongoApplicationTests.java | 10 +++---- .../redis/SampleRedisApplicationTests.java | 1 + .../data/jpa/service/CityRepository.java | 4 +-- .../data/jpa/service/HotelRepository.java | 6 ++-- .../jpa/SampleDataRestApplicationTests.java | 1 + .../CityRepositoryIntegrationTests.java | 6 ++-- .../main/java/sample/data/solr/Product.java | 1 + .../data/solr/SampleSolrApplicationTests.java | 1 + .../flyway/SampleFlywayApplicationTests.java | 1 + .../java/sample/web/CustomerController.java | 6 ++-- .../sample/SampleHateoasApplicationTests.java | 1 + .../SampleIntegrationApplicationTests.java | 6 ++-- .../main/java/sample/jersey/JerseyConfig.java | 1 + .../jersey/SampleJerseyApplicationTests.java | 1 + .../jersey1/SampleJersey1Application.java | 4 +-- .../SampleJersey1ApplicationTests.java | 1 + .../sample/jetty/web/SampleController.java | 4 +-- .../jetty/SampleJettySslApplicationTests.java | 1 + .../sample/jetty/web/SampleController.java | 4 +-- .../jetty/SampleJettyApplicationTests.java | 1 + .../sample/jetty/web/SampleController.java | 4 +-- .../SampleJetty8SslApplicationTests.java | 1 + .../sample/jetty/web/SampleController.java | 4 +-- .../jetty/SampleJetty8ApplicationTests.java | 1 + .../jpa/repository/JpaNoteRepository.java | 4 +-- .../jpa/repository/JpaTagRepository.java | 4 +-- .../java/sample/jpa/web/IndexController.java | 6 ++-- .../sample/jpa/SampleJpaApplicationTests.java | 1 + .../JpaNoteRepositoryIntegrationTests.java | 6 ++-- .../JpaTagRepositoryIntegrationTests.java | 6 ++-- .../SampleAtomikosApplicationTests.java | 1 + .../SampleBitronixApplicationTests.java | 4 +-- .../SampleLiquibaseApplicationTests.java | 1 + ...mpleIntegrationParentApplicationTests.java | 6 ++-- .../profile/SampleProfileApplication.java | 4 +-- .../SampleProfileApplicationTests.java | 1 + .../secure/SampleSecureApplicationTests.java | 4 +-- .../SampleServletApplicationTests.java | 1 + .../simple/SampleSimpleApplication.java | 4 +-- .../simple/SampleSimpleApplicationTests.java | 1 + ...pringTestSampleSimpleApplicationTests.java | 1 + .../testng/SampleTestNGApplication.java | 1 + .../sample/testng/web/SampleController.java | 4 +-- .../testng/SampleTestNGApplicationTests.java | 3 +- .../jsp/SampleWebJspApplicationTests.java | 1 + .../SampleTomcatTwoConnectorsApplication.java | 1 + ...leTomcatTwoConnectorsApplicationTests.java | 1 + .../SampleTomcatSslApplicationTests.java | 1 + .../tomcat/SampleTomcatApplication.java | 1 + .../sample/tomcat/web/SampleController.java | 4 +-- ...igurationSampleTomcatApplicationTests.java | 8 ++--- .../tomcat/SampleTomcatApplicationTests.java | 1 + .../jsp/SampleWebJspApplicationTests.java | 1 + .../SampleTraditionalApplicationTests.java | 1 + .../sample/undertow/web/SampleController.java | 4 +-- .../SampleUndertowSslApplicationTests.java | 1 + .../sample/undertow/web/SampleController.java | 4 +-- .../SampleUndertowApplicationTests.java | 1 + .../velocity/SampleVelocityApplication.java | 1 + .../SampleVelocityApplicationTests.java | 1 + .../SampleWebFreeMarkerApplicationTests.java | 1 + .../java/sample/ui/mvc/MessageController.java | 6 ++-- .../sample/ui/MessageControllerWebTests.java | 1 + .../SampleGroovyTemplateApplicationTests.java | 1 + .../jsp/SampleWebJspApplicationTests.java | 1 + .../SampleMethodSecurityApplicationTests.java | 1 + .../SampleWebMustacheApplicationTests.java | 1 + ...SampleWebSecureCustomApplicationTests.java | 1 + ...SampleWebSecureCustomApplicationTests.java | 1 + .../secure/SampleSecureApplicationTests.java | 1 + .../ui/SampleWebStaticApplicationTests.java | 1 + .../java/sample/ui/mvc/MessageController.java | 6 ++-- .../sample/ui/MessageControllerWebTests.java | 1 + .../ui/SampleWebUiApplicationTests.java | 1 + .../SampleWebVelocityApplicationTests.java | 1 + .../SampleJettyWebSocketsApplication.java | 16 +++++----- .../client/SimpleClientWebSocketHandler.java | 1 + .../websocket/echo/EchoWebSocketHandler.java | 1 + .../SampleWebSocketsApplicationTests.java | 8 ++--- ...omContainerWebSocketsApplicationTests.java | 12 ++++---- .../SampleTomcatWebSocketApplication.java | 16 +++++----- .../client/SimpleClientWebSocketHandler.java | 1 + .../websocket/echo/EchoWebSocketHandler.java | 1 + .../SampleWebSocketsApplicationTests.java | 8 ++--- ...omContainerWebSocketsApplicationTests.java | 12 ++++---- .../SampleUndertowWebSocketsApplication.java | 16 +++++----- .../client/SimpleClientWebSocketHandler.java | 1 + .../websocket/echo/EchoWebSocketHandler.java | 1 + .../SampleWebSocketsApplicationTests.java | 8 ++--- ...omContainerWebSocketsApplicationTests.java | 12 ++++---- .../sample/ws/endpoint/HolidayEndpoint.java | 4 +-- .../ws/service/StubHumanResourceService.java | 1 + .../sample/ws/SampleWsApplicationTests.java | 1 + .../xml/SampleSpringXmlApplication.java | 4 +-- .../xml/SampleSpringXmlApplicationTests.java | 1 + .../metadata/JsonMarshaller.java | 1 + ...ationMetadataAnnotationProcessorTests.java | 1 + .../ConfigurationMetadataMatchers.java | 1 + .../configurationprocessor/TestProject.java | 1 + .../AbstractFieldValuesProcessorTests.java | 1 + .../lombok/LombokExplicitProperties.java | 4 +-- .../lombok/LombokSimpleDataProperties.java | 4 +-- .../lombok/LombokSimpleProperties.java | 4 +-- .../dependency/tools/PomDependencies.java | 3 +- .../boot/gradle/SpringBootPlugin.java | 1 + .../gradle/VersionManagedDependencies.java | 1 + .../gradle/agent/AgentPluginFeatures.java | 1 + .../boot/gradle/agent/AgentTasksEnhancer.java | 1 + .../gradle/exclude/ApplyExcludeRules.java | 1 + .../gradle/exclude/ExcludePluginFeatures.java | 1 + .../gradle/repackage/ProjectLibraries.java | 1 + .../repackage/RepackagePluginFeatures.java | 1 + .../boot/gradle/repackage/RepackageTask.java | 1 + .../gradle/resolve/ResolvePluginFeatures.java | 1 + .../resolve/SpringBootResolutionStrategy.java | 1 + .../boot/gradle/run/BootRunTask.java | 1 + .../boot/gradle/run/FindMainClassTask.java | 1 + .../boot/gradle/run/RunPluginFeatures.java | 1 + .../boot/loader/tools/LogbackInitializer.java | 4 +-- .../boot/loader/tools/FileUtilsTests.java | 1 + .../loader/tools/MainClassFinderTests.java | 1 + .../boot/loader/tools/RepackagerTests.java | 3 +- .../boot/loader/AsciiBytesTests.java | 1 + .../ExecutableArchiveLauncherTests.java | 1 + .../loader/LaunchedURLClassLoaderTests.java | 1 + .../boot/loader/PropertiesLauncherTests.java | 1 + .../boot/loader/WarLauncherTests.java | 1 + .../loader/archive/ExplodedArchiveTests.java | 1 + .../loader/archive/JarFileArchiveTests.java | 1 + .../data/ByteArrayRandomAccessDataTests.java | 1 + .../data/RandomAccessDataFileTests.java | 1 + .../boot/loader/jar/JarFileTests.java | 1 + .../boot/maven/ArtifactsLibraries.java | 1 + .../boot/maven/RepackageMojo.java | 1 + .../springframework/boot/maven/RunMojo.java | 1 + .../boot/maven/ArtifactsLibrariesTests.java | 1 + .../springframework/boot/ResourceBanner.java | 1 + .../boot/SpringApplication.java | 1 + .../boot/StartupInfoLogger.java | 1 + .../bind/PropertiesConfigurationFactory.java | 1 + .../boot/bind/YamlConfigurationFactory.java | 7 +++-- .../cloudfoundry/VcapApplicationListener.java | 1 + ...WarningsApplicationContextInitializer.java | 1 + .../FileEncodingApplicationListener.java | 1 + .../config/ConfigFileApplicationListener.java | 1 + .../config/RandomValuePropertySource.java | 1 + .../EmbeddedServletContainerFactory.java | 1 + .../EmbeddedWebApplicationContext.java | 1 + .../embedded/FilterRegistrationBean.java | 1 + .../ServletContextInitializerBeans.java | 1 + .../ServletListenerRegistrationBean.java | 1 + .../embedded/ServletRegistrationBean.java | 1 + .../jetty/JettyEmbeddedServletContainer.java | 1 + .../JettyEmbeddedServletContainerFactory.java | 1 + ...ervletContextInitializerConfiguration.java | 1 + .../tomcat/SkipPatternJarScanner.java | 1 + .../tomcat/TomcatEmbeddedContext.java | 1 + .../TomcatEmbeddedServletContainer.java | 1 + ...TomcatEmbeddedServletContainerFactory.java | 1 + .../embedded/tomcat/TomcatResources.java | 1 + .../embedded/tomcat/TomcatStarter.java | 1 + .../UndertowEmbeddedServletContainer.java | 14 ++++----- ...dertowEmbeddedServletContainerFactory.java | 30 +++++++++---------- .../boot/context/web/ErrorPageFilter.java | 1 + .../web/SpringBootServletInitializer.java | 1 + .../boot/env/PropertySourcesLoader.java | 1 + .../boot/env/YamlPropertySourceLoader.java | 11 +++---- ...ikosDependsOnBeanFactoryPostProcessor.java | 4 +-- .../PoolingConnectionFactoryBean.java | 8 ++--- .../jta/bitronix/PoolingDataSourceBean.java | 8 ++--- .../CommonsLoggingLiquibaseLogger.java | 5 ++-- ...baseServiceLocatorApplicationListener.java | 6 ++-- .../SpringPackageScanClassResolver.java | 6 ++-- .../ClasspathLoggingApplicationListener.java | 1 + .../logging/LoggingApplicationListener.java | 1 + .../boot/logging/Slf4JLoggingSystem.java | 1 + .../logging/log4j/Log4JLoggingSystem.java | 1 + .../logging/log4j2/Log4J2LoggingSystem.java | 1 + .../boot/logging/logback/ColorConverter.java | 6 ++-- .../logback/DefaultLogbackConfiguration.java | 4 +-- .../logback/LevelRemappingAppender.java | 8 ++--- .../logging/logback/LogbackConfigurator.java | 4 +-- .../logging/logback/LogbackLoggingSystem.java | 14 ++++----- .../orm/jpa/hibernate/SpringJtaPlatform.java | 1 + .../jpa/hibernate/SpringNamingStrategy.java | 1 + .../boot/test/OutputCapture.java | 1 + .../boot/test/TestRestTemplate.java | 1 + .../velocity/EmbeddedVelocityToolboxView.java | 1 + .../springframework/boot/AdhocTestSuite.java | 1 + .../boot/ApplicationPidTests.java | 1 + .../org/springframework/boot/BannerTests.java | 1 + .../boot/BeanDefinitionLoaderTests.java | 1 + .../boot/OverrideSourcesTests.java | 1 + .../org/springframework/boot/ReproTests.java | 1 + .../boot/ResourceBannerTests.java | 1 + .../springframework/boot/SimpleMainTests.java | 1 + .../boot/SpringApplicationTests.java | 1 + .../boot/ansi/AnsiOutputTests.java | 1 + .../boot/bind/BindingPreparationTests.java | 1 + ...ropertiesConfigurationFactoryMapTests.java | 1 + .../PropertiesConfigurationFactoryTests.java | 1 + .../bind/PropertySourcesBindingTests.java | 1 + .../PropertySourcesPropertyValuesTests.java | 1 + .../boot/bind/RelaxedDataBinderTests.java | 1 + .../bind/RelaxedPropertyResolverTests.java | 1 + .../SimplerPropertySourcesBindingTests.java | 1 + .../bind/YamlConfigurationFactoryTests.java | 3 +- .../SpringApplicationBuilderTests.java | 1 + .../VcapApplicationListenerTests.java | 1 + ...ngsApplicationContextInitializerTests.java | 1 + ...tIdApplicationContextInitializerTests.java | 1 + .../FileEncodingApplicationListenerTests.java | 1 + .../ConfigFileApplicationListenerTests.java | 1 + ...ingApplicationContextInitializerTests.java | 1 + .../DelegatingApplicationListenerTests.java | 1 + ...tEmbeddedServletContainerFactoryTests.java | 1 + ...figEmbeddedWebApplicationContextTests.java | 1 + ...edServletContainerMvcIntegrationTests.java | 1 + .../EmbeddedWebApplicationContextTests.java | 1 + ...XmlEmbeddedWebApplicationContextTests.java | 1 + .../AnsiOutputApplicationListenerTests.java | 1 + ...yEmbeddedServletContainerFactoryTests.java | 1 + ...tEmbeddedServletContainerFactoryTests.java | 1 + ...wEmbeddedServletContainerFactoryTests.java | 6 ++-- ...onPropertiesBindingPostProcessorTests.java | 1 + .../EnableConfigurationPropertiesTests.java | 1 + .../web/ErrorPageFilterIntegrationTests.java | 1 + .../context/web/ErrorPageFilterTests.java | 1 + .../SpringBootServletInitializerTests.java | 1 + .../PropertiesPropertySourceLoaderTests.java | 1 + .../env/YamlPropertySourceLoaderTests.java | 1 + .../atomikos/AtomikosDataSourceBeanTests.java | 3 +- ...ependsOnBeanFactoryPostProcessorTests.java | 6 ++-- ...ependentBeanFactoryPostProcessorTests.java | 4 +-- .../CommonsLoggingLiquibaseLoggerTests.java | 3 +- ...erviceLocatorApplicationListenerTests.java | 4 +-- .../SpringPackageScanClassResolverTests.java | 3 +- .../logging/AbstractLoggingSystemTests.java | 1 + .../boot/logging/LogFileTests.java | 1 + .../LoggingApplicationListenerTests.java | 1 + .../logging/java/JavaLoggerSystemTests.java | 1 + .../log4j/Log4JLoggingSystemTests.java | 1 + .../log4j2/Log4J2LoggingSystemTests.java | 4 +-- .../logging/logback/ColorConverterTests.java | 6 ++-- .../logback/LevelRemappingAppenderTests.java | 6 ++-- .../logback/LogbackLoggingSystemTests.java | 6 ++-- ...hitespaceThrowableProxyConverterTests.java | 3 +- .../boot/orm/jpa/EntityScanTests.java | 1 + .../test/AbstractConfigurationClassTests.java | 1 + .../ApplicationContextTestUtilsTests.java | 1 + ...ileApplicationContextInitializerTests.java | 1 + .../boot/test/EnvironmentTestUtilsTests.java | 1 + ...cationConfigurationActiveProfileTests.java | 1 + ...onfigurationDefaultConfigurationTests.java | 1 + ...ConfigurationGroovyConfigurationTests.java | 1 + ...pringApplicationConfigurationJmxTests.java | 1 + ...nConfigurationMixedConfigurationTests.java | 1 + .../SpringApplicationContextLoaderTests.java | 1 + ...nIntegrationTestPropertyLocationTests.java | 1 + ...SpringApplicationIntegrationTestTests.java | 1 + ...ingApplicationWebIntegrationTestTests.java | 1 + .../boot/test/TestRestTemplateTests.java | 1 + .../EmbeddedVelocityToolboxViewTests.java | 1 + .../EmbeddedVelocityViewResolverTests.java | 1 + .../boot/yaml/ArrayDocumentMatcherTests.java | 1 + 703 files changed, 1113 insertions(+), 611 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java index f7a5d7f4d32..85351cd5208 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.audit.listener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.boot.actuate.audit.AuditEventRepository; import org.springframework.context.ApplicationListener; 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 2b7d9b56a1e..1ee8e5de801 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 @@ -41,6 +41,7 @@ import org.crsh.plugin.ServiceLoaderDiscovery; import org.crsh.vfs.FS; import org.crsh.vfs.spi.AbstractFSDriver; import org.crsh.vfs.spi.FSDriver; + import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; 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 f116e83344f..7e1d1590cf4 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 @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index 464eafeb9bc..b08102c4d08 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -25,6 +25,7 @@ import javax.servlet.Filter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.HierarchicalBeanFactory; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java index 90d73762bcd..637f70012c9 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java @@ -23,6 +23,7 @@ import java.util.Map; import javax.sql.DataSource; import org.apache.solr.client.solrj.SolrServer; + import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.health.ApplicationHealthIndicator; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java index a5e53175789..b1349b87c22 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.autoconfigure; import java.util.Properties; import org.jolokia.http.AgentServlet; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.mvc.JolokiaMvcEndpoint; import org.springframework.boot.autoconfigure.AutoConfigureAfter; 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 0266177609b..8cbb6cbd78b 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 @@ -19,6 +19,8 @@ package org.springframework.boot.actuate.autoconfigure; import java.util.List; import java.util.concurrent.Executor; +import com.codahale.metrics.MetricRegistry; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics; @@ -48,8 +50,6 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.ExecutorSubscribableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import com.codahale.metrics.MetricRegistry; - /** * {@link EnableAutoConfiguration Auto-configuration} for metrics services. Creates * user-facing {@link GaugeService} and {@link CounterService} instances, and also back 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 e1ae8b00a6e..56d5de03ac7 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 @@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.boot.actuate.metrics.CounterService; import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.core.Ordered; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java index a70ecd13f20..c42ca45c4c9 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java @@ -20,6 +20,7 @@ import javax.servlet.Servlet; import javax.sql.DataSource; import org.apache.catalina.startup.Tomcat; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.DataSourcePublicMetrics; import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics; 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 fbf746fd755..9e0d08af573 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 @@ -24,6 +24,7 @@ import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.util.Assert; 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 bc3911dc7ad..97270f28b39 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 @@ -19,6 +19,10 @@ package org.springframework.boot.actuate.endpoint; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.AutoConfigurationReportEndpoint.Report; import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport; @@ -32,10 +36,6 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - /** * {@link Endpoint} to expose the {@link ConditionEvaluationReport}. * 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 f68ac5974f7..e345e17e6fb 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 @@ -27,19 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.BeanWrapperImpl; -import org.springframework.beans.BeansException; -import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaData; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.util.ClassUtils; -import org.springframework.util.StringUtils; - import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.JsonMappingException; @@ -56,6 +43,19 @@ import com.fasterxml.jackson.databind.ser.PropertyWriter; import com.fasterxml.jackson.databind.ser.SerializerFactory; import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.springframework.beans.BeanWrapperImpl; +import org.springframework.beans.BeansException; +import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaData; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.util.ClassUtils; +import org.springframework.util.StringUtils; /** * {@link Endpoint} to expose application properties from {@link ConfigurationProperties} diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetrics.java index 71ea6487e38..a6e2ed70e8a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetrics.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetrics.java @@ -25,6 +25,7 @@ import org.apache.catalina.Container; import org.apache.catalina.Context; import org.apache.catalina.Manager; import org.apache.catalina.session.ManagerBase; + import org.springframework.beans.BeansException; import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.context.embedded.EmbeddedServletContainer; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java index 92b9df933d7..e3e38c12bea 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java @@ -19,14 +19,14 @@ package org.springframework.boot.actuate.endpoint.jmx; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Simple wrapper around {@link Endpoint} implementations to enable JMX export. * diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java index 97315f5701e..650e56f8d76 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java @@ -28,6 +28,7 @@ import javax.management.ObjectName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; 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 71152270bfc..ce78c92daf0 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 @@ -26,6 +26,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import org.jolokia.http.AgentServlet; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; import org.springframework.boot.actuate.endpoint.Endpoint; 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 bef576bae57..02180a07807 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 @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.health; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.annotation.Autowired; /** 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 ab9031d438c..48fc9f35ca4 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 @@ -20,13 +20,13 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.util.Assert; - import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonUnwrapped; +import org.springframework.util.Assert; + /** * Carries information about the health of a component or subsystem. *

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java index f841e4d820b..ed02a62f72b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java @@ -16,11 +16,11 @@ package org.springframework.boot.actuate.health; +import com.mongodb.CommandResult; + import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.util.Assert; -import com.mongodb.CommandResult; - /** * Simple implementation of a {@link HealthIndicator} returning status information for * Mongo data stores. diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/RabbitHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/RabbitHealthIndicator.java index 9d7da2eae60..cf6d4935b7a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/RabbitHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/RabbitHealthIndicator.java @@ -18,12 +18,12 @@ package org.springframework.boot.actuate.health; import java.util.Map; +import com.rabbitmq.client.Channel; + import org.springframework.amqp.rabbit.core.ChannelCallback; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.util.Assert; -import com.rabbitmq.client.Channel; - /** * Simple implementation of a {@link HealthIndicator} returning status information for the * RabbitMQ messaging system. diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java index 53cf4f711b1..ccb34088778 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java @@ -16,13 +16,13 @@ package org.springframework.boot.actuate.health; -import org.springframework.util.Assert; -import org.springframework.util.ObjectUtils; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; + /** * Value object to express state of a component or subsystem. *

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java index 140cad01224..884342cba47 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java @@ -25,16 +25,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.BeanWrapperImpl; -import org.springframework.boot.actuate.metrics.Metric; -import org.springframework.util.ClassUtils; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.util.StringUtils; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; @@ -43,6 +33,16 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.MetricRegistryListener; import com.codahale.metrics.Sampling; import com.codahale.metrics.Timer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.springframework.beans.BeanUtils; +import org.springframework.beans.BeanWrapperImpl; +import org.springframework.boot.actuate.metrics.Metric; +import org.springframework.util.ClassUtils; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; /** * A Spring Boot {@link MetricReader} that reads metrics from a Codahale diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CodahaleMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CodahaleMetricWriter.java index f93c29d4f35..f03ee6014ac 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CodahaleMetricWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CodahaleMetricWriter.java @@ -16,8 +16,6 @@ package org.springframework.boot.actuate.metrics.writer; -import org.springframework.boot.actuate.metrics.Metric; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; @@ -25,6 +23,8 @@ import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import org.springframework.boot.actuate.metrics.Metric; + /** * A {@link MetricWriter} that send data to a Codahale {@link MetricRegistry} based on a * naming convention: diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriter.java index e3045976ace..04cad46f480 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriter.java @@ -20,8 +20,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; -import org.springframework.boot.actuate.metrics.Metric; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; @@ -29,6 +27,8 @@ import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import org.springframework.boot.actuate.metrics.Metric; + /** * A {@link MetricWriter} that send data to a Codahale {@link MetricRegistry} based on a * naming convention: diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/MetricWriterMessageHandler.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/MetricWriterMessageHandler.java index cbba3e323db..212c6abf002 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/MetricWriterMessageHandler.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/MetricWriterMessageHandler.java @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.metrics.writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java index 9f57613b1df..581e4ae8cc4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java @@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.boot.ApplicationPid; import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/EmbeddedServerPortFileWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/EmbeddedServerPortFileWriter.java index 307eb87d9a2..a94b542b1cd 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/EmbeddedServerPortFileWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/EmbeddedServerPortFileWriter.java @@ -20,6 +20,7 @@ import java.io.File; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; import org.springframework.context.ApplicationListener; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java index df85cd81a37..07b8396bd75 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.boot.autoconfigure.web.ErrorAttributes; import org.springframework.core.Ordered; import org.springframework.web.context.request.RequestAttributes; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java index 639c899c63e..eb73839737f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.audit.listener; import java.util.Collections; import org.junit.Test; + import org.springframework.boot.actuate.audit.AuditEvent; import org.springframework.boot.actuate.audit.AuditEventRepository; 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 e35dc8d0976..c82518ebe4c 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 @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; + import org.springframework.boot.actuate.audit.AuditEventRepository; import org.springframework.boot.actuate.audit.InMemoryAuditEventRepository; import org.springframework.boot.actuate.security.AuthenticationAuditListener; 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 6aee020a466..cfd2970472c 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 @@ -33,6 +33,7 @@ import org.crsh.telnet.term.processor.ProcessorIOHandler; import org.crsh.vfs.Resource; import org.junit.After; import org.junit.Test; + import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java index e0c7e133bd2..706d1ddd8b3 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java @@ -22,6 +22,7 @@ import java.util.Map; import org.junit.After; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.AutoConfigurationReportEndpoint; import org.springframework.boot.actuate.endpoint.BeansEndpoint; import org.springframework.boot.actuate.endpoint.DumpEndpoint; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfigurationTests.java index e891bdf0edd..cecf0d5aca6 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfigurationTests.java @@ -24,6 +24,7 @@ import javax.management.ReflectionException; import org.junit.After; import org.junit.Test; + import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.actuate.endpoint.AbstractEndpoint; import org.springframework.boot.actuate.endpoint.Endpoint; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java index 8633784b807..e37b4eca89a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.actuate.autoconfigure.EndpointMvcIntegrationTests.Application; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index 2b7b16e01eb..196645dbbe3 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -31,6 +31,7 @@ import org.hamcrest.Matcher; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping; import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMappingCustomizer; 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 58db300e599..89d781303d2 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 @@ -23,6 +23,7 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.actuate.health.ApplicationHealthIndicator; import org.springframework.boot.actuate.health.DataSourceHealthIndicator; import org.springframework.boot.actuate.health.DiskSpaceHealthIndicator; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java index e384f10adf8..fdc275feb93 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.After; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.mvc.HealthMvcEndpoint; import org.springframework.boot.actuate.health.AbstractHealthIndicator; import org.springframework.boot.actuate.health.Health; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java index b2e0df945fe..9a518b759e4 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.After; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.mvc.JolokiaMvcEndpoint; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java index c9cf85872e4..f21c3afe090 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java @@ -21,6 +21,7 @@ import javax.servlet.Filter; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.security.FallbackWebSecurityAutoConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java index 3e149e0c6c7..46ec1cb48c8 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.boot.actuate.metrics.CounterService; import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java index c10c1155598..48c74675303 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java @@ -18,7 +18,10 @@ package org.springframework.boot.actuate.autoconfigure; import java.util.concurrent.Executor; +import com.codahale.metrics.Gauge; +import com.codahale.metrics.MetricRegistry; import org.junit.Test; + import org.springframework.boot.actuate.metrics.CounterService; import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.boot.actuate.metrics.Metric; @@ -33,9 +36,6 @@ import org.springframework.core.task.SyncTaskExecutor; import org.springframework.messaging.support.ExecutorSubscribableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import com.codahale.metrics.Gauge; -import com.codahale.metrics.MetricRegistry; - import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; 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 a1a449a649c..4a9635f320b 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 @@ -25,9 +25,11 @@ import java.util.Map; import javax.sql.DataSource; +import com.zaxxer.hikari.HikariDataSource; import org.apache.commons.dbcp.BasicDataSource; import org.junit.After; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.DataSourcePublicMetrics; import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics; import org.springframework.boot.actuate.endpoint.PublicMetrics; @@ -50,8 +52,6 @@ import org.springframework.jdbc.core.ConnectionCallback; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.util.SocketUtils; -import com.zaxxer.hikari.HikariDataSource; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; 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 8444a2820ea..c4b3af102c6 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 @@ -25,6 +25,7 @@ import java.util.UUID; import org.crsh.plugin.PluginLifeCycle; import org.junit.Assert; import org.junit.Test; + import org.springframework.beans.MutablePropertyValues; import org.springframework.boot.actuate.autoconfigure.ShellProperties.CrshShellProperties; import org.springframework.boot.actuate.autoconfigure.ShellProperties.JaasAuthenticationProperties; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java index 83d031fe37b..5e46d32c6c7 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.After; import org.junit.Test; + import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.ApplicationContextTestUtils; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java index bf072b79c09..cec5c97a9df 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; + import org.springframework.boot.actuate.trace.InMemoryTraceRepository; import org.springframework.boot.actuate.trace.TraceRepository; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTests.java index b4d676195f0..9f6e0196f8e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; + import org.springframework.boot.actuate.trace.WebRequestTraceFilter; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java index 211ba1905ae..a5b7778f7c2 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java @@ -23,6 +23,7 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; 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 1e488e38a65..fa0311de7d8 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 @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint; import javax.annotation.PostConstruct; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.AutoConfigurationReportEndpoint.Report; import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java index 9f72ec74e2b..9f13c4f63c0 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import org.junit.Test; + import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java index 6c1c050f6f0..9d56e8e4da8 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java @@ -21,6 +21,7 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.EnvironmentTestUtils; 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 36c8ee7a755..82ddfe9c3a4 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 @@ -20,6 +20,7 @@ import java.util.Map; import org.junit.After; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaData; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java index 883f88a31c4..6e6771b440c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java @@ -23,6 +23,7 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.AnnotationConfigApplicationContext; 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 a3ed21b83af..fe0feed53b8 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 @@ -23,6 +23,7 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.EnvironmentTestUtils; 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 63ccf146cd6..a7217cb7cec 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 @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint; import java.util.Map; import org.junit.Test; + import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.EnvironmentTestUtils; 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 47fb6bfca85..2aecbb8c644 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 @@ -20,6 +20,7 @@ import java.lang.management.ThreadInfo; import java.util.List; import org.junit.Test; + import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; 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 0a8151124a8..a8c67156e21 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 @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.Map; import org.junit.Test; + import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java index eb4e8225ab2..16d882abc1d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint; import java.util.Map; import org.junit.Test; + import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.HealthAggregator; import org.springframework.boot.actuate.health.HealthIndicator; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java index 02d6c5603f7..7c99a739a75 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint; import java.util.Collections; import org.junit.Test; + import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetricsTests.java index 6b0d10379b7..fd6c2083b58 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetricsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetricsTests.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.reader.MetricReader; 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 f9235fd5562..08bf0858629 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 @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Map.Entry; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; 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 9509df3633a..6d814342549 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 @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.Map; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping; import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetricsTests.java index d21bdd3bbf9..b1d33edfc9d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetricsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetricsTests.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.rich.InMemoryRichGaugeRepository; 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 c5336100dd6..a4de92086c9 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 @@ -20,6 +20,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; + import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownParentEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownParentEndpointTests.java index f7ec31b92ad..9d2a2af5c56 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownParentEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownParentEndpointTests.java @@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Test; + import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.ApplicationContextTestUtils; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java index 2f49a1aeb94..048db5c0d86 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetricsTests.java index 6580f28cf3d..6b2d90fff13 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetricsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetricsTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint; import java.util.Iterator; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java index 078ff677e8b..203be5f180c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint; import java.util.Collections; import org.junit.Test; + import org.springframework.boot.actuate.trace.InMemoryTraceRepository; import org.springframework.boot.actuate.trace.Trace; import org.springframework.boot.actuate.trace.TraceRepository; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java index 221e6f1852d..7cb1a9a27ed 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; 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 e9f1ea6af3f..5ecb1e8ebf0 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 @@ -27,6 +27,7 @@ import javax.management.ObjectName; import org.junit.After; import org.junit.Test; + import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.boot.actuate.endpoint.AbstractEndpoint; 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 ba712a974a4..32cad45f8a5 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 @@ -21,6 +21,7 @@ import java.util.Arrays; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.AbstractEndpoint; import org.springframework.context.support.StaticApplicationContext; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java index 6e19c9b5a72..37d96230a53 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint.mvc; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java index 7b5d3b2f43d..dd513786d41 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java @@ -20,6 +20,7 @@ import java.util.Collections; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.HealthEndpoint; import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Status; 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 8d3d069d197..d1c31cd3982 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 @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint.mvc; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.JolokiaAutoConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointTests.java index 0a181084af7..c45bb3536ca 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointTests.java @@ -21,6 +21,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.JolokiaAutoConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java index 37a517c417a..925a6476220 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java @@ -22,6 +22,7 @@ import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; 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 af4fcc4bd27..7711bc8420c 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 @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.endpoint.mvc; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.AbstractEndpoint; import org.springframework.context.support.StaticApplicationContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpointTests.java index 98764dec2db..e5b2e61236b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpointTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint.mvc; import java.util.Map; import org.junit.Test; + import org.springframework.boot.actuate.endpoint.ShutdownEndpoint; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java index 9cc7220eb7e..1700cac7581 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java @@ -19,13 +19,12 @@ package org.springframework.boot.actuate.health; import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import com.fasterxml.jackson.databind.ObjectMapper; - import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasEntry; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DataSourceHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DataSourceHealthIndicatorTests.java index 9595f745cbf..ab62e2d38c4 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DataSourceHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DataSourceHealthIndicatorTests.java @@ -22,6 +22,7 @@ import javax.sql.DataSource; import org.junit.Before; import org.junit.Test; + import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConnection; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DriverManagerDataSource; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java index b540d229588..32267974fb1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java @@ -16,8 +16,11 @@ package org.springframework.boot.actuate.health; +import com.mongodb.CommandResult; +import com.mongodb.MongoException; import org.junit.After; import org.junit.Test; + import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; @@ -26,9 +29,6 @@ import org.springframework.boot.autoconfigure.mongo.MongoDataAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.mongodb.core.MongoTemplate; -import com.mongodb.CommandResult; -import com.mongodb.MongoException; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RabbitHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RabbitHealthIndicatorTests.java index 6e18e9dcc64..30727b10c4a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RabbitHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RabbitHealthIndicatorTests.java @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.health; import org.junit.After; import org.junit.Test; + import org.springframework.amqp.rabbit.core.RabbitAdmin; import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RedisHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RedisHealthIndicatorTests.java index e18b32fa9fd..59c46825d17 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RedisHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RedisHealthIndicatorTests.java @@ -20,6 +20,7 @@ import java.util.Properties; import org.junit.After; import org.junit.Test; + import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java index a60b4147c8e..14ccbcb41bd 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java @@ -23,6 +23,7 @@ import org.apache.solr.client.solrj.response.SolrPingResponse; import org.apache.solr.common.util.NamedList; import org.junit.After; import org.junit.Test; + import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporterTests.java index 9ad012f1451..e6aaf7275fe 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporterTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.metrics.export; import java.util.Date; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java index 955764db228..5443595603f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.Collections; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Iterables; import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/RichGaugeExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/RichGaugeExporterTests.java index d972c3ae1b1..cf756a210a0 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/RichGaugeExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/RichGaugeExporterTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.metrics.export; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Iterables; import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java index 1858435a6b7..ddd5b3d6ab9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java @@ -19,11 +19,11 @@ package org.springframework.boot.actuate.metrics.reader; import java.util.HashSet; import java.util.Set; -import org.junit.Test; -import org.springframework.boot.actuate.metrics.Metric; - import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; +import org.junit.Test; + +import org.springframework.boot.actuate.metrics.Metric; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepositoryTests.java index dbc20a4b1aa..4748f6ad35c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepositoryTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.metrics.repository; import java.util.Date; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.writer.Delta; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryPrefixMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryPrefixMetricRepositoryTests.java index 2c113403f02..21e861cd454 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryPrefixMetricRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryPrefixMetricRepositoryTests.java @@ -20,6 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.writer.Delta; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java index 8acf51b5e39..325272575ad 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java @@ -20,6 +20,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Iterables; import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.writer.Delta; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java index 429deac523d..dda679337f4 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java @@ -30,6 +30,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; + import org.springframework.boot.actuate.metrics.Iterables; import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.writer.Delta; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisServer.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisServer.java index b7a9531f361..1f43536ff69 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisServer.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisServer.java @@ -22,6 +22,7 @@ import org.junit.Assume; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; + import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepositoryTests.java index 3b4a5f3b58f..32171323beb 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepositoryTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.metrics.rich; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import static org.junit.Assert.assertEquals; 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 f9c2ca067d5..24f99285517 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 @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.metrics.rich; import org.junit.Test; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.export.RichGaugeExporter; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/InMemoryRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/InMemoryRepositoryTests.java index b5c455731fe..4e1d9143c4a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/InMemoryRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/InMemoryRepositoryTests.java @@ -26,6 +26,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.junit.Test; + import org.springframework.boot.actuate.metrics.util.SimpleInMemoryRepository.Callback; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultGaugeServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultGaugeServiceTests.java index 39e75c87558..0e6d150633a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultGaugeServiceTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultGaugeServiceTests.java @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.metrics.writer; import org.junit.Test; import org.mockito.ArgumentCaptor; + import org.springframework.boot.actuate.metrics.Metric; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriterTests.java index 4f673b7d1aa..0795fe66f60 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriterTests.java @@ -19,11 +19,11 @@ package org.springframework.boot.actuate.metrics.writer; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.springframework.boot.actuate.metrics.Metric; - import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; +import org.junit.Test; + +import org.springframework.boot.actuate.metrics.Metric; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java index 3786149725b..0382ccada21 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java @@ -22,6 +22,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.boot.actuate.metrics.Metric; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; 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 2b96ef66d8e..8bff5d135db 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 @@ -18,6 +18,7 @@ package org.springframework.boot.actuate.security; import org.junit.Before; import org.junit.Test; + import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.security.authentication.BadCredentialsException; 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 f5ce55d1f50..a94a6670b21 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 @@ -20,6 +20,7 @@ import java.util.Arrays; import org.junit.Before; import org.junit.Test; + import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.security.access.AccessDeniedException; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/ApplicationPidFileWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/ApplicationPidFileWriterTests.java index ac8aea2c2dd..fe2ab26c4c2 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/ApplicationPidFileWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/ApplicationPidFileWriterTests.java @@ -24,6 +24,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; + import org.springframework.boot.SpringApplication; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.context.event.ApplicationPreparedEvent; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/EmbeddedServerPortFileWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/EmbeddedServerPortFileWriterTests.java index f1cc5a2970c..8187183d22a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/EmbeddedServerPortFileWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/EmbeddedServerPortFileWriterTests.java @@ -26,6 +26,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; + import org.springframework.boot.context.embedded.EmbeddedServletContainer; import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java index d2fa44cfcad..d5c4024b248 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.actuate.trace; import java.util.Map; import org.junit.Test; + import org.springframework.boot.autoconfigure.web.DefaultErrorAttributes; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java index 46715d5e15a..44f023512e7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java @@ -24,6 +24,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.BeanDefinition; 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 28bf1d5e0f5..e7af55ea91e 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 @@ -16,6 +16,8 @@ package org.springframework.boot.autoconfigure.amqp; +import com.rabbitmq.client.Channel; + import org.springframework.amqp.core.AmqpAdmin; import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; @@ -32,8 +34,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import com.rabbitmq.client.Channel; - /** * {@link EnableAutoConfiguration Auto-configuration} for {@link RabbitTemplate}. *

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 f59ec29bdda..45ec3688c37 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 @@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.aop; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.Advice; + import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java index 2eb421c9d87..9d358c7f620 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java @@ -22,6 +22,7 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.batch.core.configuration.annotation.BatchConfigurer; import org.springframework.batch.core.explore.JobExplorer; import org.springframework.batch.core.explore.support.JobExplorerFactoryBean; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java index b840e00e6ba..89dab33529a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java @@ -26,6 +26,7 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java index 5a62caa587e..f6e80e7789e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java @@ -26,6 +26,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryUtils; 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 d05571c6721..eb0cccfc3c5 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 @@ -28,6 +28,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.ListableBeanFactory; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java index a1313be874f..7da1f5e1ee9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java @@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfiguration.java index 4e1bfc2a707..a903c52ac2e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.boot.autoconfigure.data.elasticsearch; import org.elasticsearch.client.Client; + import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java index 3538df58bd7..a9cd3263f74 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java @@ -16,6 +16,8 @@ package org.springframework.boot.autoconfigure.data.mongo; +import com.mongodb.Mongo; + import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -29,8 +31,6 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie import org.springframework.data.mongodb.repository.config.MongoRepositoryConfigurationExtension; import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean; -import com.mongodb.Mongo; - /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's Mongo * Repositories. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestMvcConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestMvcConfiguration.java index 6f858586d50..242d4dd26aa 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestMvcConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestMvcConfiguration.java @@ -16,6 +16,8 @@ package org.springframework.boot.autoconfigure.data.rest; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -24,8 +26,6 @@ import org.springframework.data.rest.core.config.RepositoryRestConfiguration; import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * A specialized {@link RepositoryRestMvcConfiguration} that applies configuration items * from the {@code spring.data.rest} namespace. Also configures Jackson if it's available diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java index a9022efc158..6950ef2b908 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.boot.autoconfigure.data.solr; import org.apache.solr.client.solrj.SolrServer; + import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java index 24d91fef597..a78c5d172d5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java @@ -26,6 +26,7 @@ import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.node.Node; import org.elasticsearch.node.NodeBuilder; + import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchDataAutoConfiguration.java index 88976d2f20a..82e0e7051bd 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchDataAutoConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.boot.autoconfigure.elasticsearch; import org.elasticsearch.client.Client; + import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 7959e5efd9f..faac6d1564d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -21,6 +21,7 @@ import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; import org.flywaydb.core.Flyway; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; 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 fceba7b3c61..b4dca435b98 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 @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.List; import org.flywaydb.core.Flyway; + import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java index 10bdb30d12c..3975901e390 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java @@ -22,6 +22,8 @@ import java.security.ProtectionDomain; import javax.annotation.PostConstruct; import javax.servlet.Servlet; +import groovy.text.markup.MarkupTemplateEngine; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -43,8 +45,6 @@ import org.springframework.web.servlet.view.groovy.GroovyMarkupConfig; import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer; import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver; -import groovy.text.markup.MarkupTemplateEngine; - /** * Autoconfiguration support for Groovy templates in MVC. By default creates a * {@link MarkupTemplateEngine} configured from {@link GroovyTemplateProperties}, but you diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateResolver.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateResolver.java index 063d5ea6256..f706491947b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateResolver.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateResolver.java @@ -18,14 +18,14 @@ package org.springframework.boot.autoconfigure.groovy.template; import java.io.IOException; import java.net.URL; -import org.springframework.context.i18n.LocaleContextHolder; -import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer; -import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver; - import groovy.text.markup.MarkupTemplateEngine; import groovy.text.markup.TemplateConfiguration; import groovy.text.markup.TemplateResolver; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer; +import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver; + /** * A custom {@link groovy.text.markup.TemplateResolver template resolver} which resolves * templates using the locale found in the thread locale. This resolver ignores the diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java index 4591d4c433c..35ef191ee57 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java @@ -16,14 +16,14 @@ package org.springframework.boot.autoconfigure.gson; +import com.google.gson.Gson; + import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.google.gson.Gson; - /** * {@link EnableAutoConfiguration Auto-configuration} for Gson. * 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 1d9a640c847..b46728996a9 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 @@ -18,6 +18,8 @@ package org.springframework.boot.autoconfigure.hateoas; import javax.annotation.PostConstruct; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -49,8 +51,6 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.plugin.core.Plugin; import org.springframework.web.bind.annotation.RequestMapping; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * {@link EnableAutoConfiguration Auto-configuration} for Spring HATEOAS's * {@link EnableHypermediaSupport}. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java index 9df0cf8ca60..5fab072304b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java @@ -25,10 +25,18 @@ import java.util.Map.Entry; import javax.annotation.PostConstruct; +import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer; +import com.fasterxml.jackson.datatype.joda.ser.JacksonJodaFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; + import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; @@ -47,14 +55,6 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; -import com.fasterxml.jackson.databind.Module; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer; -import com.fasterxml.jackson.datatype.joda.ser.JacksonJodaFormat; - /** * Auto configuration for Jackson. The following auto-configuration will get applied: *