Organize imports

Author: philwebb

spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.actuate.hypermedia;
 
-import groovy.text.Template;
-import groovy.text.TemplateEngine;
-
 import java.io.File;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -53,6 +50,9 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.WebApplicationContext;
 
+import groovy.text.Template;
+import groovy.text.TemplateEngine;
+
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/SpringBootHypermediaApplication.java

@@ -16,13 +16,13 @@
 
 package org.springframework.boot.actuate.hypermedia;
 
-import groovy.text.GStringTemplateEngine;
-import groovy.text.TemplateEngine;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
+import groovy.text.GStringTemplateEngine;
+import groovy.text.TemplateEngine;
+
 @SpringBootApplication
 public class SpringBootHypermediaApplication {
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java

@@ -18,8 +18,6 @@
 
 import javax.cache.Caching;
 
-import net.sf.ehcache.Ehcache;
-
 import org.infinispan.spring.provider.SpringCache;
 import org.springframework.boot.actuate.cache.CacheStatistics;
 import org.springframework.boot.actuate.cache.CacheStatisticsProvider;
@@ -46,6 +44,8 @@
 import com.hazelcast.core.IMap;
 import com.hazelcast.spring.cache.HazelcastCache;
 
+import net.sf.ehcache.Ehcache;
+
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for {@link CacheStatisticsProvider}
  * beans.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java

@@ -25,8 +25,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import liquibase.integration.spring.SpringLiquibase;
-
 import org.flywaydb.core.Flyway;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -69,6 +67,8 @@
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.web.servlet.handler.AbstractHandlerMethodMapping;
 
+import liquibase.integration.spring.SpringLiquibase;
+
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for common management
  * {@link Endpoint}s.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/EhCacheStatisticsProvider.java

@@ -16,11 +16,11 @@
 
 package org.springframework.boot.actuate.cache;
 
-import net.sf.ehcache.statistics.StatisticsGateway;
-
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.ehcache.EhCacheCache;
 
+import net.sf.ehcache.statistics.StatisticsGateway;
+
 /**
  * {@link CacheStatisticsProvider} implementation for EhCache.
  *

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java

@@ -21,15 +21,15 @@
 
 import javax.sql.DataSource;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.Assert;
+
 import liquibase.changelog.StandardChangeLogHistoryService;
 import liquibase.database.Database;
 import liquibase.database.DatabaseFactory;
 import liquibase.database.jvm.JdbcConnection;
 import liquibase.integration.spring.SpringLiquibase;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.util.Assert;
-
 /**
  * {@link Endpoint} to expose liquibase info.
  *

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.actuate.endpoint;
 
-import liquibase.integration.spring.SpringLiquibase;
-
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
@@ -26,6 +24,8 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
+import liquibase.integration.spring.SpringLiquibase;
+
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java

@@ -16,16 +16,16 @@
 
 package org.springframework.boot.actuate.metrics.writer;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 /**
  * Tests for {@link DefaultCounterService}.
  */

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.autoconfigure.cache;
 
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -30,6 +27,9 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
+
 /**
  * EhCache cache configuration. Only kick in if a configuration file location is set or if
  * a default configuration file exists.

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java

@@ -26,8 +26,6 @@
 import javax.cache.expiry.CreatedExpiryPolicy;
 import javax.cache.expiry.Duration;
 
-import net.sf.ehcache.Status;
-
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.jcache.embedded.JCachingProvider;
 import org.infinispan.spring.provider.SpringEmbeddedCacheManager;
@@ -69,6 +67,8 @@
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.spring.cache.HazelcastCacheManager;
 
+import net.sf.ehcache.Status;
+
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.Matchers.contains;