Generics, final, foreach, remove unused String/import

Author: scottanderson

src/com/loopj/android/http/AsyncHttpClient.java

@@ -92,18 +92,17 @@ public class AsyncHttpClient {
     private static final int DEFAULT_MAX_CONNECTIONS = 10;
     private static final int DEFAULT_SOCKET_TIMEOUT = 10 * 1000;
     private static final int DEFAULT_MAX_RETRIES = 5;
-    private static final String ENCODING = "UTF-8";
     private static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
     private static final String ENCODING_GZIP = "gzip";
 
     private static int maxConnections = DEFAULT_MAX_CONNECTIONS;
     private static int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
 
-    private DefaultHttpClient httpClient;
-    private HttpContext httpContext;
+    private final DefaultHttpClient httpClient;
+    private final HttpContext httpContext;
     private ThreadPoolExecutor threadPool;
-    private Map<Context, List<WeakReference<Future>>> requestMap;
-    private Map<String, String> clientHeaderMap;
+    private final Map<Context, List<WeakReference<Future<?>>>> requestMap;
+    private final Map<String, String> clientHeaderMap;
 
 
     /**
@@ -159,7 +158,7 @@ public void process(HttpResponse response, HttpContext context) {
 
         threadPool = (ThreadPoolExecutor)Executors.newCachedThreadPool();
 
-        requestMap = new WeakHashMap<Context, List<WeakReference<Future>>>();
+        requestMap = new WeakHashMap<Context, List<WeakReference<Future<?>>>>();
         clientHeaderMap = new HashMap<String, String>();
     }
 
@@ -229,10 +228,10 @@ public void addHeader(String header, String value) {
      * @param mayInterruptIfRunning specifies if active requests should be cancelled along with pending requests.
      */
     public void cancelRequests(Context context, boolean mayInterruptIfRunning) {
-        List<WeakReference<Future>> requestList = requestMap.get(context);
+        List<WeakReference<Future<?>>> requestList = requestMap.get(context);
         if(requestList != null) {
-            for(WeakReference<Future> requestRef : requestList) {
-                Future request = requestRef.get();
+            for(WeakReference<Future<?>> requestRef : requestList) {
+                Future<?> request = requestRef.get();
                 if(request != null) {
                     request.cancel(mayInterruptIfRunning);
                 }
@@ -413,17 +412,17 @@ private void sendRequest(DefaultHttpClient client, HttpContext httpContext, Http
             uriRequest.addHeader("Content-Type", contentType);
         }
 
-        Future request = threadPool.submit(new AsyncHttpRequest(client, httpContext, uriRequest, responseHandler));
+        Future<?> request = threadPool.submit(new AsyncHttpRequest(client, httpContext, uriRequest, responseHandler));
 
         if(context != null) {
             // Add request to request map
-            List<WeakReference<Future>> requestList = requestMap.get(context);
+            List<WeakReference<Future<?>>> requestList = requestMap.get(context);
             if(requestList == null) {
-                requestList = new LinkedList<WeakReference<Future>>();
+                requestList = new LinkedList<WeakReference<Future<?>>>();
                 requestMap.put(context, requestList);
             }
 
-            requestList.add(new WeakReference<Future>(request));
+            requestList.add(new WeakReference<Future<?>>(request));
 
             // TODO: Remove dead weakrefs from requestLists?
         }

src/com/loopj/android/http/AsyncHttpRequest.java

@@ -22,17 +22,16 @@
 import java.net.ConnectException;
 
 import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.impl.client.AbstractHttpClient;
 import org.apache.http.protocol.HttpContext;
 
 class AsyncHttpRequest implements Runnable {
-    private AbstractHttpClient client;
-    private HttpContext context;
-    private HttpUriRequest request;
-    private AsyncHttpResponseHandler responseHandler;
+    private final AbstractHttpClient client;
+    private final HttpContext context;
+    private final HttpUriRequest request;
+    private final AsyncHttpResponseHandler responseHandler;
     private int executionCount;
 
     public AsyncHttpRequest(AbstractHttpClient client, HttpContext context, HttpUriRequest request, AsyncHttpResponseHandler responseHandler) {

src/com/loopj/android/http/PersistentCookieStore.java

@@ -49,8 +49,8 @@ public class PersistentCookieStore implements CookieStore {
     private static final String COOKIE_NAME_STORE = "names";
     private static final String COOKIE_NAME_PREFIX = "cookie_";
 
-    private ConcurrentHashMap<String, Cookie> cookies;
-    private SharedPreferences cookiePrefs;
+    private final ConcurrentHashMap<String, Cookie> cookies;
+    private final SharedPreferences cookiePrefs;
 
     /**
      * Construct a persistent cookie store.
@@ -175,8 +175,8 @@ protected Cookie decodeCookie(String cookieStr) {
     // to rely on any large Base64 libraries. Can be overridden if you like!
     protected String byteArrayToHexString(byte[] b) {
         StringBuffer sb = new StringBuffer(b.length * 2);
-        for(int i=0; i<b.length; i++) {
-            int v = b[i] & 0xff;
+        for (byte element : b) {
+            int v = element & 0xff;
             if(v < 16) {
                 sb.append('0');
             }

src/com/loopj/android/http/RetryHandler.java

@@ -58,7 +58,7 @@ class RetryHandler implements HttpRequestRetryHandler {
         exceptionBlacklist.add(SSLHandshakeException.class);
     }
 
-    private int maxRetries;
+    private final int maxRetries;
 
     public RetryHandler(int maxRetries) {
         this.maxRetries = maxRetries;

src/com/loopj/android/http/SerializableCookie.java

@@ -34,7 +34,7 @@
 public class SerializableCookie implements Serializable {
     private static final long serialVersionUID = 6374381828722046732L;
 
-    private transient Cookie cookie;
+    private transient final Cookie cookie;
     private transient BasicClientCookie clientCookie;
 
     public SerializableCookie(Cookie cookie) {