Organize imports

dbck · Sep 8, 2015 · 0f6b60d · 0f6b60d
1 parent 653d2b2
commit 0f6b60d
Show file tree

Hide file tree

Showing 59 changed files with 158 additions and 165 deletions.
diff --git a/...g/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java b/...g/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.GroovyMarkupConfigurer;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver;
 
+import groovy.text.markup.MarkupTemplateEngine;
+
 /**
  * Autoconfiguration support for Groovy templates in MVC. By default creates a
  * {@link MarkupTemplateEngine} configured from {@link GroovyTemplateProperties}, but you

diff --git a/...n/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateResolver.java b/...n/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateResolver.java
@@ -15,17 +15,17 @@
  */
 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;
 
 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

diff --git a/...ain/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
@@ -20,9 +20,6 @@
 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.LocalContainerEntityManagerFactoryBean;
 import org.springframework.util.Assert;
 
+import liquibase.integration.spring.SpringLiquibase;
+import liquibase.servicelocator.ServiceLocator;
+
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Liquibase.
  *

diff --git a/...e/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java b/...e/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java
@@ -18,10 +18,10 @@
 
 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}.
  *

diff --git a/...rc/main/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfiguration.java b/...rc/main/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfiguration.java
@@ -37,7 +37,6 @@
 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;
 

diff --git a/...ain/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -22,8 +22,6 @@
 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 com.github.mxab.thymeleaf.extras.dataattribute.dialect.DataAttributeDialect;
 
+import nz.net.ultraq.thymeleaf.LayoutDialect;
+
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Thymeleaf.
  *

diff --git a/...org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/...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.util.ObjectUtils;
 import org.xnio.SslClientAuthMode;
 
+import io.undertow.Undertow;
+
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for an embedded servlet containers.
  *

diff --git a/...rg/springframework/boot/autoconfigure/websocket/UndertowWebSocketContainerCustomizer.java b/...rg/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}.

diff --git a/...ingframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java b/...ingframework/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.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;

diff --git a/...ava/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/...ava/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.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;

diff --git a/.../src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewTests.java b/.../src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewTests.java
@@ -20,7 +20,6 @@
 
 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;

diff --git a/...java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java b/...java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java
@@ -33,8 +33,6 @@
 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;

diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/grab/GrabCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/grab/GrabCommand.java
@@ -18,8 +18,6 @@
 
 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.RepositoryConfigurationFactory;
 import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
 
+import joptsimple.OptionSet;
+
 /**
  * {@link Command} to grab the dependencies of one or more Groovy scripts
  *

diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
@@ -22,9 +22,6 @@
 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.util.Log;
 import org.springframework.util.Assert;
 
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+
 /**
  * {@link Command} that initializes a project using Spring initializr.
  *

diff --git a/...g-boot-cli/src/main/java/org/springframework/boot/cli/command/install/InstallCommand.java b/...g-boot-cli/src/main/java/org/springframework/boot/cli/command/install/InstallCommand.java
@@ -17,15 +17,15 @@
 
 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;
 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.
  *

diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java
@@ -23,8 +23,6 @@
 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.util.FileCopyUtils;
 import org.springframework.util.SystemPropertyUtils;
 
+import joptsimple.OptionSet;
+
 /**
  * Shared logic for the {@link InstallCommand} and {@link UninstallCommand}.
  *

diff --git a/...boot-cli/src/main/java/org/springframework/boot/cli/command/install/UninstallCommand.java b/...boot-cli/src/main/java/org/springframework/boot/cli/command/install/UninstallCommand.java
@@ -18,15 +18,15 @@
 
 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
  *

diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java b/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.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.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
  *

diff --git a/...ng-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java b/...ng-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,16 +29,17 @@
 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;
 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.
  *

diff --git a/...va/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java b/...va/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java
@@ -18,14 +18,14 @@
 
 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}

diff --git a/...ng-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java b/...ng-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java
@@ -20,11 +20,11 @@
 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}).
  *

diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java
@@ -20,9 +20,6 @@
 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.RepositoryConfigurationFactory;
 import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
 
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+
 import static java.util.Arrays.asList;
 
 /**