Removed Singleton pattern, for HttpClient would have to be instantiated re/configured on each request, migrated over older pattern of creating AsyncHttpRequest instance in subclass

Author: smarek

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

@@ -18,7 +18,6 @@
 
 package com.loopj.android.http;
 
-import com.loopj.android.http.impl.AsyncHttpClientOptions;
 import com.loopj.android.http.interfaces.AsyncHttpClientInterface;
 import com.loopj.android.http.interfaces.AsyncHttpClientOptionsInterface;
 import com.loopj.android.http.interfaces.AsyncHttpRequestInterface;
@@ -44,29 +43,12 @@ public class AsyncHttpClient implements AsyncHttpClientInterface {
 
     public static final String LOG_TAG = "AsyncHttpClient";
 
-    private volatile static AsyncHttpClient INSTANCE;
-
     private final HttpClient httpClient;
     private RequestOptionsInterface defaultRequestOptions;
     private ExecutorService threadPool;
     private Class<? extends AsyncHttpRequestInterface> requestClass;
 
-    public static AsyncHttpClient getInstance() {
-        return getInstance(new AsyncHttpClientOptions());
-    }
-
-    public static AsyncHttpClient getInstance(AsyncHttpClientOptionsInterface options) {
-        if (INSTANCE == null) {
-            synchronized (AsyncHttpClient.class) {
-                if (INSTANCE == null) {
-                    INSTANCE = new AsyncHttpClient(options);
-                }
-            }
-        }
-        return INSTANCE;
-    }
-
-    private AsyncHttpClient(AsyncHttpClientOptionsInterface options) {
+    public AsyncHttpClient(AsyncHttpClientOptionsInterface options) {
         httpClient = options.getHttpClient();
         defaultRequestOptions = options.getDefaultRequestOptions();
         threadPool = options.getThreadPool();
@@ -101,6 +83,21 @@ public ExecutorService getUsedThreadPool() {
         return threadPool;
     }
 
+    @Override
+    public AsyncHttpRequestInterface getConfiguredAsyncHttpRequest(HttpUriRequest request, RequestOptionsInterface requestOptionsInterface, ResponseHandlerInterface responseHandlerInterface) {
+        AsyncHttpRequestInterface asyncRequest;
+        try {
+            asyncRequest = requestClass.newInstance();
+        } catch (Exception e) {
+            Logger.e(LOG_TAG, "getConfiguredAsyncHttpRequest", e);
+            return null;
+        }
+        asyncRequest.setHttpClient(this.httpClient);
+        asyncRequest.setHttpRequest(request);
+        asyncRequest.setResponseHandler(responseHandlerInterface);
+        return asyncRequest;
+    }
+
     @Override
     public RequestHandleInterface get(String targetEndpoint, RequestParamsInterface requestParamsInterface, RequestOptionsInterface requestOptionsInterface, ResponseHandlerInterface responseHandlerInterface) {
         HttpGetHC4 uriRequest = new HttpGetHC4(targetEndpoint);
@@ -151,16 +148,9 @@ public RequestHandleInterface patch(String targetEndpoint, RequestParamsInterfac
 
     @Override
     public RequestHandleInterface executeRawRequest(HttpUriRequest request, RequestOptionsInterface requestOptionsInterface, ResponseHandlerInterface responseHandlerInterface) {
-        try {
-            AsyncHttpRequestInterface asyncRequest = requestClass.newInstance();
-            asyncRequest.setHttpClient(this.httpClient);
-            asyncRequest.setHttpRequest(request);
-            asyncRequest.setResponseHandler(responseHandlerInterface);
-            threadPool.submit(asyncRequest);
-            return new RequestHandle(asyncRequest);
-        } catch (Exception e) {
-            Logger.e(LOG_TAG, "executeRawRequest failed with exception", e);
-        }
-        return null;
+        AsyncHttpRequestInterface asyncRequest = getConfiguredAsyncHttpRequest(request, requestOptionsInterface, responseHandlerInterface);
+        threadPool.submit(asyncRequest);
+        return new RequestHandle(asyncRequest);
     }
+
 }

library/src/main/java/com/loopj/android/http/interfaces/AsyncHttpClientInterface.java

@@ -18,6 +18,8 @@ AsyncHttpClientInterface setDefaultRequestOptions(
 
     ExecutorService getUsedThreadPool();
 
+    AsyncHttpRequestInterface getConfiguredAsyncHttpRequest(HttpUriRequest request, RequestOptionsInterface requestOptionsInterface, ResponseHandlerInterface responseHandlerInterface);
+
     // HTTP methods
 
     RequestHandleInterface get(

sample/src/main/java/com/loopj/android/http/sample/SampleInterface.java

@@ -24,6 +24,7 @@
 import com.loopj.android.http.RequestHandle;
 import com.loopj.android.http.interfaces.AsyncHttpClientInterface;
 import com.loopj.android.http.interfaces.RequestHandleInterface;
+import com.loopj.android.http.interfaces.RequestOptionsInterface;
 import com.loopj.android.http.interfaces.ResponseHandlerInterface;
 
 import org.apache.http.Header;
@@ -54,7 +55,7 @@ public interface SampleInterface {
 
     void setAsyncHttpClient(AsyncHttpClientInterface client);
 
-    AsyncHttpRequest getHttpRequest(HttpClient client, HttpContext httpContext, HttpUriRequest uriRequest, String contentType, ResponseHandlerInterface responseHandler, Context context);
+    AsyncHttpRequest getHttpRequest(HttpUriRequest request, RequestOptionsInterface requestOptionsInterface, ResponseHandlerInterface responseHandlerInterface);
 
     ResponseHandlerInterface getResponseHandler();
 

sample/src/main/java/com/loopj/android/http/sample/SampleParentActivity.java

@@ -20,7 +20,6 @@
 
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -36,21 +35,19 @@
 
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpRequest;
-import com.loopj.android.http.RequestHandle;
 import com.loopj.android.http.impl.AsyncHttpClientOptions;
 import com.loopj.android.http.impl.AsyncHttpRequestOptions;
 import com.loopj.android.http.interfaces.AsyncHttpClientInterface;
+import com.loopj.android.http.interfaces.AsyncHttpRequestInterface;
 import com.loopj.android.http.interfaces.RequestHandleInterface;
+import com.loopj.android.http.interfaces.RequestOptionsInterface;
 import com.loopj.android.http.interfaces.ResponseHandlerInterface;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicHeader;
-import org.apache.http.protocol.HttpContext;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -62,28 +59,25 @@
 
 public abstract class SampleParentActivity extends Activity implements SampleInterface {
 
-    private AsyncHttpClientInterface asyncHttpClient = AsyncHttpClient.getInstance(
+    private AsyncHttpClientInterface asyncHttpClient = new AsyncHttpClient(
             new AsyncHttpClientOptions()
-            .setDefaultRequestOptions(
-                    new AsyncHttpRequestOptions()
-                    .setConnectTimeout(5000)
-                    .setGzipSupportEnabled(true)
-                    .setHttpPort(80)
-                    .setHttpsPort(443)
-            )
-            .enableLogging()
-            .setLoggingVerbosity(Log.VERBOSE)
-    );
-//    private AsyncHttpClient asyncHttpClient = new AsyncHttpClient() {
-//
-//        @Override
-//        protected AsyncHttpRequest newAsyncHttpRequest(DefaultHttpClient client, HttpContext httpContext, HttpUriRequest uriRequest, String contentType, ResponseHandlerInterface responseHandler, Context context) {
-//            AsyncHttpRequest httpRequest = getHttpRequest(client, httpContext, uriRequest, contentType, responseHandler, context);
-//            return httpRequest == null
-//                    ? super.newAsyncHttpRequest(client, httpContext, uriRequest, contentType, responseHandler, context)
-//                    : httpRequest;
-//        }
-//    };
+                    .setDefaultRequestOptions(
+                            new AsyncHttpRequestOptions()
+                                    .setConnectTimeout(5000)
+                                    .setGzipSupportEnabled(true)
+                                    .setHttpPort(80)
+                                    .setHttpsPort(443)
+                    )
+                    .enableLogging()
+                    .setLoggingVerbosity(Log.VERBOSE)
+    ) {
+        @Override
+        public AsyncHttpRequestInterface getConfiguredAsyncHttpRequest(HttpUriRequest request, RequestOptionsInterface requestOptionsInterface, ResponseHandlerInterface responseHandlerInterface) {
+            AsyncHttpRequestInterface customRequest = getHttpRequest(request, requestOptionsInterface, responseHandlerInterface);
+            return customRequest == null ? super.getConfiguredAsyncHttpRequest(request, requestOptionsInterface, responseHandlerInterface) : customRequest;
+        }
+    };
+
     private EditText urlEditText, headersEditText, bodyEditText;
     private LinearLayout responseLayout;
     public LinearLayout customFieldsLayout;
@@ -174,7 +168,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     @Override
-    public AsyncHttpRequest getHttpRequest(HttpClient client, HttpContext httpContext, HttpUriRequest uriRequest, String contentType, ResponseHandlerInterface responseHandler, Context context) {
+    public AsyncHttpRequest getHttpRequest(HttpUriRequest request, RequestOptionsInterface requestOptionsInterface, ResponseHandlerInterface responseHandlerInterface) {
         return null;
     }