Merge pull request android-async-http#615 from fineswap/NormalizeStrings

Group up strings into classes and reuse them.

Author: Noor Dawod

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

@@ -113,14 +113,20 @@
  */
 public class AsyncHttpClient {
 
+    public static final String LOG_TAG = "AsyncHttpClient";
+
+    public static final String HEADER_CONTENT_TYPE = "Content-Type";
+    public static final String HEADER_CONTENT_RANGE = "Content-Range";
+    public static final String HEADER_CONTENT_ENCODING = "Content-Encoding";
+    public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";
+    public static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
+    public static final String ENCODING_GZIP = "gzip";
+
     public static final int DEFAULT_MAX_CONNECTIONS = 10;
     public static final int DEFAULT_SOCKET_TIMEOUT = 10 * 1000;
     public static final int DEFAULT_MAX_RETRIES = 5;
     public static final int DEFAULT_RETRY_SLEEP_TIME_MILLIS = 1500;
     public static final int DEFAULT_SOCKET_BUFFER_SIZE = 8192;
-    public static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
-    public static final String ENCODING_GZIP = "gzip";
-    public static final String LOG_TAG = "AsyncHttpClient";
 
     private int maxConnections = DEFAULT_MAX_CONNECTIONS;
     private int timeout = DEFAULT_SOCKET_TIMEOUT;
@@ -1090,7 +1096,7 @@ protected RequestHandle sendRequest(DefaultHttpClient client, HttpContext httpCo
         }
 
         if (contentType != null) {
-            uriRequest.setHeader("Content-Type", contentType);
+            uriRequest.setHeader(HEADER_CONTENT_TYPE, contentType);
         }
 
         responseHandler.setRequestHeaders(uriRequest.getAllHeaders());

library/src/main/java/com/loopj/android/http/BinaryHttpResponseHandler.java

@@ -53,11 +53,11 @@ public abstract class BinaryHttpResponseHandler extends AsyncHttpResponseHandler
 
     private static final String LOG_TAG = "BinaryHttpResponseHandler";
 
-    private String[] mAllowedContentTypes = new String[]{
-            "image/jpeg",
-            "image/png",
-            "image/gif",
-            "application/octet-stream"
+    private String[] mAllowedContentTypes = new String[] {
+        RequestParams.APPLICATION_OCTET_STREAM,
+        "image/jpeg",
+        "image/png",
+        "image/gif"
     };
 
     /**
@@ -100,10 +100,18 @@ public BinaryHttpResponseHandler(String[] allowedContentTypes) {
     @Override
     public final void sendResponseMessage(HttpResponse response) throws IOException {
         StatusLine status = response.getStatusLine();
-        Header[] contentTypeHeaders = response.getHeaders("Content-Type");
+        Header[] contentTypeHeaders = response.getHeaders(AsyncHttpClient.HEADER_CONTENT_TYPE);
         if (contentTypeHeaders.length != 1) {
             //malformed/ambiguous HTTP Header, ABORT!
-            sendFailureMessage(status.getStatusCode(), response.getAllHeaders(), null, new HttpResponseException(status.getStatusCode(), "None, or more than one, Content-Type Header found!"));
+            sendFailureMessage(
+                status.getStatusCode(),
+                response.getAllHeaders(),
+                null,
+                new HttpResponseException(
+                    status.getStatusCode(),
+                    "None, or more than one, Content-Type Header found!"
+                )
+            );
             return;
         }
         Header contentTypeHeader = contentTypeHeaders[0];
@@ -119,7 +127,15 @@ public final void sendResponseMessage(HttpResponse response) throws IOException
         }
         if (!foundAllowedContentType) {
             //Content-Type not in allowed list, ABORT!
-            sendFailureMessage(status.getStatusCode(), response.getAllHeaders(), null, new HttpResponseException(status.getStatusCode(), "Content-Type not allowed!"));
+            sendFailureMessage(
+                status.getStatusCode(),
+                response.getAllHeaders(),
+                null,
+                new HttpResponseException(
+                    status.getStatusCode(),
+                    "Content-Type not allowed!"
+                )
+            );
             return;
         }
         super.sendResponseMessage(response);

library/src/main/java/com/loopj/android/http/JsonHttpResponseHandler.java

@@ -39,14 +39,14 @@ public class JsonHttpResponseHandler extends TextHttpResponseHandler {
     private static final String LOG_TAG = "JsonHttpResponseHandler";
 
     /**
-     * Creates new JsonHttpResponseHandler, with Json String encoding UTF-8
+     * Creates new JsonHttpResponseHandler, with JSON String encoding UTF-8
      */
     public JsonHttpResponseHandler() {
         super(DEFAULT_CHARSET);
     }
 
     /**
-     * Creates new JsonHttpRespnseHandler with given Json String encoding
+     * Creates new JsonHttpRespnseHandler with given JSON String encoding
      *
      * @param encoding String encoding to be used when parsing JSON
      */
@@ -208,7 +208,7 @@ protected Object parseResponse(byte[] responseBody) throws JSONException {
         if (null == responseBody)
             return null;
         Object result = null;
-        //trim the string to prevent start with blank, and test if the string is valid JSON, because the parser don't do this :(. If Json is not valid this will return null
+        //trim the string to prevent start with blank, and test if the string is valid JSON, because the parser don't do this :(. If JSON is not valid this will return null
         String jsonString = getResponseString(responseBody, getCharset());
         if (jsonString != null) {
             jsonString = jsonString.trim();

library/src/main/java/com/loopj/android/http/JsonStreamerEntity.java

@@ -65,9 +65,14 @@ public class JsonStreamerEntity implements HttpEntity {
     private static final byte[] STREAM_ELAPSED = escape("_elapsed");
 
     private static final Header HEADER_JSON_CONTENT =
-            new BasicHeader("Content-Type", "application/json");
+            new BasicHeader(
+                AsyncHttpClient.HEADER_CONTENT_TYPE,
+                RequestParams.APPLICATION_JSON);
+
     private static final Header HEADER_GZIP_ENCODING =
-            new BasicHeader("Content-Encoding", "gzip");
+            new BasicHeader(
+                AsyncHttpClient.HEADER_CONTENT_ENCODING,
+                AsyncHttpClient.ENCODING_GZIP);
 
     // JSON data and associated meta-data to be uploaded.
     private final Map<String, Object> jsonParams = new HashMap<String, Object>();

library/src/main/java/com/loopj/android/http/RangeFileAsyncHttpResponseHandler.java

@@ -62,12 +62,12 @@ public void sendResponseMessage(HttpResponse response) throws IOException {
                     sendFailureMessage(status.getStatusCode(), response.getAllHeaders(), null, new HttpResponseException(status.getStatusCode(), status.getReasonPhrase()));
             } else {
                 if (!Thread.currentThread().isInterrupted()) {
-                    Header header = response.getFirstHeader("Content-Range");
+                    Header header = response.getFirstHeader(AsyncHttpClient.HEADER_CONTENT_RANGE);
                     if (header == null) {
                         append = false;
                         current = 0;
                     } else
-                        Log.v(LOG_TAG, "Content-Range: " + header.getValue());
+                        Log.v(LOG_TAG, AsyncHttpClient.HEADER_CONTENT_RANGE + ": " + header.getValue());
                     sendSuccessMessage(status.getStatusCode(), response.getAllHeaders(), getResponseData(response.getEntity()));
                 }
             }

library/src/main/java/com/loopj/android/http/RequestParams.java

@@ -92,6 +92,9 @@ public class RequestParams {
     public final static String APPLICATION_OCTET_STREAM =
             "application/octet-stream";
 
+    public final static String APPLICATION_JSON =
+            "application/json";
+
     protected final static String LOG_TAG = "RequestParams";
     protected boolean isRepeatable;
     protected boolean useJsonStreamer;

library/src/main/java/com/loopj/android/http/SimpleMultipartEntity.java

@@ -146,18 +146,21 @@ private String normalizeContentType(String type) {
     }
 
     private byte[] createContentType(String type) {
-        String result = "Content-Type: " + normalizeContentType(type) + STR_CR_LF;
+        String result = AsyncHttpClient.HEADER_CONTENT_TYPE + ": " + normalizeContentType(type) + STR_CR_LF;
         return result.getBytes();
     }
 
     private byte[] createContentDisposition(String key) {
-        return ("Content-Disposition: form-data; name=\"" + key + "\"" + STR_CR_LF)
-                .getBytes();
+        return (
+            AsyncHttpClient.HEADER_CONTENT_DISPOSITION +
+            ": form-data; name=\"" + key + "\"" + STR_CR_LF).getBytes();
     }
 
     private byte[] createContentDisposition(String key, String fileName) {
-        return ("Content-Disposition: form-data; name=\"" + key + "\"; filename=\"" + fileName + "\"" + STR_CR_LF)
-                .getBytes();
+        return (
+            AsyncHttpClient.HEADER_CONTENT_DISPOSITION +
+            ": form-data; name=\"" + key + "\"" +
+            "; filename=\"" + fileName + "\"" + STR_CR_LF).getBytes();
     }
 
     private void updateProgress(int count) {
@@ -232,7 +235,9 @@ public long getContentLength() {
 
     @Override
     public Header getContentType() {
-        return new BasicHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
+        return new BasicHeader(
+            AsyncHttpClient.HEADER_CONTENT_TYPE,
+            "multipart/form-data; boundary=" + boundary);
     }
 
     @Override

library/src/main/java/com/loopj/android/http/SyncHttpClient.java

@@ -84,7 +84,7 @@ protected RequestHandle sendRequest(DefaultHttpClient client,
                                         String contentType, ResponseHandlerInterface responseHandler,
                                         Context context) {
         if (contentType != null) {
-            uriRequest.addHeader("Content-Type", contentType);
+            uriRequest.addHeader(AsyncHttpClient.HEADER_CONTENT_TYPE, contentType);
         }
 
         responseHandler.setUseSynchronousMode(true);