From 01607605684e71ea66a3113e2a94f0f12fd044c0 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 21 Jan 2014 14:37:18 -0800 Subject: [PATCH] Apply latest eclipse cleanup rules --- .../boot/actuate/audit/AuditEventTests.java | 1 - .../InMemoryAuditEventRepositoryTests.java | 2 -- .../audit/listener/AuditListenerTests.java | 2 -- .../AuditAutoConfigurationTests.java | 1 - ...erverPropertiesAutoConfigurationTests.java | 1 - .../MetricFilterAutoConfigurationTests.java | 1 - ...TraceRepositoryAutoConfigurationTests.java | 1 - .../TraceWebFilterAutoConfigurationTest.java | 2 -- .../mvc/EnvironmentMvcEndpointTests.java | 2 +- .../endpoint/mvc/JolokiaEndpointTests.java | 2 +- .../health/VanillaHealthIndicatorTests.java | 1 - .../InMemoryMetricRepositoryTests.java | 1 - .../writer/DefaultCounterServiceTests.java | 3 --- .../trace/InMemoryTraceRepositoryTests.java | 2 -- .../MessageSourceAutoConfigurationTests.java | 2 -- .../batch/BatchAutoConfigurationTests.java | 2 +- .../JobExecutionExitCodeGeneratorTests.java | 2 -- ...JpaRepositoriesAutoConfigurationTests.java | 2 +- .../data/JpaWebAutoConfigurationTests.java | 2 +- ...ngoRepositoriesAutoConfigurationTests.java | 2 +- .../CommonsDataSourceConfigurationTests.java | 1 - .../EmbeddedDataSourceConfigurationTests.java | 1 - .../ReactorAutoConfigurationTests.java | 2 +- .../SecurityAutoConfigurationTests.java | 2 +- .../security/SecurityPropertiesTests.java | 1 - .../infrastructure/CommandLineInvoker.java | 1 + .../SampleActuatorNoWebApplicationTests.java | 4 ++-- .../SampleActuatorUiApplicationPortTests.java | 5 ++--- .../ui/SampleActuatorUiApplicationTests.java | 1 - ...pertiesSampleActuatorApplicationTests.java | 1 - ...AddressSampleActuatorApplicationTests.java | 5 ++--- ...agementSampleActuatorApplicationTests.java | 1 - ...agementSampleActuatorApplicationTests.java | 1 - .../SampleActuatorApplicationTests.java | 11 +++++----- ...hutdownSampleActuatorApplicationTests.java | 1 - ...agementSampleActuatorApplicationTests.java | 9 ++++---- ...nsecureSampleActuatorApplicationTests.java | 1 - .../java/sample/aop/SampleAopApplication.java | 3 ++- .../sample/aop/SampleAopApplicationTests.java | 1 - .../data/jpa/service/CityRepository.java | 3 ++- .../sample/data/jpa/service/CityService.java | 5 +++-- .../data/jpa/service/CityServiceImpl.java | 5 +++-- .../sample/data/jpa/service/HotelService.java | 5 +++-- .../data/jpa/service/HotelServiceImpl.java | 11 +++++----- .../data/jpa/service/ReviewRepository.java | 5 +++-- .../sample/data/jpa/web/SampleController.java | 3 ++- .../jpa/SampleDataJpaApplicationTests.java | 8 +++---- .../CityRepositoryIntegrationTests.java | 13 ++++++------ .../HotelRepositoryIntegrationTests.java | 21 ++++++++++--------- .../mongo/SampleMongoApplicationTests.java | 4 ++-- .../SampleIntegrationApplicationTests.java | 5 +++-- .../sample/jetty/web/SampleController.java | 3 ++- .../profile/SampleProfileApplication.java | 3 ++- .../secure/SampleSecureApplicationTests.java | 4 ++-- .../SampleServletApplicationTests.java | 4 ++-- .../simple/SampleSimpleApplication.java | 3 ++- .../sample/tomcat/web/SampleController.java | 3 ++- ...igurationSampleTomcatApplicationTests.java | 5 +++-- .../jsp/SampleWebJspApplicationTests.java | 3 ++- .../ops/ui/SampleSecureApplicationTests.java | 6 +++--- .../ui/SampleWebStaticApplicationTests.java | 3 ++- .../java/sample/ui/mvc/MessageController.java | 5 +++-- .../sample/ui/MessageControllerWebTests.java | 14 ++++++------- .../config/SampleWebSocketsApplication.java | 11 +++++----- .../samples/websocket/snake/Location.java | 12 +++++++---- .../SampleWebSocketsApplicationTests.java | 9 ++++---- .../xml/SampleSpringXmlApplication.java | 1 + .../boot/gradle/task/ProjectLibraries.java | 4 +++- .../boot/gradle/task/Repackage.java | 13 +++++++----- .../boot/gradle/task/RunApp.java | 8 +++++-- .../boot/loader/tools/LayoutsTests.java | 3 --- ...ertiesMergingResourceTransformerTests.java | 1 - .../boot/bind/RelaxedNames.java | 3 ++- .../boot/ansi/AnsiOutputTest.java | 6 ++---- .../config/ArrayDocumentMatcherTests.java | 1 - .../context/embedded/MimeMappingsTests.java | 1 - ...yEmbeddedServletContainerFactoryTests.java | 2 -- .../logging/logback/ColorConverterTests.java | 2 +- 78 files changed, 149 insertions(+), 158 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java index 20453a83067..2fb6a5a36e5 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java @@ -19,7 +19,6 @@ package org.springframework.boot.actuate.audit; import java.util.Collections; import org.junit.Test; -import org.springframework.boot.actuate.audit.AuditEvent; 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/audit/InMemoryAuditEventRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java index 3271133538b..a6a94183912 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java @@ -19,8 +19,6 @@ package org.springframework.boot.actuate.audit; import java.util.Date; import org.junit.Test; -import org.springframework.boot.actuate.audit.AuditEvent; -import org.springframework.boot.actuate.audit.InMemoryAuditEventRepository; import static org.junit.Assert.assertEquals; 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 36dc0caffc4..35e7888eb42 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 @@ -21,8 +21,6 @@ import java.util.Collections; import org.junit.Test; import org.springframework.boot.actuate.audit.AuditEvent; import org.springframework.boot.actuate.audit.AuditEventRepository; -import org.springframework.boot.actuate.audit.listener.AuditApplicationEvent; -import org.springframework.boot.actuate.audit.listener.AuditListener; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; 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 5fbbd657f11..583abfe3f6b 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 @@ -19,7 +19,6 @@ 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.autoconfigure.AuditAutoConfiguration; import org.springframework.boot.actuate.security.AuthenticationAuditListener; import org.springframework.boot.actuate.security.AuthorizationAuditListener; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java index a397595bc1f..d38e93613d2 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java @@ -17,7 +17,6 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; -import org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; 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 3d4dc1e6d93..455a682c6e9 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 @@ -22,7 +22,6 @@ import javax.servlet.FilterChain; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.boot.actuate.autoconfigure.MetricFilterAutoConfiguration; 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/TraceRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java index c7da9bb07ef..a91549062bc 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,7 +17,6 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; -import org.springframework.boot.actuate.autoconfigure.TraceRepositoryAutoConfiguration; 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/TraceWebFilterAutoConfigurationTest.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java index b46dd370c06..124dc8b31a5 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java @@ -17,8 +17,6 @@ package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; -import org.springframework.boot.actuate.autoconfigure.TraceRepositoryAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.TraceWebFilterAutoConfiguration; 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/mvc/EnvironmentMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java index 34420474d8d..7ef5a5defb5 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 @@ -24,8 +24,8 @@ import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfigur import org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; import org.springframework.boot.actuate.endpoint.EnvironmentEndpoint; import org.springframework.boot.actuate.endpoint.mvc.EnvironmentMvcEndpointTests.TestConfiguration; -import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.EnvironmentTestUtils; +import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.context.ConfigurableApplicationContext; 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/mvc/JolokiaEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaEndpointTests.java index 452472077b1..952523073e0 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaEndpointTests.java @@ -27,8 +27,8 @@ import org.springframework.boot.actuate.autoconfigure.JolokiaAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; import org.springframework.boot.actuate.endpoint.mvc.JolokiaEndpointTests.Config; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.EnvironmentTestUtils; +import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java index 5c0a669e855..13debb5edf7 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java @@ -17,7 +17,6 @@ package org.springframework.boot.actuate.health; import org.junit.Test; -import org.springframework.boot.actuate.health.VanillaHealthIndicator; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; 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 aa264d11bbc..4cb3e3bd503 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 @@ -20,7 +20,6 @@ import java.util.Date; import org.junit.Test; import org.springframework.boot.actuate.metrics.Metric; -import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; import org.springframework.boot.actuate.metrics.writer.Delta; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java index a66ab5b4d8f..1ad200a94d8 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java @@ -18,9 +18,6 @@ package org.springframework.boot.actuate.metrics.writer; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.springframework.boot.actuate.metrics.writer.DefaultCounterService; -import org.springframework.boot.actuate.metrics.writer.Delta; -import org.springframework.boot.actuate.metrics.writer.MetricWriter; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java index 0d9b6a036fe..d1ccbf9958a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java @@ -20,8 +20,6 @@ import java.util.Collections; import java.util.List; import org.junit.Test; -import org.springframework.boot.actuate.trace.InMemoryTraceRepository; -import org.springframework.boot.actuate.trace.Trace; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java index 2258f0d84b9..149d887ea6c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java @@ -21,8 +21,6 @@ import java.util.Locale; import java.util.Map; import org.junit.Test; -import org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java index 53b6329090a..76bc822c314 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -39,8 +39,8 @@ import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.repository.JobRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.test.City; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java index 01d1c17fa92..3f9a75cd497 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java @@ -19,8 +19,6 @@ package org.springframework.boot.autoconfigure.batch; import org.junit.Test; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; -import org.springframework.boot.autoconfigure.batch.JobExecutionEvent; -import org.springframework.boot.autoconfigure.batch.JobExecutionExitCodeGenerator; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java index 99e588dbaf7..25824662322 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java @@ -19,8 +19,8 @@ package org.springframework.boot.autoconfigure.data; import javax.persistence.EntityManagerFactory; import org.junit.Test; -import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.data.jpa.City; import org.springframework.boot.autoconfigure.data.jpa.CityRepository; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaWebAutoConfigurationTests.java index 132f8051ea8..75a6843fc96 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaWebAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaWebAutoConfigurationTests.java @@ -17,8 +17,8 @@ package org.springframework.boot.autoconfigure.data; import org.junit.Test; -import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.data.jpa.City; import org.springframework.boot.autoconfigure.data.jpa.CityRepository; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfigurationTests.java index 90ac3c2db1f..82ecd822c57 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfigurationTests.java @@ -17,8 +17,8 @@ package org.springframework.boot.autoconfigure.data; import org.junit.Test; -import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.data.mongo.City; import org.springframework.boot.autoconfigure.data.mongo.CityRepository; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CommonsDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CommonsDataSourceConfigurationTests.java index f7f2c135005..1a75c527c2f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CommonsDataSourceConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CommonsDataSourceConfigurationTests.java @@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; -import org.springframework.boot.autoconfigure.jdbc.CommonsDataSourceConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfigurationTests.java index f9966382925..c46eb7f9a75 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfigurationTests.java @@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; -import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java index ca3c72cf057..8de7a1f0bdd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java @@ -17,10 +17,10 @@ package org.springframework.boot.autoconfigure.reactor; import org.junit.Test; -import org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import reactor.core.Reactor; + import static org.junit.Assert.assertNotNull; /** diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java index f78822a984b..6b42ab88724 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java @@ -19,9 +19,9 @@ package org.springframework.boot.autoconfigure.security; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplicationBeforeRefreshEvent; -import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.AutoConfigurationReportLoggingInitializer; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.test.City; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java index 78b3469b2db..05079741adf 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java @@ -22,7 +22,6 @@ import java.util.Map; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; -import org.springframework.boot.autoconfigure.security.SecurityProperties; import org.springframework.boot.bind.RelaxedDataBinder; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java b/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java index 68894387d95..a434adfa3c3 100644 --- a/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java +++ b/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java @@ -132,6 +132,7 @@ public final class CommandLineInvoker { this.output = buffer; } + @Override public void run() { int read; try { diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java index 0e371182809..a79a625001c 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java @@ -16,8 +16,6 @@ package sample.actuator; -import static org.junit.Assert.assertNotNull; - import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -30,6 +28,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.actuate.endpoint.MetricsEndpoint; import org.springframework.context.ConfigurableApplicationContext; +import static org.junit.Assert.assertNotNull; + /** * Basic integration tests for service demo application. * diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java index 46b88bab3c0..2fbbf764f3d 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java @@ -16,8 +16,6 @@ package sample.actuator.ui; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.util.Map; import java.util.concurrent.Callable; @@ -29,7 +27,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import sample.actuator.ui.SampleActuatorUiApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -37,6 +34,8 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; +import static org.junit.Assert.assertEquals; + /** * Integration tests for separate management and main service ports. * diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java index c9581851b15..9947fbc4e2a 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java @@ -28,7 +28,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import sample.actuator.ui.SampleActuatorUiApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java index 56f47078361..610913dfbfa 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java @@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Test; import org.springframework.boot.SpringApplication; -import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java index 4c2278a744c..1f3e0e7fc63 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java @@ -16,8 +16,6 @@ package sample.actuator; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -32,7 +30,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -46,6 +43,8 @@ import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; +import static org.junit.Assert.assertEquals; + /** * Integration tests for separate management and main service ports. * diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementSampleActuatorApplicationTests.java index ba9646806ac..bea7493deda 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementSampleActuatorApplicationTests.java @@ -27,7 +27,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java index d7af548a8ca..0cd75ce2107 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java @@ -30,7 +30,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java index 6b1ca98bb55..a775762b6ca 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java @@ -16,11 +16,6 @@ package sample.actuator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -36,7 +31,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -54,6 +48,11 @@ import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * Basic integration tests for service demo application. * diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java index 8e004924737..3ddc4f45f73 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java @@ -30,7 +30,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java index d7c05dba510..cc78f571e3d 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java @@ -16,10 +16,6 @@ package sample.actuator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.Map; import java.util.concurrent.Callable; @@ -31,7 +27,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -39,6 +34,10 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Integration tests for unsecured service endpoints (even with Spring Security on * classpath). diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java index c3be4763e46..0eed04cce18 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java @@ -27,7 +27,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java index 011497b8166..349183b21c2 100644 --- a/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java +++ b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java @@ -20,10 +20,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import sample.aop.service.HelloWorldService; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import sample.aop.service.HelloWorldService; + @Configuration @EnableAutoConfiguration @ComponentScan diff --git a/spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java b/spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java index b5b0a3fee53..1cc4b1ade17 100644 --- a/spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java @@ -22,7 +22,6 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.test.OutputCapture; -import sample.aop.SampleAopApplication; import static org.junit.Assert.assertTrue; /** diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityRepository.java index a376f63e50d..3288cde8ea3 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityRepository.java @@ -16,11 +16,12 @@ package sample.data.jpa.service; -import sample.data.jpa.domain.City; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; +import sample.data.jpa.domain.City; + interface CityRepository extends Repository { Page findAll(Pageable pageable); diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityService.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityService.java index 9a052cddd22..edde677125c 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityService.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityService.java @@ -16,11 +16,12 @@ package sample.data.jpa.service; -import sample.data.jpa.domain.City; -import sample.data.jpa.domain.HotelSummary; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import sample.data.jpa.domain.City; +import sample.data.jpa.domain.HotelSummary; + public interface CityService { Page findCities(CitySearchCriteria criteria, Pageable pageable); diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java index fd4470efc96..d5fd6dfa68b 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java @@ -17,8 +17,6 @@ package sample.data.jpa.service; import org.springframework.beans.factory.annotation.Autowired; -import sample.data.jpa.domain.City; -import sample.data.jpa.domain.HotelSummary; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; @@ -26,6 +24,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import sample.data.jpa.domain.City; +import sample.data.jpa.domain.HotelSummary; + @Component("cityService") @Transactional class CityServiceImpl implements CityService { diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelService.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelService.java index d3a9f7dddaa..3d28b224bb4 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelService.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelService.java @@ -16,12 +16,13 @@ package sample.data.jpa.service; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + import sample.data.jpa.domain.City; import sample.data.jpa.domain.Hotel; import sample.data.jpa.domain.Review; import sample.data.jpa.domain.ReviewDetails; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; public interface HotelService { diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java index 0a8f2f13368..83c74611815 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java @@ -21,17 +21,18 @@ import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; + import sample.data.jpa.domain.City; import sample.data.jpa.domain.Hotel; import sample.data.jpa.domain.Rating; import sample.data.jpa.domain.RatingCount; import sample.data.jpa.domain.Review; import sample.data.jpa.domain.ReviewDetails; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.Assert; @Component("hotelService") @Transactional diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewRepository.java index cebfa4e21c6..0d0af7025ba 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewRepository.java @@ -16,12 +16,13 @@ package sample.data.jpa.service; -import sample.data.jpa.domain.Hotel; -import sample.data.jpa.domain.Review; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; +import sample.data.jpa.domain.Hotel; +import sample.data.jpa.domain.Review; + interface ReviewRepository extends Repository { Page findByHotel(Hotel hotel, Pageable pageable); diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/web/SampleController.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/web/SampleController.java index 645a79368ec..d6f8687f6d6 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/web/SampleController.java @@ -17,12 +17,13 @@ package sample.data.jpa.web; import org.springframework.beans.factory.annotation.Autowired; -import sample.data.jpa.service.CityService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import sample.data.jpa.service.CityService; + @Controller public class SampleController { diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java index 697dfc9ed17..a730050f74a 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -1,9 +1,5 @@ package sample.data.jpa; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -16,6 +12,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + /** * Integration test to run the application. * diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java index d4fe48051f2..6113069983d 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java @@ -15,20 +15,21 @@ */ package sample.data.jpa.service; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import sample.data.jpa.SampleDataJpaApplication; -import sample.data.jpa.domain.City; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import sample.data.jpa.SampleDataJpaApplication; +import sample.data.jpa.domain.City; + +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + /** * Integration tests for {@link CityRepository}. * diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java index acf7be89712..fd70b19e0ba 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java @@ -15,27 +15,28 @@ */ package sample.data.jpa.service; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + import sample.data.jpa.SampleDataJpaApplication; import sample.data.jpa.domain.City; import sample.data.jpa.domain.Hotel; import sample.data.jpa.domain.HotelSummary; import sample.data.jpa.domain.Rating; import sample.data.jpa.domain.RatingCount; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort.Direction; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; /** * Integration tests for {@link HotelRepository}. diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java index 421507e4f3e..1da234e401a 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java @@ -16,8 +16,6 @@ package sample.data.mongo; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import org.junit.Rule; @@ -25,6 +23,8 @@ import org.junit.Test; import org.springframework.boot.test.OutputCapture; import org.springframework.core.NestedCheckedException; +import static org.junit.Assert.assertTrue; + /** * Tests for {@link SampleMongoApplication}. * diff --git a/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java b/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java index 03bb50e32db..14e5184dabe 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java @@ -25,14 +25,15 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import sample.integration.SampleIntegrationApplication; -import sample.integration.producer.ProducerApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternUtils; import org.springframework.util.StreamUtils; +import sample.integration.SampleIntegrationApplication; +import sample.integration.producer.ProducerApplication; + import static org.junit.Assert.assertTrue; /** diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java index 1de6e6d71c7..d3eb1f70a9a 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java @@ -17,11 +17,12 @@ package sample.jetty.web; import org.springframework.beans.factory.annotation.Autowired; -import sample.jetty.service.HelloWorldService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import sample.jetty.service.HelloWorldService; + @Controller public class SampleController { diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java index 100462ebe22..8140c05166f 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java @@ -20,10 +20,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import sample.profile.service.MessageService; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import sample.profile.service.MessageService; + @Configuration @EnableAutoConfiguration @ComponentScan diff --git a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java index 7ddd32d7899..e029b91fa11 100644 --- a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java @@ -16,8 +16,6 @@ package sample.secure; -import static org.junit.Assert.assertEquals; - import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,6 +34,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import sample.secure.SampleSecureApplicationTests.TestConfiguration; +import static org.junit.Assert.assertEquals; + /** * Basic integration tests for demo application. * diff --git a/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java b/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java index 4b6fa4946a1..ca6141cc684 100644 --- a/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java @@ -1,7 +1,5 @@ package sample.servlet; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -28,6 +26,8 @@ import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; +import static org.junit.Assert.assertEquals; + /** * Basic integration tests for demo application. * diff --git a/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java index a58c845748a..830f95f15af 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java @@ -20,10 +20,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import sample.simple.service.HelloWorldService; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import sample.simple.service.HelloWorldService; + @Configuration @EnableAutoConfiguration @ComponentScan diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/web/SampleController.java b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/web/SampleController.java index ca42ed4fdd1..050817599f6 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/web/SampleController.java @@ -17,11 +17,12 @@ package sample.tomcat.web; import org.springframework.beans.factory.annotation.Autowired; -import sample.tomcat.service.HelloWorldService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import sample.tomcat.service.HelloWorldService; + @Controller public class SampleController { diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index af01ed05241..61c782fc6e3 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -31,8 +31,6 @@ import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfigura import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; -import sample.tomcat.service.HelloWorldService; -import sample.tomcat.web.SampleController; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -43,6 +41,9 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; +import sample.tomcat.service.HelloWorldService; +import sample.tomcat.web.SampleController; + import static org.junit.Assert.assertEquals; /** diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java index 5a7fa7e0b96..7385bb88994 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java @@ -17,7 +17,8 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * Basic integration tests for JSP application. diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/ops/ui/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/ops/ui/SampleSecureApplicationTests.java index 17c1d916002..b6058ee0d9e 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/ops/ui/SampleSecureApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/ops/ui/SampleSecureApplicationTests.java @@ -16,9 +16,6 @@ package sample.ops.ui; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.Arrays; import java.util.concurrent.Callable; @@ -41,6 +38,9 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * Basic integration tests for demo application. * diff --git a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java index fc6a1dd639a..50120af9dcb 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java @@ -63,7 +63,8 @@ public class SampleWebStaticApplicationTests { @Test public void testCss() throws Exception { ResponseEntity entity = getRestTemplate().getForEntity( - "http://localhost:8080/webjars/bootstrap/3.0.3/css/bootstrap.min.css", String.class); + "http://localhost:8080/webjars/bootstrap/3.0.3/css/bootstrap.min.css", + String.class); assertEquals(HttpStatus.OK, entity.getStatusCode()); assertTrue("Wrong body:\n" + entity.getBody(), entity.getBody().contains("body")); assertEquals("Wrong content type:\n" + entity.getHeaders().getContentType(), diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java index 0acbd2d91d0..d0f8cc02265 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java @@ -16,8 +16,6 @@ package sample.ui.mvc; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; -import sample.ui.Message; -import sample.ui.MessageRepository; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; @@ -27,6 +25,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import sample.ui.Message; +import sample.ui.MessageRepository; + /** * @author Rob Winch */ diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java index 0c537c80475..c17f555aa7c 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java @@ -1,12 +1,5 @@ package sample.ui; -import static org.hamcrest.Matchers.containsString; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import java.util.regex.Pattern; import org.hamcrest.Description; @@ -22,6 +15,13 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.hamcrest.Matchers.containsString; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + /** * A Basic Spring MVC Test for the Sample Controller" * diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java index bf4cb51cd28..ce28999b3ab 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java @@ -19,17 +19,18 @@ package samples.websocket.config; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.SpringBootServletInitializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; + import samples.websocket.client.GreetingService; import samples.websocket.client.SimpleGreetingService; import samples.websocket.echo.DefaultEchoService; import samples.websocket.echo.EchoService; import samples.websocket.echo.EchoWebSocketHandler; import samples.websocket.snake.SnakeWebSocketHandler; -import org.springframework.boot.web.SpringBootServletInitializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; @Configuration @EnableAutoConfiguration diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java index be6cfc1f8c2..55a50853405 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java @@ -49,17 +49,21 @@ public class Location { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Location location = (Location) o; - if (this.x != location.x) + if (this.x != location.x) { return false; - if (this.y != location.y) + } + if (this.y != location.y) { return false; + } return true; } diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/SampleWebSocketsApplicationTests.java index 1b969e718e0..36a783aefb0 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/SampleWebSocketsApplicationTests.java @@ -29,16 +29,17 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; -import samples.websocket.client.GreetingService; -import samples.websocket.client.SimpleClientWebSocketHandler; -import samples.websocket.client.SimpleGreetingService; -import samples.websocket.config.SampleWebSocketsApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.client.WebSocketConnectionManager; import org.springframework.web.socket.client.standard.StandardWebSocketClient; +import samples.websocket.client.GreetingService; +import samples.websocket.client.SimpleClientWebSocketHandler; +import samples.websocket.client.SimpleGreetingService; +import samples.websocket.config.SampleWebSocketsApplication; + import static org.junit.Assert.assertEquals; public class SampleWebSocketsApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java b/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java index 15521707b12..a62a2b265b7 100644 --- a/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java +++ b/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java @@ -19,6 +19,7 @@ package sample.xml; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; + import sample.xml.service.HelloWorldService; public class SampleSpringXmlApplication implements CommandLineRunner { diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/ProjectLibraries.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/ProjectLibraries.java index a70e27fa452..b49e72bbd50 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/ProjectLibraries.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/ProjectLibraries.java @@ -28,7 +28,7 @@ import org.springframework.boot.loader.tools.LibraryScope; /** * Expose Gradle {@link Configuration}s as {@link Libraries}. - * + * * @author Phillip Webb */ class ProjectLibraries implements Libraries { @@ -41,6 +41,7 @@ class ProjectLibraries implements Libraries { /** * Create a new {@link ProjectLibraries} instance of the specified {@link Project}. + * * @param project the gradle project */ public ProjectLibraries(Project project) { @@ -49,6 +50,7 @@ class ProjectLibraries implements Libraries { /** * Set the name of the provided configuration. Defaults to 'providedRuntime'. + * * @param providedConfigurationName the providedConfigurationName to set */ public void setProvidedConfigurationName(String providedConfigurationName) { diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/Repackage.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/Repackage.java index 69c37ba0136..04e9bb4f39f 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/Repackage.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/Repackage.java @@ -30,7 +30,7 @@ import org.springframework.boot.loader.tools.Repackager; /** * Repackage task. - * + * * @author Phillip Webb */ public class Repackage extends DefaultTask { @@ -78,13 +78,16 @@ public class Repackage extends DefaultTask { File file = archive.getArchivePath(); if (file.exists()) { Repackager repackager = new Repackager(file) { - protected String findMainMethod(java.util.jar.JarFile source) throws IOException { + + @Override + protected String findMainMethod(java.util.jar.JarFile source) + throws IOException { long startTime = System.currentTimeMillis(); try { return super.findMainMethod(source); - } - finally { - long duration = System.currentTimeMillis() - startTime; + } finally { + long duration = System.currentTimeMillis() + - startTime; if (duration > FIND_WARNING_TIMEOUT) { getLogger().warn( "Searching for the main-class is taking some time, " diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/RunApp.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/RunApp.java index 1493afa8006..dd658476843 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/RunApp.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/RunApp.java @@ -50,6 +50,8 @@ public class RunApp extends DefaultTask { JavaPluginConvention javaConvention = project.getConvention().getPlugin( JavaPluginConvention.class); javaConvention.getSourceSets().all(new Action() { + + @Override public void execute(SourceSet set) { if (SourceSet.MAIN_SOURCE_SET_NAME.equals(set.getName())) { main = set; @@ -64,10 +66,11 @@ public class RunApp extends DefaultTask { } project.getTasks().withType(JavaExec.class, new Action() { + @Override public void execute(JavaExec exec) { - ArrayList files = new ArrayList(exec.getClasspath() - .getFiles()); + ArrayList files = new ArrayList( + exec.getClasspath().getFiles()); files.addAll(0, allResources); getLogger().info("Adding classpath: " + allResources); exec.setClasspath(new SimpleFileCollection(files)); @@ -75,6 +78,7 @@ public class RunApp extends DefaultTask { final String mainClass = findMainClass(main); exec.setMain(mainClass); exec.getConventionMapping().map("main", new Callable() { + @Override public String call() throws Exception { return mainClass; diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java index 242aa52c53c..82bfdf05f64 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java @@ -21,9 +21,6 @@ import java.io.File; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.loader.tools.Layout; -import org.springframework.boot.loader.tools.Layouts; -import org.springframework.boot.loader.tools.LibraryScope; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java index 346cdbe900e..818ef10fbfb 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java @@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream; import java.util.jar.JarOutputStream; import org.junit.Test; -import org.springframework.boot.maven.PropertiesMergingResourceTransformer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java index 4af72b62fe5..64a3cc37e88 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java @@ -139,10 +139,11 @@ public final class RelaxedNames implements Iterable { builder.append(builder.length() == 0 ? field : StringUtils .capitalize(field)); } - for (String suffix : new String[] { "_", "-", "." }) + for (String suffix : new String[] { "_", "-", "." }) { if (value.endsWith(suffix)) { builder.append(suffix); } + } return builder.toString(); } }; diff --git a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java index 19382254a3e..d9f3d8712ed 100644 --- a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java +++ b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java @@ -19,18 +19,16 @@ package org.springframework.boot.ansi; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.boot.ansi.AnsiOutput; import org.springframework.boot.ansi.AnsiOutput.Enabled; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; import static org.springframework.boot.ansi.AnsiElement.BOLD; import static org.springframework.boot.ansi.AnsiElement.FAINT; import static org.springframework.boot.ansi.AnsiElement.GREEN; import static org.springframework.boot.ansi.AnsiElement.NORMAL; import static org.springframework.boot.ansi.AnsiElement.RED; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; - /** * Tests for {@link AnsiOutput}. * diff --git a/spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java b/spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java index b44f0d9f3e0..16450ac4fb0 100644 --- a/spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.util.Properties; import org.junit.Test; -import org.springframework.boot.config.ArrayDocumentMatcher; import org.springframework.boot.config.YamlProcessor.MatchStatus; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.support.PropertiesLoaderUtils; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java index e0391f44218..bf3e968b717 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java @@ -29,7 +29,6 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.boot.context.embedded.MimeMappings; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index 6219203f8d8..4fc4ffc0e05 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -25,8 +25,6 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.junit.Test; import org.mockito.InOrder; import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactoryTests; -import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainer; -import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java index 9349518d5e0..e00bde025cb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java @@ -23,10 +23,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.ansi.AnsiOutput; -import org.springframework.boot.logging.logback.ColorConverter; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.LoggingEvent; + import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat;