Organize imports

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.groovy.template;
 
-import groovy.text.markup.MarkupTemplateEngine;
-
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
 
@@ -45,6 +43,8 @@ import org.springframework.web.servlet.view.groovy.GroovyMarkupConfig;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver;
 
+import groovy.text.markup.MarkupTemplateEngine;
+
 /**
  * Autoconfiguration support for Groovy templates in MVC. By default creates a
  * {@link MarkupTemplateEngine} configured from {@link GroovyTemplateProperties}, but you

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateResolver.java

@@ -15,10 +15,6 @@
  */
 package org.springframework.boot.autoconfigure.groovy.template;
 
-import groovy.text.markup.MarkupTemplateEngine;
-import groovy.text.markup.TemplateConfiguration;
-import groovy.text.markup.TemplateResolver;
-
 import java.io.IOException;
 import java.net.URL;
 
@@ -26,6 +22,10 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver;
 
+import groovy.text.markup.MarkupTemplateEngine;
+import groovy.text.markup.TemplateConfiguration;
+import groovy.text.markup.TemplateResolver;
+
 /**
  * A custom {@link groovy.text.markup.TemplateResolver template resolver} which resolves
  * templates using the locale found in the thread locale. This resolver ignores the

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

@@ -20,9 +20,6 @@ import javax.annotation.PostConstruct;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
-import liquibase.integration.spring.SpringLiquibase;
-import liquibase.servicelocator.ServiceLocator;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -46,6 +43,9 @@ import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.util.Assert;
 
+import liquibase.integration.spring.SpringLiquibase;
+import liquibase.servicelocator.ServiceLocator;
+
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Liquibase.
  *

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java

@@ -18,10 +18,10 @@ package org.springframework.boot.autoconfigure.liquibase;
 
 import javax.validation.constraints.NotNull;
 
-import liquibase.integration.spring.SpringLiquibase;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import liquibase.integration.spring.SpringLiquibase;
+
 /**
  * Configuration properties to configure {@link SpringLiquibase}.
  *

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfiguration.java

@@ -37,7 +37,6 @@ import org.springframework.social.connect.ConnectionFactory;
 import org.springframework.social.connect.ConnectionRepository;
 import org.springframework.social.connect.web.GenericConnectionStatusView;
 import org.springframework.social.facebook.api.Facebook;
-import org.springframework.social.facebook.api.impl.FacebookTemplate;
 import org.springframework.social.facebook.connect.FacebookConnectionFactory;
 import org.springframework.web.servlet.View;
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

@@ -22,8 +22,6 @@ import java.util.Collections;
 import javax.annotation.PostConstruct;
 import javax.servlet.Servlet;
 
-import nz.net.ultraq.thymeleaf.LayoutDialect;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -50,6 +48,8 @@ import org.thymeleaf.templateresolver.TemplateResolver;
 
 import com.github.mxab.thymeleaf.extras.dataattribute.dialect.DataAttributeDialect;
 
+import nz.net.ultraq.thymeleaf.LayoutDialect;
+
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Thymeleaf.
  *

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.web;
 
-import io.undertow.Undertow;
-
 import javax.servlet.Servlet;
 
 import org.apache.catalina.startup.Tomcat;
@@ -50,6 +48,8 @@ import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.ObjectUtils;
 import org.xnio.SslClientAuthMode;
 
+import io.undertow.Undertow;
+
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for an embedded servlet containers.
  *

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/UndertowWebSocketContainerCustomizer.java

@@ -16,12 +16,12 @@
 
 package org.springframework.boot.autoconfigure.websocket;
 
-import io.undertow.servlet.api.DeploymentInfo;
-import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
-
 import org.springframework.boot.context.embedded.undertow.UndertowDeploymentInfoCustomizer;
 import org.springframework.boot.context.embedded.undertow.UndertowEmbeddedServletContainerFactory;
 
+import io.undertow.servlet.api.DeploymentInfo;
+import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
+
 /**
  * {@link WebSocketContainerCustomizer} for
  * {@link UndertowEmbeddedServletContainerFactory}.

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.groovy.template;
 
-import groovy.text.markup.MarkupTemplateEngine;
-
 import java.io.File;
 import java.io.StringWriter;
 import java.io.Writer;
@@ -44,6 +42,8 @@ import org.springframework.web.servlet.view.groovy.GroovyMarkupConfig;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver;
 
+import groovy.text.markup.MarkupTemplateEngine;
+
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.liquibase;
 
-import liquibase.integration.spring.SpringLiquibase;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -31,6 +29,8 @@ import org.springframework.boot.test.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import liquibase.integration.spring.SpringLiquibase;
+
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewTests.java

@@ -20,7 +20,6 @@ import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.boot.autoconfigure.mustache.web.MustacheView;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java

@@ -33,8 +33,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
 import org.springframework.boot.autoconfigure.mustache.MustacheResourceTemplateLoader;
-import org.springframework.boot.autoconfigure.mustache.web.MustacheView;
-import org.springframework.boot.autoconfigure.mustache.web.MustacheViewResolver;
 import org.springframework.boot.autoconfigure.mustache.web.MustacheWebIntegrationTests.Application;
 import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/grab/GrabCommand.java

@@ -18,8 +18,6 @@ package org.springframework.boot.cli.command.grab;
 
 import java.util.List;
 
-import joptsimple.OptionSet;
-
 import org.springframework.boot.cli.command.Command;
 import org.springframework.boot.cli.command.OptionParsingCommand;
 import org.springframework.boot.cli.command.options.CompilerOptionHandler;
@@ -31,6 +29,8 @@ import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
 import org.springframework.boot.cli.compiler.RepositoryConfigurationFactory;
 import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
 
+import joptsimple.OptionSet;
+
 /**
  * {@link Command} to grab the dependencies of one or more Groovy scripts
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java

@@ -22,9 +22,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
-
 import org.springframework.boot.cli.command.Command;
 import org.springframework.boot.cli.command.HelpExample;
 import org.springframework.boot.cli.command.OptionParsingCommand;
@@ -33,6 +30,9 @@ import org.springframework.boot.cli.command.status.ExitStatus;
 import org.springframework.boot.cli.util.Log;
 import org.springframework.util.Assert;
 
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+
 /**
  * {@link Command} that initializes a project using Spring initializr.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/InstallCommand.java

@@ -17,8 +17,6 @@ package org.springframework.boot.cli.command.install;
 
 import java.util.List;
 
-import joptsimple.OptionSet;
-
 import org.springframework.boot.cli.command.Command;
 import org.springframework.boot.cli.command.OptionParsingCommand;
 import org.springframework.boot.cli.command.options.CompilerOptionHandler;
@@ -26,6 +24,8 @@ import org.springframework.boot.cli.command.status.ExitStatus;
 import org.springframework.boot.cli.util.Log;
 import org.springframework.util.Assert;
 
+import joptsimple.OptionSet;
+
 /**
  * {@link Command} to install additional dependencies into the CLI.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java

@@ -23,8 +23,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
 
-import joptsimple.OptionSet;
-
 import org.springframework.boot.cli.command.options.CompilerOptionHandler;
 import org.springframework.boot.cli.command.options.OptionSetGroovyCompilerConfiguration;
 import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
@@ -34,6 +32,8 @@ import org.springframework.boot.cli.util.Log;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.SystemPropertyUtils;
 
+import joptsimple.OptionSet;
+
 /**
  * Shared logic for the {@link InstallCommand} and {@link UninstallCommand}.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/UninstallCommand.java

@@ -18,15 +18,15 @@ package org.springframework.boot.cli.command.install;
 
 import java.util.List;
 
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
-
 import org.springframework.boot.cli.command.Command;
 import org.springframework.boot.cli.command.OptionParsingCommand;
 import org.springframework.boot.cli.command.options.CompilerOptionHandler;
 import org.springframework.boot.cli.command.status.ExitStatus;
 import org.springframework.boot.cli.util.Log;
 
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+
 /**
  * {@link Command} to uninstall dependencies from the CLI's lib directory
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.command.jar;
 
-import groovy.lang.Grab;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -31,9 +29,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.jar.Manifest;
 
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
-
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.AnnotatedNode;
 import org.codehaus.groovy.ast.AnnotationNode;
@@ -64,6 +59,10 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.util.Assert;
 
+import groovy.lang.Grab;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+
 /**
  * {@link Command} to create a self-contained executable jar file from a CLI application
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.command.options;
 
-import groovy.lang.Closure;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -31,6 +29,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.springframework.boot.cli.command.OptionParsingCommand;
+import org.springframework.boot.cli.command.status.ExitStatus;
+
+import groovy.lang.Closure;
 import joptsimple.BuiltinHelpFormatter;
 import joptsimple.HelpFormatter;
 import joptsimple.OptionDescriptor;
@@ -38,9 +40,6 @@ import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpecBuilder;
 
-import org.springframework.boot.cli.command.OptionParsingCommand;
-import org.springframework.boot.cli.command.status.ExitStatus;
-
 /**
  * Delegate used by {@link OptionParsingCommand} to parse options and run the command.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java

@@ -18,14 +18,14 @@ package org.springframework.boot.cli.command.options;
 
 import java.util.List;
 
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
-
 import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
 import org.springframework.boot.cli.compiler.GroovyCompilerScope;
 import org.springframework.boot.cli.compiler.RepositoryConfigurationFactory;
 import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
 
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+
 /**
  * Simple adapter class to present an {@link OptionSet} as a
  * {@link GroovyCompilerConfiguration}

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java

@@ -20,11 +20,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import joptsimple.OptionSet;
-
 import org.springframework.boot.cli.util.ResourceUtils;
 import org.springframework.util.Assert;
 
+import joptsimple.OptionSet;
+
 /**
  * Extract source file options (anything following '--' in an {@link OptionSet}).
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java

@@ -20,9 +20,6 @@ import java.io.File;
 import java.util.List;
 import java.util.logging.Level;
 
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
-
 import org.springframework.boot.cli.command.Command;
 import org.springframework.boot.cli.command.OptionParsingCommand;
 import org.springframework.boot.cli.command.options.CompilerOptionHandler;
@@ -33,6 +30,9 @@ import org.springframework.boot.cli.compiler.GroovyCompilerScope;
 import org.springframework.boot.cli.compiler.RepositoryConfigurationFactory;
 import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
 
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+
 import static java.util.Arrays.asList;
 
 /**

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java

@@ -16,11 +16,11 @@
 
 package org.springframework.boot.cli.command.shell;
 
-import jline.Terminal;
-
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.AnsiRenderer.Code;
 
+import jline.Terminal;
+
 /**
  * Simple utitliy class to build an ANSI string when supported by the {@link Terminal}.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ClearCommand.java

@@ -16,11 +16,11 @@
 
 package org.springframework.boot.cli.command.shell;
 
-import jline.console.ConsoleReader;
-
 import org.springframework.boot.cli.command.AbstractCommand;
 import org.springframework.boot.cli.command.status.ExitStatus;
 
+import jline.console.ConsoleReader;
+
 /**
  * Clear the {@link Shell} screen.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java

@@ -22,6 +22,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.boot.cli.command.Command;
+import org.springframework.boot.cli.command.options.OptionHelp;
+import org.springframework.boot.cli.util.Log;
+
 import jline.console.ConsoleReader;
 import jline.console.completer.AggregateCompleter;
 import jline.console.completer.ArgumentCompleter;
@@ -30,10 +34,6 @@ import jline.console.completer.Completer;
 import jline.console.completer.FileNameCompleter;
 import jline.console.completer.StringsCompleter;
 
-import org.springframework.boot.cli.command.Command;
-import org.springframework.boot.cli.command.options.OptionHelp;
-import org.springframework.boot.cli.util.Log;
-
 /**
  * JLine {@link Completer} for Spring Boot {@link Command}s.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java

@@ -26,9 +26,6 @@ import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
 
-import jline.console.ConsoleReader;
-import jline.console.completer.CandidateListCompletionHandler;
-
 import org.fusesource.jansi.AnsiRenderer.Code;
 import org.springframework.boot.cli.command.Command;
 import org.springframework.boot.cli.command.CommandFactory;
@@ -38,6 +35,9 @@ import org.springframework.boot.cli.command.core.VersionCommand;
 import org.springframework.boot.loader.tools.SignalUtils;
 import org.springframework.util.StringUtils;
 
+import jline.console.ConsoleReader;
+import jline.console.completer.CandidateListCompletionHandler;
+
 /**
  * A shell for Spring Boot. Drops the user into an event loop (REPL) where command line
  * completion and history are available without relying on OS shell features.

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.command.test;
 
-import joptsimple.OptionSet;
-
 import org.springframework.boot.cli.command.Command;
 import org.springframework.boot.cli.command.OptionParsingCommand;
 import org.springframework.boot.cli.command.options.CompilerOptionHandler;
@@ -25,6 +23,8 @@ import org.springframework.boot.cli.command.options.OptionSetGroovyCompilerConfi
 import org.springframework.boot.cli.command.options.SourceOptions;
 import org.springframework.boot.cli.command.status.ExitStatus;
 
+import joptsimple.OptionSet;
+
 /**
  * {@link Command} to run a groovy test script or scripts.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.lang.GroovyClassLoader;
-
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.classgen.GeneratorContext;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -25,6 +23,8 @@ import org.codehaus.groovy.control.CompilePhase;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 
+import groovy.lang.GroovyClassLoader;
+
 /**
  * Strategy that can be used to apply some auto-configuration during the
  * {@link CompilePhase#CONVERSION} Groovy compile phase.

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.lang.GroovyClassLoader;
-
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.ModuleNode;
@@ -26,6 +24,8 @@ import org.codehaus.groovy.transform.ASTTransformation;
 import org.springframework.boot.cli.compiler.grape.DependencyResolutionContext;
 import org.springframework.core.annotation.Order;
 
+import groovy.lang.GroovyClassLoader;
+
 /**
  * {@link ASTTransformation} to apply
  * {@link CompilerAutoConfiguration#applyDependencies(DependencyCustomizer) dependency

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.lang.Grab;
-import groovy.lang.GroovyClassLoader;
-
 import org.codehaus.groovy.ast.AnnotationNode;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.ModuleNode;
@@ -26,6 +23,9 @@ import org.codehaus.groovy.ast.expr.ConstantExpression;
 import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver;
 import org.springframework.boot.cli.compiler.grape.DependencyResolutionContext;
 
+import groovy.lang.Grab;
+import groovy.lang.GroovyClassLoader;
+
 /**
  * Customizer that allows dependencies to be added during compilation. Adding a dependency
  * results in a {@link Grab @Grab} annotation being added to the primary {@link ClassNode

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.lang.GroovyClassLoader;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
@@ -40,6 +38,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StringUtils;
 
+import groovy.lang.GroovyClassLoader;
+
 /**
  * Extension of the {@link GroovyClassLoader} with support for obtaining '.class' files as
  * resources.

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrabMetadataTransformation.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.grape.Grape;
-
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
@@ -46,6 +44,8 @@ import org.springframework.boot.groovy.GrabMetadata;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
+import groovy.grape.Grape;
+
 /**
  * {@link ASTTransformation} for processing {@link GrabMetadata @GrabMetadata}
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java

@@ -16,10 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.lang.GroovyClassLoader;
-import groovy.lang.GroovyClassLoader.ClassCollector;
-import groovy.lang.GroovyCodeSource;
-
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.net.URL;
@@ -49,6 +45,10 @@ import org.springframework.boot.cli.compiler.grape.GrapeEngineInstaller;
 import org.springframework.boot.cli.util.ResourceUtils;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyClassLoader.ClassCollector;
+import groovy.lang.GroovyCodeSource;
+
 /**
  * Compiler for Groovy sources. Primarily a simple Facade for
  * {@link GroovyClassLoader#parseClass(GroovyCodeSource)} with the following additional

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.lang.Grab;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -31,6 +29,8 @@ import org.codehaus.groovy.transform.ASTTransformation;
 import org.springframework.boot.cli.compiler.grape.DependencyResolutionContext;
 import org.springframework.core.annotation.Order;
 
+import groovy.lang.Grab;
+
 /**
  * {@link ASTTransformation} to resolve {@link Grab} artifact coordinates.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler.autoconfigure;
 
-import groovy.lang.GroovyClassLoader;
-
 import org.codehaus.groovy.ast.AnnotationNode;
 import org.codehaus.groovy.ast.ClassHelper;
 import org.codehaus.groovy.ast.ClassNode;
@@ -29,6 +27,8 @@ import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
 import org.springframework.boot.cli.compiler.DependencyCustomizer;
 import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
 
+import groovy.lang.GroovyClassLoader;
+
 /**
  * {@link CompilerAutoConfiguration} for Spring.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler.autoconfigure;
 
-import groovy.lang.GroovyClassLoader;
-
 import org.codehaus.groovy.ast.AnnotationNode;
 import org.codehaus.groovy.ast.ClassHelper;
 import org.codehaus.groovy.ast.ClassNode;
@@ -31,6 +29,8 @@ import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
 import org.springframework.boot.cli.compiler.DependencyCustomizer;
 import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
 
+import groovy.lang.GroovyClassLoader;
+
 /**
  * {@link CompilerAutoConfiguration} for Spring Test
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.cli.compiler.grape;
 
-import groovy.grape.GrapeEngine;
-import groovy.lang.GroovyClassLoader;
-
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -43,6 +40,9 @@ import org.eclipse.aether.resolution.DependencyResult;
 import org.eclipse.aether.util.artifact.JavaScopes;
 import org.eclipse.aether.util.filter.DependencyFilterUtils;
 
+import groovy.grape.GrapeEngine;
+import groovy.lang.GroovyClassLoader;
+
 /**
  * A {@link GrapeEngine} implementation that uses <a
  * href="http://eclipse.org/aether">Aether</a>, the dependency resolution system used by

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler.grape;
 
-import groovy.lang.GroovyClassLoader;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
@@ -36,6 +34,8 @@ import org.eclipse.aether.spi.locator.ServiceLocator;
 import org.eclipse.aether.transport.file.FileTransporterFactory;
 import org.eclipse.aether.transport.http.HttpTransporterFactory;
 
+import groovy.lang.GroovyClassLoader;
+
 /**
  * Utility class to create a pre-configured {@link AetherGrapeEngine}.
  *

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java

@@ -16,11 +16,11 @@
 
 package org.springframework.boot.cli.compiler.grape;
 
+import java.lang.reflect.Field;
+
 import groovy.grape.Grape;
 import groovy.grape.GrapeEngine;
 
-import java.lang.reflect.Field;
-
 /**
  * Utility to install a specific {@link Grape} engine with Groovy.
  *

spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java

@@ -16,11 +16,6 @@
 
 package org.springframework.boot.groovy;
 
-import groovy.lang.Writable;
-import groovy.text.GStringTemplateEngine;
-import groovy.text.Template;
-import groovy.text.TemplateEngine;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -30,6 +25,11 @@ import java.util.Map;
 
 import org.codehaus.groovy.control.CompilationFailedException;
 
+import groovy.lang.Writable;
+import groovy.text.GStringTemplateEngine;
+import groovy.text.Template;
+import groovy.text.TemplateEngine;
+
 /**
  * Helpful utilties for working with Groovy {@link Template}s.
  *

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java

@@ -24,8 +24,6 @@ import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import joptsimple.OptionSet;
-
 import org.apache.http.Header;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.junit.Before;
@@ -37,6 +35,8 @@ import org.mockito.Captor;
 import org.mockito.MockitoAnnotations;
 import org.springframework.boot.cli.command.status.ExitStatus;
 
+import joptsimple.OptionSet;
+
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiterTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.boot.cli.command.shell;
 
-import jline.console.completer.ArgumentCompleter.ArgumentList;
-
 import org.junit.Test;
 
+import jline.console.completer.ArgumentCompleter.ArgumentList;
+
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/DependencyCustomizerTests.java

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.lang.Grab;
-import groovy.lang.GroovyClassLoader;
-
 import java.util.List;
 
 import org.codehaus.groovy.ast.AnnotationNode;
@@ -33,6 +30,9 @@ import org.mockito.MockitoAnnotations;
 import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver;
 import org.springframework.boot.cli.compiler.grape.DependencyResolutionContext;
 
+import groovy.lang.Grab;
+import groovy.lang.GroovyClassLoader;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.mockito.BDDMockito.given;

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler;
 
-import groovy.lang.Grab;
-
 import java.util.Arrays;
 
 import org.codehaus.groovy.ast.ASTNode;
@@ -45,6 +43,8 @@ import org.junit.Test;
 import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver;
 import org.springframework.boot.cli.compiler.grape.DependencyResolutionContext;
 
+import groovy.lang.Grab;
+
 import static org.junit.Assert.assertEquals;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.cli.compiler.grape;
 
-import groovy.lang.GroovyClassLoader;
-
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
@@ -33,6 +31,8 @@ import org.eclipse.aether.repository.RemoteRepository;
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import groovy.lang.GroovyClassLoader;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

spring-boot-samples/spring-boot-sample-testng/src/test/java/sample/testng/SampleTestNGApplicationTests.java

@@ -26,7 +26,6 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
 import org.testng.annotations.Test;
 
-import sample.testng.SampleTestNGApplication;
 import static org.testng.Assert.assertEquals;
 
 /**

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java

@@ -19,11 +19,11 @@ package org.springframework.boot.configurationsample.lombok;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.boot.configurationsample.ConfigurationProperties;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import org.springframework.boot.configurationsample.ConfigurationProperties;
-
 /**
  * Configuration properties using lombok @Getter/@Setter at field level.
  *

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java

@@ -19,10 +19,10 @@ package org.springframework.boot.configurationsample.lombok;
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Data;
-
 import org.springframework.boot.configurationsample.ConfigurationProperties;
 
+import lombok.Data;
+
 /**
  * Configuration properties using lombok @Data.
  *

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java

@@ -19,11 +19,11 @@ package org.springframework.boot.configurationsample.lombok;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.boot.configurationsample.ConfigurationProperties;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import org.springframework.boot.configurationsample.ConfigurationProperties;
-
 /**
  * Configuration properties using lombok @Getter/@Setter at class level.
  *

spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot;
 
-import groovy.lang.Closure;
-
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
@@ -43,6 +41,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
+import groovy.lang.Closure;
+
 /**
  * Loads bean definitions from underlying sources, including XML and JavaConfig. Acts as a
  * simple facade over {@link AnnotatedBeanDefinitionReader},

spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java

@@ -16,12 +16,6 @@
 
 package org.springframework.boot.context.embedded.undertow;
 
-import io.undertow.Handlers;
-import io.undertow.Undertow;
-import io.undertow.Undertow.Builder;
-import io.undertow.server.HttpHandler;
-import io.undertow.servlet.api.DeploymentManager;
-
 import java.lang.reflect.Field;
 import java.net.ServerSocket;
 import java.util.ArrayList;
@@ -36,6 +30,12 @@ import org.springframework.boot.context.embedded.EmbeddedServletContainerExcepti
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
+import io.undertow.Handlers;
+import io.undertow.Undertow;
+import io.undertow.Undertow.Builder;
+import io.undertow.server.HttpHandler;
+import io.undertow.servlet.api.DeploymentManager;
+
 /**
  * {@link EmbeddedServletContainer} that can be used to control an embedded Undertow
  * server. Typically this class should be created using

spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java

@@ -16,25 +16,6 @@
 
 package org.springframework.boot.context.embedded.undertow;
 
-import io.undertow.Undertow;
-import io.undertow.Undertow.Builder;
-import io.undertow.UndertowMessages;
-import io.undertow.server.handlers.resource.ClassPathResourceManager;
-import io.undertow.server.handlers.resource.FileResourceManager;
-import io.undertow.server.handlers.resource.Resource;
-import io.undertow.server.handlers.resource.ResourceChangeListener;
-import io.undertow.server.handlers.resource.ResourceManager;
-import io.undertow.server.handlers.resource.URLResource;
-import io.undertow.server.session.SessionManager;
-import io.undertow.servlet.Servlets;
-import io.undertow.servlet.api.DeploymentInfo;
-import io.undertow.servlet.api.DeploymentManager;
-import io.undertow.servlet.api.MimeMapping;
-import io.undertow.servlet.api.ServletContainerInitializerInfo;
-import io.undertow.servlet.api.ServletStackTraces;
-import io.undertow.servlet.handlers.DefaultServlet;
-import io.undertow.servlet.util.ImmediateInstanceFactory;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -72,6 +53,25 @@ import org.springframework.util.ResourceUtils;
 import org.xnio.Options;
 import org.xnio.SslClientAuthMode;
 
+import io.undertow.Undertow;
+import io.undertow.Undertow.Builder;
+import io.undertow.UndertowMessages;
+import io.undertow.server.handlers.resource.ClassPathResourceManager;
+import io.undertow.server.handlers.resource.FileResourceManager;
+import io.undertow.server.handlers.resource.Resource;
+import io.undertow.server.handlers.resource.ResourceChangeListener;
+import io.undertow.server.handlers.resource.ResourceManager;
+import io.undertow.server.handlers.resource.URLResource;
+import io.undertow.server.session.SessionManager;
+import io.undertow.servlet.Servlets;
+import io.undertow.servlet.api.DeploymentInfo;
+import io.undertow.servlet.api.DeploymentManager;
+import io.undertow.servlet.api.MimeMapping;
+import io.undertow.servlet.api.ServletContainerInitializerInfo;
+import io.undertow.servlet.api.ServletStackTraces;
+import io.undertow.servlet.handlers.DefaultServlet;
+import io.undertow.servlet.util.ImmediateInstanceFactory;
+
 /**
  * {@link EmbeddedServletContainerFactory} that can be used to create
  * {@link UndertowEmbeddedServletContainer}s.

spring-boot/src/main/java/org/springframework/boot/liquibase/CommonsLoggingLiquibaseLogger.java

@@ -16,13 +16,13 @@
 
 package org.springframework.boot.liquibase;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import liquibase.logging.LogLevel;
 import liquibase.logging.Logger;
 import liquibase.logging.core.AbstractLogger;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * Liquibase {@link Logger} that delegates to an Apache Commons {@link Log}.
  *

spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java

@@ -16,15 +16,15 @@
 
 package org.springframework.boot.liquibase;
 
-import liquibase.servicelocator.CustomResolverServiceLocator;
-import liquibase.servicelocator.ServiceLocator;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.util.ClassUtils;
 
+import liquibase.servicelocator.CustomResolverServiceLocator;
+import liquibase.servicelocator.ServiceLocator;
+
 /**
  * {@link ApplicationListener} that replaces the liquibase {@link ServiceLocator} with a
  * version that works with Spring Boot executable archives.

spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java

@@ -18,9 +18,6 @@ package org.springframework.boot.liquibase;
 
 import java.io.IOException;
 
-import liquibase.servicelocator.DefaultPackageScanClassResolver;
-import liquibase.servicelocator.PackageScanClassResolver;
-
 import org.apache.commons.logging.Log;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -30,6 +27,9 @@ import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.util.ClassUtils;
 
+import liquibase.servicelocator.DefaultPackageScanClassResolver;
+import liquibase.servicelocator.PackageScanClassResolver;
+
 /**
  * Liquibase {@link PackageScanClassResolver} implementation that uses Spring's resource
  * scanning to locate classes. This variant is safe to use with Spring Boot packaged

spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.context.embedded.undertow;
 
-import io.undertow.Undertow.Builder;
-import io.undertow.servlet.api.DeploymentInfo;
-
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -31,6 +28,9 @@ import org.springframework.boot.context.embedded.ExampleServlet;
 import org.springframework.boot.context.embedded.ServletRegistrationBean;
 import org.springframework.http.HttpStatus;
 
+import io.undertow.Undertow.Builder;
+import io.undertow.servlet.api.DeploymentInfo;
+
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;

spring-boot/src/test/java/org/springframework/boot/liquibase/CommonsLoggingLiquibaseLoggerTests.java

@@ -16,12 +16,12 @@
 
 package org.springframework.boot.liquibase;
 
-import liquibase.logging.LogLevel;
-
 import org.apache.commons.logging.Log;
 import org.junit.Before;
 import org.junit.Test;
 
+import liquibase.logging.LogLevel;
+
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListenerTests.java

@@ -18,13 +18,13 @@ package org.springframework.boot.liquibase;
 
 import java.lang.reflect.Field;
 
-import liquibase.servicelocator.ServiceLocator;
-
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ReflectionUtils;
 
+import liquibase.servicelocator.ServiceLocator;
+
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertThat;
 

spring-boot/src/test/java/org/springframework/boot/liquibase/SpringPackageScanClassResolverTests.java

@@ -18,11 +18,11 @@ package org.springframework.boot.liquibase;
 
 import java.util.Set;
 
-import liquibase.logging.Logger;
-
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
 
+import liquibase.logging.Logger;
+
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertThat;