Organize imports

src/main/java/javax/servlet/FilterRegistration.java

@@ -17,7 +17,8 @@
 
 package javax.servlet;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.EnumSet;
 
 /**
  * Interface through which a {@link Filter} may be further configured.

src/main/java/javax/servlet/ServletInputStream.java

@@ -18,8 +18,8 @@
 
 package javax.servlet;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * 

src/main/java/javax/servlet/ServletRegistration.java

@@ -17,7 +17,8 @@
 
 package javax.servlet;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * Interface through which a {@link Servlet} may be further configured.

src/main/java/javax/servlet/ServletRequest.java

@@ -18,8 +18,12 @@
 
 package javax.servlet;
 
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * Defines an object to provide client request information to a servlet. The servlet container creates a

src/main/java/javax/servlet/ServletSecurityElement.java

@@ -17,7 +17,9 @@
 
 package javax.servlet;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import javax.servlet.annotation.HttpMethodConstraint;
 import javax.servlet.annotation.ServletSecurity;
 

src/main/java/javax/servlet/annotation/HandlesTypes.java

@@ -17,10 +17,10 @@
 
 package javax.servlet.annotation;
 
-import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation is used to declare the class types that a {@link javax.servlet.ServletContainerInitializer

src/main/java/javax/servlet/annotation/MultipartConfig.java

@@ -17,10 +17,10 @@
 
 package javax.servlet.annotation;
 
-import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotation that may be specified on a {@link javax.servlet.Servlet} class, indicating that instances of the

src/main/java/javax/servlet/annotation/ServletSecurity.java

@@ -20,9 +20,9 @@
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
-import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * This annotation is used on a Servlet implementation class to specify security constraints to be enforced by a Servlet

src/main/java/javax/servlet/annotation/WebInitParam.java

@@ -17,11 +17,11 @@
 
 package javax.servlet.annotation;
 
+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;
 
 /**
  * This annotation is used on a Servlet or Filter implementation class to specify an initialization parameter.

src/main/java/javax/servlet/annotation/WebServlet.java

@@ -17,11 +17,11 @@
 
 package javax.servlet.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Annotation used to declare a servlet.

src/main/java/javax/servlet/http/HttpServlet.java

@@ -19,15 +19,19 @@
 package javax.servlet.http;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
 import java.util.Enumeration;
 import java.util.ResourceBundle;
-
-import javax.servlet.*;
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.WriteListener;
 
 /**
  *

src/main/java/javax/servlet/http/HttpServletRequest.java

@@ -19,7 +19,10 @@
 package javax.servlet.http;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Map;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;

src/main/java/javax/servlet/http/HttpServletRequestWrapper.java

@@ -19,7 +19,9 @@
 package javax.servlet.http;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Map;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequestWrapper;
 

src/main/java/javax/servlet/http/HttpUtils.java

@@ -18,11 +18,11 @@
 
 package javax.servlet.http;
 
-import javax.servlet.ServletInputStream;
+import java.io.IOException;
 import java.util.Hashtable;
 import java.util.ResourceBundle;
 import java.util.StringTokenizer;
-import java.io.IOException;
+import javax.servlet.ServletInputStream;
 
 /**
  * @deprecated As of Java(tm) Servlet API 2.3. These methods were only useful with the default encoding and have been

src/main/java/javax/servlet/http/Part.java

@@ -17,8 +17,9 @@
 
 package javax.servlet.http;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
 
 /**
  * <p>

src/main/java/javax/servlet/http/PushBuilder.java

@@ -19,11 +19,6 @@
 
 import java.util.Set;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 /**
  * Build a request to be pushed.
  *