Removed unused imports

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@519292 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java

@@ -33,25 +33,24 @@ package org.apache.http.impl.client;
 
 import java.io.IOException;
 
-import org.apache.http.HttpVersion;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpException;
 import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.HttpEntity;
-import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.HttpException;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpVersion;
+import org.apache.http.client.ClientRequestDirector;
+import org.apache.http.client.RoutedRequest;
+import org.apache.http.conn.BasicManagedEntity;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.HttpRoute;
+import org.apache.http.conn.ManagedClientConnection;
+import org.apache.http.conn.RouteDirector;
 import org.apache.http.message.BasicHttpRequest;
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestExecutor;
 import org.apache.http.protocol.HttpExecutionContext;
-import org.apache.http.conn.HttpRoute;
+import org.apache.http.protocol.HttpRequestExecutor;
-import org.apache.http.conn.RouteDirector;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.ManagedClientConnection;
-import org.apache.http.conn.BasicManagedEntity;
-import org.apache.http.client.RoutedRequest;
-import org.apache.http.client.ClientRequestDirector;
 
 
 

src/java/org/apache/http/impl/client/DefaultHttpClient.java

@@ -33,24 +33,22 @@ package org.apache.http.impl.client;
 
 import java.io.IOException;
 
+import org.apache.http.ConnectionReuseStrategy;
+import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpException;
+import org.apache.http.client.ClientRequestDirector;
-import org.apache.http.ConnectionReuseStrategy;
+import org.apache.http.client.RoutedRequest;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.BasicHttpProcessor;
-import org.apache.http.protocol.HttpRequestExecutor;
 import org.apache.http.conn.HttpRoute;
 import org.apache.http.conn.Scheme;
 import org.apache.http.conn.SchemeRegistry;
-import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.impl.DefaultConnectionReuseStrategy;
-
+import org.apache.http.params.HttpParams;
-import org.apache.http.client.HttpClient;
+import org.apache.http.protocol.BasicHttpProcessor;
-import org.apache.http.client.RoutedRequest;
+import org.apache.http.protocol.HttpContext;
-import org.apache.http.client.ClientRequestDirector;
+import org.apache.http.protocol.HttpRequestExecutor;
 
 
 

src/java/org/apache/http/impl/conn/SingleClientConnManager.java

@@ -32,31 +32,17 @@
 package org.apache.http.impl.conn;
 
 import java.io.IOException;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.WeakHashMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.HttpHost;
 import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.ClientConnectionOperator;
-import org.apache.http.conn.ConnectionPoolTimeoutException;
-import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.HttpRoute;
-import org.apache.http.conn.RouteTracker;
 import org.apache.http.conn.ManagedClientConnection;
 import org.apache.http.conn.OperatedClientConnection;
-import org.apache.http.conn.params.HttpConnectionManagerParams;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
 
 
 

src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java

@@ -43,20 +43,17 @@ import java.util.WeakHashMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.HttpHost;
 import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.ClientConnectionOperator;
 import org.apache.http.conn.ConnectionPoolTimeoutException;
-import org.apache.http.conn.SchemeRegistry;
-import org.apache.http.conn.HttpRoute;
-import org.apache.http.conn.RouteTracker;
 import org.apache.http.conn.HostConfiguration;
+import org.apache.http.conn.HttpRoute;
 import org.apache.http.conn.ManagedClientConnection;
 import org.apache.http.conn.OperatedClientConnection;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.params.HttpConnectionManagerParams;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
 
 
 /**

src/test/org/apache/http/client/TestAll.java

@@ -30,13 +30,15 @@
 
 package org.apache.http.client;
 
-import org.apache.http.cookie.TestAllCookie;
+import junit.framework.Test;
-import org.apache.http.impl.cookie.TestAllCookieImpl;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.apache.http.conn.ssl.TestAllSSL;
+import org.apache.http.cookie.TestAllCookie;
 import org.apache.http.impl.client.TestAllHttpClientImpl;
 import org.apache.http.impl.conn.TestAllConnImpl;
-
+import org.apache.http.impl.cookie.TestAllCookieImpl;
-import junit.framework.*;
 
 public class TestAll extends TestCase {
 

src/test/org/apache/http/conn/TestScheme.java

@@ -33,13 +33,13 @@ package org.apache.http.conn;
 
 import java.util.Iterator;
 
-import org.apache.http.HttpHost;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.http.HttpHost;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+
 /**
  * Unit tests for {@link Scheme} and {@link SchemeRegistry}.
  *

src/test/org/apache/http/conn/ssl/TestAllSSL.java

@@ -30,7 +30,9 @@
 
 package org.apache.http.conn.ssl;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class TestAllSSL extends TestCase {
 

src/test/org/apache/http/conn/ssl/TestHostnameVerifier.java

@@ -31,16 +31,17 @@
 
 package org.apache.http.conn.ssl;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import javax.net.ssl.SSLException;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
+import javax.net.ssl.SSLException;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 /**
  * Unit tests for {@link HostnameVerifier}.
  *

src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java

@@ -31,14 +31,6 @@
 
 package org.apache.http.conn.ssl;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
-
-import javax.net.ServerSocketFactory;
-import javax.net.ssl.SSLServerSocketFactory;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -55,6 +47,16 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.spec.RSAPrivateCrtKeySpec;
 
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLServerSocketFactory;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
+
 
 /**
  * Unit tests for {@link SSLSocketFactory}.

src/test/org/apache/http/cookie/TestAllCookie.java

@@ -30,7 +30,9 @@
 
 package org.apache.http.cookie;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class TestAllCookie extends TestCase {
 

src/test/org/apache/http/cookie/TestCookiePolicy.java

@@ -30,18 +30,18 @@
 
 package org.apache.http.cookie;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.http.cookie.params.CookieSpecParams;
 import org.apache.http.impl.cookie.BrowserCompatSpec;
 import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
 import org.apache.http.impl.cookie.NetscapeDraftSpecFactory;
 import org.apache.http.impl.cookie.RFC2109SpecFactory;
-import org.apache.http.cookie.params.CookieSpecParams;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 /**
  * Test cases for {@link CookiePolicy}.
  */

src/test/org/apache/http/impl/client/TestAllHttpClientImpl.java

@@ -30,7 +30,9 @@
 
 package org.apache.http.impl.client;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class TestAllHttpClientImpl extends TestCase {
 

src/test/org/apache/http/impl/conn/TestAllConnImpl.java

@@ -30,7 +30,9 @@
 
 package org.apache.http.impl.conn;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class TestAllConnImpl extends TestCase {
 

src/test/org/apache/http/impl/conn/TestLocalServer.java

@@ -30,23 +30,20 @@
 
 package org.apache.http.impl.conn;
 
-import java.net.Socket;
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
-import junit.framework.*;
-
-import org.apache.http.HttpHost;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpClientConnection;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.localserver.LocalTestServer;
+import org.apache.http.localserver.ServerTestBase;
 import org.apache.http.message.HttpGet;
 import org.apache.http.message.HttpPost;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
 
-import org.apache.http.localserver.ServerTestBase;
-
 
 /**
  * This is more a test for the {@link LocalTestServer LocalTestServer}

src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java

@@ -33,16 +33,16 @@ package org.apache.http.impl.cookie;
 import java.io.IOException;
 import java.util.Iterator;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.apache.http.Header;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieAttributeHandler;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.MalformedCookieException;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 public class TestAbstractCookieSpec extends TestCase {
 
     public TestAbstractCookieSpec(String testName) {

src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java

@@ -30,7 +30,9 @@
 
 package org.apache.http.impl.cookie;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class TestAllCookieImpl extends TestCase {
 

src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java

@@ -34,16 +34,16 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieAttributeHandler;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.util.DateUtils;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 public class TestBasicCookieAttribHandlers extends TestCase {
 
     public TestBasicCookieAttribHandlers(String testName) {

src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java

@@ -32,6 +32,10 @@ package org.apache.http.impl.cookie;
 
 import java.util.Date;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.apache.http.Header;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
@@ -40,10 +44,6 @@ import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.util.DateUtils;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 /**
  * Test cases for BrowserCompatSpec
  *

src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java

@@ -30,6 +30,10 @@
 
 package org.apache.http.impl.cookie;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.apache.http.Header;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
@@ -37,10 +41,6 @@ import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.message.BasicHeader;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 /**
  * Test cases for Netscape cookie draft
  *

src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java

@@ -30,6 +30,10 @@
 
 package org.apache.http.impl.cookie;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.apache.http.Header;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
@@ -38,10 +42,6 @@ import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.util.DateUtils;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 /**
  * Test cases for RFC2109 cookie spec
  *

src/test/org/apache/http/localserver/EchoHandler.java

@@ -41,7 +41,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.MethodNotSupportedException;
 import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpRequestHandler;
 import org.apache.http.util.EntityUtils;

src/test/org/apache/http/localserver/LocalTestServer.java

@@ -31,31 +31,17 @@
 
 package org.apache.http.localserver;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.net.ServerSocket;
 import java.net.InetSocketAddress;
-import java.net.BindException;
+import java.net.ServerSocket;
-import java.util.Set;
+import java.net.Socket;
-import java.util.HashSet;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.http.ConnectionReuseStrategy;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpServerConnection;
-import org.apache.http.HttpStatus;
-import org.apache.http.MethodNotSupportedException;
-import org.apache.http.entity.ContentProducer;
-import org.apache.http.entity.EntityTemplate;
-import org.apache.http.entity.FileEntity;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.DefaultHttpResponseFactory;
 import org.apache.http.impl.DefaultHttpServerConnection;
@@ -73,7 +59,6 @@ import org.apache.http.protocol.ResponseConnControl;
 import org.apache.http.protocol.ResponseContent;
 import org.apache.http.protocol.ResponseDate;
 import org.apache.http.protocol.ResponseServer;
-import org.apache.http.util.EntityUtils;
 
 /**
  * Local HTTP server for tests that require one.

src/test/org/apache/http/localserver/RandomHandler.java

@@ -31,13 +31,11 @@
 
 package org.apache.http.localserver;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
@@ -46,7 +44,6 @@ import org.apache.http.MethodNotSupportedException;
 import org.apache.http.entity.AbstractHttpEntity;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.util.EntityUtils;
 
 
 

src/test/org/apache/http/localserver/ServerTestBase.java

@@ -32,25 +32,23 @@ package org.apache.http.localserver;
 
 import java.net.Socket;
 
-import junit.framework.*;
+import junit.framework.TestCase;
 
 import org.apache.http.HttpHost;
 import org.apache.http.HttpVersion;
-import org.apache.http.HttpRequest;
+import org.apache.http.conn.PlainSocketFactory;
-import org.apache.http.HttpResponse;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.protocol.BasicHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.HttpRequestExecutor;
-import org.apache.http.protocol.HttpExecutionContext;
-import org.apache.http.impl.DefaultHttpClientConnection;
 import org.apache.http.conn.Scheme;
 import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.SocketFactory;
-import org.apache.http.conn.PlainSocketFactory;
+import org.apache.http.impl.DefaultHttpClientConnection;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
+import org.apache.http.protocol.BasicHttpProcessor;
+import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.HttpRequestExecutor;
+import org.apache.http.protocol.RequestConnControl;
+import org.apache.http.protocol.RequestContent;
 
 
 /**