From 6a9908a757d2717a5ae76c61f3ea7517f11d9fed Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 4 Aug 2010 22:29:39 +0000
Subject: [PATCH] Remove redundant imports  (Bugzilla was down)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@982422 13f79535-47bb-0310-9956-ffa450edef68
---
 checkstyle.xml                                          | 12 +++++++++++-
 java/javax/persistence/PersistenceUnits.java            |  1 -
 java/javax/servlet/jsp/JspFactory.java                  |  1 -
 java/javax/servlet/jsp/tagext/TagLibraryInfo.java       |  2 --
 .../catalina/authenticator/SingleSignOnEntry.java       |  1 -
 .../apache/catalina/core/DefaultInstanceManager.java    | 17 ++++++++---------
 .../apache/catalina/ha/session/JvmRouteBinderValve.java |  7 +++----
 .../tribes/group/interceptors/SimpleCoordinator.java    |  5 ++---
 java/org/apache/catalina/valves/RemoteIpValve.java      |  5 +----
 java/org/apache/catalina/valves/SSLValve.java           |  4 +---
 .../naming/resources/DirContextURLConnection.java       | 16 ++++++++--------
 .../apache/tomcat/util/bcel/classfile/Attribute.java    |  2 +-
 .../tomcat/util/bcel/classfile/FieldOrMethod.java       |  2 +-
 .../catalina/core/TestStandardContextAliases.java       |  1 -
 test/org/apache/catalina/deploy/TestWebXmlOrdering.java |  2 --
 test/org/apache/catalina/valves/TestRemoteIpValve.java  |  1 -
 test/org/apache/el/TestELEvaluation.java                |  7 +++----
 .../apache/naming/resources/TestProxyDirContext.java    |  1 -
 test/org/apache/tomcat/util/http/TestCookies.java       |  5 -----
 19 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 17e1ed97d..5af6d24c6 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -31,8 +31,18 @@
     <module name="IllegalInstantiation"/>
     
     <!-- Imports -->
-    <module name="IllegalImport"/>
     <module name="AvoidStarImport"/>
+    <module name="AvoidStaticImport"/>
+    <module name="IllegalImport"/>
+    <!-- Will trigger ~600 errors
+    <module name="ImportOrder">
+        <property name="groups" value="java,javax,async,jsp2,junit,org,util"/>
+        <property name="ordered" value="true"/>
+        <property name="separated" value="true"/>
+        <property name="option" value="above"/>
+    </module>
+    -->
+    <module name="RedundantImport"/>
     <!--
     Do not use - does not take account of imports required for Javadocs
     <module name="UnusedImports"/>
diff --git a/java/javax/persistence/PersistenceUnits.java b/java/javax/persistence/PersistenceUnits.java
index 0d3cf2417..3f5184566 100644
--- a/java/javax/persistence/PersistenceUnits.java
+++ b/java/javax/persistence/PersistenceUnits.java
@@ -22,7 +22,6 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.persistence.PersistenceUnit;
 
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/java/javax/servlet/jsp/JspFactory.java b/java/javax/servlet/jsp/JspFactory.java
index 248f8c5f7..278c52832 100644
--- a/java/javax/servlet/jsp/JspFactory.java
+++ b/java/javax/servlet/jsp/JspFactory.java
@@ -20,7 +20,6 @@ import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.jsp.PageContext;
 
 /**
  * <p>
diff --git a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
index c382b7634..8ed822579 100644
--- a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
@@ -16,8 +16,6 @@
  */
 package javax.servlet.jsp.tagext;
 
-import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.TagFileInfo;
 
 /**
  * Translation-time information associated with a taglib directive, and its
diff --git a/java/org/apache/catalina/authenticator/SingleSignOnEntry.java b/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
index af2a02c77..cb2526b0e 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
@@ -19,7 +19,6 @@ package org.apache.catalina.authenticator;
 import java.security.Principal;
 
 import org.apache.catalina.Session;
-import org.apache.catalina.authenticator.Constants;
 
 /**
  * A class that represents entries in the cache of authenticated users.
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 068f6c15a..8b3c6b1fa 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -19,18 +19,18 @@
 package org.apache.catalina.core;
 
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.Map;
-import java.util.Properties;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
 import java.security.PrivilegedActionException;
-import java.io.InputStream;
-import java.io.IOException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Map;
+import java.util.Properties;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -40,16 +40,15 @@ import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnit;
-import javax.xml.ws.WebServiceRef;
 import javax.servlet.Filter;
 import javax.servlet.Servlet;
+import javax.xml.ws.WebServiceRef;
 
-import org.apache.catalina.security.SecurityUtil;
 import org.apache.catalina.ContainerServlet;
 import org.apache.catalina.Globals;
-import org.apache.catalina.core.Constants;
-import org.apache.tomcat.util.res.StringManager;
+import org.apache.catalina.security.SecurityUtil;
 import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * @version $Id$
diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index d3312cf8c..a504eedc5 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -27,18 +27,17 @@ import org.apache.catalina.Host;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
 import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.catalina.ha.ClusterManager;
 import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.ha.ClusterValve;
-import org.apache.catalina.ha.session.DeltaSession;
-import org.apache.catalina.connector.Request;
-import org.apache.catalina.connector.Response;
 import org.apache.catalina.session.ManagerBase;
 import org.apache.catalina.session.PersistentManager;
 import org.apache.catalina.util.LifecycleBase;
-import org.apache.tomcat.util.res.StringManager;
 import org.apache.catalina.valves.ValveBase;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Valve to handle Tomcat jvmRoute takeover using mod_jk module after node
diff --git a/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java b/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
index 9b0b178c9..8679cc3ca 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
@@ -15,9 +15,8 @@
  */
 package org.apache.catalina.tribes.group.interceptors;
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
 import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.catalina.tribes.ChannelException;
@@ -79,7 +78,7 @@ public class SimpleCoordinator extends ChannelInterceptorBase {
                 stableCount++;
             }
             try {
-                MILLISECONDS.sleep(250);
+                TimeUnit.MILLISECONDS.sleep(250);
             } catch (final InterruptedException e) {
                 Thread.currentThread().interrupt();
             }
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java
index f8d533b50..9c8dfd0de 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -28,14 +28,11 @@ import java.util.regex.PatternSyntaxException;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 
-import org.apache.tomcat.util.res.StringManager;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
-import org.apache.catalina.valves.Constants;
-import org.apache.catalina.valves.RequestFilterValve;
-import org.apache.catalina.valves.ValveBase;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * <p>
diff --git a/java/org/apache/catalina/valves/SSLValve.java b/java/org/apache/catalina/valves/SSLValve.java
index 5f0d34618..8d6294003 100644
--- a/java/org/apache/catalina/valves/SSLValve.java
+++ b/java/org/apache/catalina/valves/SSLValve.java
@@ -17,15 +17,13 @@
 
 package org.apache.catalina.valves;
 
-import java.io.IOException;
 import java.io.ByteArrayInputStream;
-
+import java.io.IOException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
 import javax.servlet.ServletException;
 
-import org.apache.catalina.valves.ValveBase;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 
diff --git a/java/org/apache/naming/resources/DirContextURLConnection.java b/java/org/apache/naming/resources/DirContextURLConnection.java
index 428ec0223..1af14d2b3 100644
--- a/java/org/apache/naming/resources/DirContextURLConnection.java
+++ b/java/org/apache/naming/resources/DirContextURLConnection.java
@@ -17,11 +17,11 @@
 
 package org.apache.naming.resources;
 
-import java.net.URL;
-import java.net.URLConnection;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FileNotFoundException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.security.Permission;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,15 +31,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
-import javax.naming.NamingException;
-import javax.naming.NamingEnumeration;
+
 import javax.naming.NameClassPair;
-import javax.naming.directory.DirContext;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+
 import org.apache.naming.JndiPermission;
-import org.apache.naming.resources.Resource;
-import org.apache.naming.resources.ResourceAttributes;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 
 /**
diff --git a/java/org/apache/tomcat/util/bcel/classfile/Attribute.java b/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
index 0a4b0a962..e5d943c20 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
@@ -23,8 +23,8 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
 
 /**
  * Abstract super class for <em>Attribute</em> objects. Currently the
diff --git a/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java b/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
index 141b58d50..979b013bc 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
@@ -19,8 +19,8 @@ package org.apache.tomcat.util.bcel.classfile;
 
 import java.io.DataInputStream;
 import java.io.IOException;
+
 import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.Attribute;
 
 /** 
  * Abstract super class for fields and methods.
diff --git a/test/org/apache/catalina/core/TestStandardContextAliases.java b/test/org/apache/catalina/core/TestStandardContextAliases.java
index 7a2451802..7bb8a143e 100644
--- a/test/org/apache/catalina/core/TestStandardContextAliases.java
+++ b/test/org/apache/catalina/core/TestStandardContextAliases.java
@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
diff --git a/test/org/apache/catalina/deploy/TestWebXmlOrdering.java b/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
index 64b59c712..bbaa698ad 100644
--- a/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
+++ b/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
@@ -23,8 +23,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.catalina.deploy.WebXml;
-
 import junit.framework.TestCase;
 
 /**
diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index 324294187..c03dbc5df 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,7 +28,6 @@ import junit.framework.TestCase;
 
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
-import org.apache.catalina.valves.ValveBase;
 
 /**
  * {@link RemoteIpValve} Tests
diff --git a/test/org/apache/el/TestELEvaluation.java b/test/org/apache/el/TestELEvaluation.java
index d394c2d4a..33e231be6 100644
--- a/test/org/apache/el/TestELEvaluation.java
+++ b/test/org/apache/el/TestELEvaluation.java
@@ -22,16 +22,15 @@ import java.lang.reflect.Method;
 import java.util.Date;
 
 import javax.el.ELException;
-import javax.el.ValueExpression;
 import javax.el.FunctionMapper;
+import javax.el.ValueExpression;
+
+import junit.framework.TestCase;
 
-import org.apache.el.ExpressionFactoryImpl;
 import org.apache.el.lang.ELSupport;
 import org.apache.jasper.compiler.TestAttributeParser;
 import org.apache.jasper.el.ELContextImpl;
 
-import junit.framework.TestCase;
-
 /**
  * Tests the EL engine directly. Similar tests may be found in
  * {@link TestAttributeParser} and {@link TestELInJsp}.
diff --git a/test/org/apache/naming/resources/TestProxyDirContext.java b/test/org/apache/naming/resources/TestProxyDirContext.java
index a858ba8ec..64954bc18 100644
--- a/test/org/apache/naming/resources/TestProxyDirContext.java
+++ b/test/org/apache/naming/resources/TestProxyDirContext.java
@@ -21,7 +21,6 @@ import javax.naming.NameNotFoundException;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.naming.resources.ProxyDirContext;
 
 /**
  * Unit test for the {@link ProxyDirContext}.
diff --git a/test/org/apache/tomcat/util/http/TestCookies.java b/test/org/apache/tomcat/util/http/TestCookies.java
index e8f1da2a8..f156bdd51 100644
--- a/test/org/apache/tomcat/util/http/TestCookies.java
+++ b/test/org/apache/tomcat/util/http/TestCookies.java
@@ -17,16 +17,11 @@
 
 package org.apache.tomcat.util.http; 
 
-import org.apache.tomcat.util.http.Cookies;
-import org.apache.tomcat.util.http.ServerCookie;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
-import java.lang.Exception;
-
 
 public class TestCookies extends TestCase {
     public static void main( String args[] ) {
-- 
2.11.0