Organize imports (#539)

core/example/src/example/Book.java

@@ -1,11 +1,10 @@
 package example;
 
+import java.io.IOException;
+import javax.servlet.ServletException;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
-import javax.servlet.ServletException;
-import java.io.IOException;
-
 /**
  * A book in the bookstore.
  *

core/example/src/example/BookStore.java

@@ -1,12 +1,11 @@
 package example;
 
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
-
-import javax.servlet.ServletException;
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Map;
+import javax.servlet.ServletException;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 
 /**
  * Root object of this web application.

core/example/src/example/WebAppMain.java

@@ -1,9 +1,8 @@
 package example;
 
-import org.kohsuke.stapler.Stapler;
-
-import javax.servlet.ServletContextListener;
 import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import org.kohsuke.stapler.Stapler;
 
 /**
  * This class is invoked by the container at the beginning

core/maven-example/src/main/java/example/Book.java

@@ -1,11 +1,10 @@
 package example;
 
+import java.io.IOException;
+import javax.servlet.ServletException;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
-import javax.servlet.ServletException;
-import java.io.IOException;
-
 /**
  * A book in the bookstore.
  *

core/maven-example/src/main/java/example/BookStore.java

@@ -1,12 +1,11 @@
 package example;
 
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
-
-import javax.servlet.ServletException;
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Map;
+import javax.servlet.ServletException;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 
 /**
  * Root object of this web application.

core/maven-example/src/main/java/example/WebAppMain.java

@@ -1,9 +1,8 @@
 package example;
 
-import org.kohsuke.stapler.Stapler;
-
-import javax.servlet.ServletContextListener;
 import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import org.kohsuke.stapler.Stapler;
 
 /**
  * This class is invoked by the container at the beginning

core/src/main/java/org/kohsuke/stapler/AbstractTearOff.java

@@ -24,7 +24,6 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 import java.io.File;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;

core/src/main/java/org/kohsuke/stapler/AcceptHeader.java

@@ -21,17 +21,16 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package org.kohsuke.stapler;
 
-import org.apache.commons.beanutils.Converter;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
-
 import edu.umd.cs.findbugs.annotations.Nullable;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.beanutils.Converter;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 
 /**
  * Represents the {@code Accept} HTTP header and help server choose the right media type to serve.

core/src/main/java/org/kohsuke/stapler/AncestorInPath.java

@@ -23,23 +23,22 @@
 
 package org.kohsuke.stapler;
 
-import org.kohsuke.stapler.AncestorInPath.HandlerImpl;
-
-import javax.servlet.ServletException;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import javax.servlet.ServletException;
+import org.kohsuke.stapler.AncestorInPath.HandlerImpl;
 
 /**
  * Indicates that this parameter is injected by evaluating
  * {@link StaplerRequest#findAncestorObject(Class)} with the parameter type.
  *
  * @author Kohsuke Kawaguchi
  */
-@Retention(RUNTIME)
-@Target(PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
 @Documented
 @InjectedParameter(HandlerImpl.class)
 public @interface AncestorInPath {

core/src/main/java/org/kohsuke/stapler/AnnotationHandler.java

@@ -23,10 +23,9 @@
 
 package org.kohsuke.stapler;
 
-import org.apache.commons.beanutils.Converter;
-
-import javax.servlet.ServletException;
 import java.lang.annotation.Annotation;
+import javax.servlet.ServletException;
+import org.apache.commons.beanutils.Converter;
 
 /**
  * Handles stapler parameter annotations by determining what values to inject for a method call.

core/src/main/java/org/kohsuke/stapler/AttributeKey.java

@@ -1,9 +1,9 @@
 package org.kohsuke.stapler;
 
+import java.util.UUID;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import java.util.UUID;
 
 /**
  * Type-safe attribute accessor.

core/src/main/java/org/kohsuke/stapler/BindInterceptor.java

@@ -1,8 +1,7 @@
 package org.kohsuke.stapler;
 
-import net.sf.json.JSONObject;
-
 import java.lang.reflect.Type;
+import net.sf.json.JSONObject;
 
 /**
  * Intercepts (and receives callbacks) about the JSON → object binding process.

core/src/main/java/org/kohsuke/stapler/CaptureParameterNameTransformation.java

@@ -23,6 +23,8 @@
 
 package org.kohsuke.stapler;
 
+import java.util.List;
+import java.util.Set;
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.AnnotatedNode;
 import org.codehaus.groovy.ast.AnnotationNode;
@@ -36,9 +38,6 @@
 import org.codehaus.groovy.transform.GroovyASTTransformation;
 import org.kohsuke.MetaInfServices;
 
-import java.util.List;
-import java.util.Set;
-
 /**
  * Groovy AST transformation that capture necessary parameter names.
  *

core/src/main/java/org/kohsuke/stapler/CapturedParameterNames.java

@@ -24,7 +24,7 @@
 package org.kohsuke.stapler;
 
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * This "hidden" annotation is injected by Groovy compiler to capture parameter names
@@ -34,7 +34,7 @@
  * @author Kohsuke Kawaguchi
  * @see CaptureParameterNameTransformation
  */
-@Retention(RUNTIME)
+@Retention(RetentionPolicy.RUNTIME)
 public @interface CapturedParameterNames {
     String[] value();
 }

core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java

@@ -23,9 +23,6 @@
 
 package org.kohsuke.stapler;
 
-import org.apache.commons.io.IOUtils;
-import org.jvnet.tiger_types.Types;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
@@ -46,10 +43,11 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
-
-import static java.util.logging.Level.WARNING;
+import org.apache.commons.io.IOUtils;
+import org.jvnet.tiger_types.Types;
 
 /**
  * Reflection information of a {@link Class}.
@@ -196,7 +194,7 @@ public static String[] loadParameterNames(Method m) {
             n = BytecodeReadingParanamer.lookupParameterNames(m);
             if (n!=null)    return n;
         } catch (IOException e) {
-            LOGGER.log(WARNING, "Failed to load a class file", e);
+            LOGGER.log(Level.WARNING, "Failed to load a class file", e);
         }
 
         // otherwise check the .stapler file
@@ -207,7 +205,7 @@ public static String[] loadParameterNames(Method m) {
             try {
                 return IOUtils.toString(url.openStream()).split(",");
             } catch (IOException e) {
-                LOGGER.log(WARNING, "Failed to load "+url,e);
+                LOGGER.log(Level.WARNING, "Failed to load "+url,e);
                 return EMPTY_ARRAY;
             }
         }
@@ -237,7 +235,7 @@ public static String[] loadParameterNames(Constructor<?> m) {
             n = BytecodeReadingParanamer.lookupParameterNames(m);
             if (n!=null)    return n;
         } catch (IOException e) {
-            LOGGER.log(WARNING, "Failed to load a class file", e);
+            LOGGER.log(Level.WARNING, "Failed to load a class file", e);
         }
 
         // couldn't find it

core/src/main/java/org/kohsuke/stapler/CrumbIssuer.java

@@ -1,7 +1,7 @@
 package org.kohsuke.stapler;
 
-import javax.servlet.http.HttpSession;
 import java.util.UUID;
+import javax.servlet.http.HttpSession;
 
 /**
  * Generates a nonce value that allows us to protect against cross-site request forgery (CSRF) attacks.

core/src/main/java/org/kohsuke/stapler/DataBoundConstructor.java

@@ -23,13 +23,12 @@
 
 package org.kohsuke.stapler;
 
-import net.sf.json.JSONObject;
-
 import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import net.sf.json.JSONObject;
 
 /**
  * Designates the constructor to be created
@@ -52,8 +51,8 @@
  *
  * @author Kohsuke Kawaguchi
  */
-@Retention(RUNTIME)
-@Target(CONSTRUCTOR)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.CONSTRUCTOR)
 @Documented
 public @interface DataBoundConstructor {
 }

core/src/main/java/org/kohsuke/stapler/DataBoundSetter.java

@@ -1,15 +1,13 @@
 package org.kohsuke.stapler;
 
 import jakarta.annotation.PostConstruct;
-import net.sf.json.JSONObject;
-
 import java.beans.Introspector;
 import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import net.sf.json.JSONObject;
 
 /**
  * Designates a setter method or a field used to databind JSON values into objects in methods like
@@ -35,8 +33,8 @@
  *
  * @author Kohsuke Kawaguchi
  */
-@Retention(RUNTIME)
-@Target({METHOD,FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD,ElementType.FIELD})
 @Documented
 public @interface DataBoundSetter {
 }

core/src/main/java/org/kohsuke/stapler/DiagnosticThreadNameFilter.java

@@ -1,13 +1,13 @@
 package org.kohsuke.stapler;
 
+import java.io.IOException;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 
 /**
  * {@link Filter} that sets the thread name to reflect the current request being processed.

core/src/main/java/org/kohsuke/stapler/DirectoryishDispatcher.java

@@ -1,10 +1,10 @@
 package org.kohsuke.stapler;
 
-import javax.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.servlet.ServletException;
 
 /**
  * {@link Dispatcher} that tells browsers to append '/' to the request path and try again.

core/src/main/java/org/kohsuke/stapler/Dispatcher.java

@@ -24,15 +24,14 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-import javax.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.servlet.ServletException;
 
 /**
  * Controls the dispatching of incoming HTTP requests.