From 2354b4dd84020003094624dfa643dac996eaece3 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 16 May 2024 14:08:14 -0700 Subject: [PATCH] Organize imports --- src/main/java/javax/servlet/FilterRegistration.java | 3 ++- src/main/java/javax/servlet/ServletInputStream.java | 2 +- src/main/java/javax/servlet/ServletRegistration.java | 3 ++- src/main/java/javax/servlet/ServletRequest.java | 8 ++++++-- .../java/javax/servlet/ServletSecurityElement.java | 4 +++- .../java/javax/servlet/annotation/HandlesTypes.java | 2 +- .../java/javax/servlet/annotation/MultipartConfig.java | 2 +- .../java/javax/servlet/annotation/ServletSecurity.java | 2 +- .../java/javax/servlet/annotation/WebInitParam.java | 2 +- src/main/java/javax/servlet/annotation/WebServlet.java | 6 +++--- src/main/java/javax/servlet/http/HttpServlet.java | 10 +++++++--- .../java/javax/servlet/http/HttpServletRequest.java | 5 ++++- .../javax/servlet/http/HttpServletRequestWrapper.java | 4 +++- src/main/java/javax/servlet/http/HttpUtils.java | 4 ++-- src/main/java/javax/servlet/http/Part.java | 5 +++-- src/main/java/javax/servlet/http/PushBuilder.java | 5 ----- 16 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/main/java/javax/servlet/FilterRegistration.java b/src/main/java/javax/servlet/FilterRegistration.java index 98b629b..c629c93 100644 --- a/src/main/java/javax/servlet/FilterRegistration.java +++ b/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. diff --git a/src/main/java/javax/servlet/ServletInputStream.java b/src/main/java/javax/servlet/ServletInputStream.java index d83f6e9..d491831 100644 --- a/src/main/java/javax/servlet/ServletInputStream.java +++ b/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; /** * diff --git a/src/main/java/javax/servlet/ServletRegistration.java b/src/main/java/javax/servlet/ServletRegistration.java index c11ac82..f24e7d2 100644 --- a/src/main/java/javax/servlet/ServletRegistration.java +++ b/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. diff --git a/src/main/java/javax/servlet/ServletRequest.java b/src/main/java/javax/servlet/ServletRequest.java index a7ae233..9fcd001 100644 --- a/src/main/java/javax/servlet/ServletRequest.java +++ b/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 diff --git a/src/main/java/javax/servlet/ServletSecurityElement.java b/src/main/java/javax/servlet/ServletSecurityElement.java index 5fa82c5..083fb65 100644 --- a/src/main/java/javax/servlet/ServletSecurityElement.java +++ b/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; diff --git a/src/main/java/javax/servlet/annotation/HandlesTypes.java b/src/main/java/javax/servlet/annotation/HandlesTypes.java index f45336e..3895df6 100644 --- a/src/main/java/javax/servlet/annotation/HandlesTypes.java +++ b/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 diff --git a/src/main/java/javax/servlet/annotation/MultipartConfig.java b/src/main/java/javax/servlet/annotation/MultipartConfig.java index 8d37a1a..b411888 100644 --- a/src/main/java/javax/servlet/annotation/MultipartConfig.java +++ b/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 diff --git a/src/main/java/javax/servlet/annotation/ServletSecurity.java b/src/main/java/javax/servlet/annotation/ServletSecurity.java index 734945a..fb82774 100644 --- a/src/main/java/javax/servlet/annotation/ServletSecurity.java +++ b/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 diff --git a/src/main/java/javax/servlet/annotation/WebInitParam.java b/src/main/java/javax/servlet/annotation/WebInitParam.java index e8d5c88..f91611b 100644 --- a/src/main/java/javax/servlet/annotation/WebInitParam.java +++ b/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. diff --git a/src/main/java/javax/servlet/annotation/WebServlet.java b/src/main/java/javax/servlet/annotation/WebServlet.java index bb9748f..5dce584 100644 --- a/src/main/java/javax/servlet/annotation/WebServlet.java +++ b/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. diff --git a/src/main/java/javax/servlet/http/HttpServlet.java b/src/main/java/javax/servlet/http/HttpServlet.java index 2101ff2..1dcfa21 100644 --- a/src/main/java/javax/servlet/http/HttpServlet.java +++ b/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; /** * diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index fb1c836..ab32340 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/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; diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java index 520a3a7..70cc636 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/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; diff --git a/src/main/java/javax/servlet/http/HttpUtils.java b/src/main/java/javax/servlet/http/HttpUtils.java index e565dd1..3933bae 100644 --- a/src/main/java/javax/servlet/http/HttpUtils.java +++ b/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 diff --git a/src/main/java/javax/servlet/http/Part.java b/src/main/java/javax/servlet/http/Part.java index 3aa3764..e5ee122 100644 --- a/src/main/java/javax/servlet/http/Part.java +++ b/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; /** *

diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index d0e1fa1..31d5c03 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/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. *