http: simplify http job and processors

Author: mcxiaoke

http/src/main/java/com/mcxiaoke/next/http/HttpQueue.java

@@ -7,17 +7,17 @@
 import com.google.gson.GsonBuilder;
 import com.mcxiaoke.next.http.callback.BitmapCallback;
 import com.mcxiaoke.next.http.callback.FileCallback;
-import com.mcxiaoke.next.http.callback.HttpCallback;
 import com.mcxiaoke.next.http.callback.GsonCallback;
+import com.mcxiaoke.next.http.callback.HttpCallback;
 import com.mcxiaoke.next.http.callback.ResponseCallback;
 import com.mcxiaoke.next.http.callback.StringCallback;
 import com.mcxiaoke.next.http.exception.HttpException;
 import com.mcxiaoke.next.http.job.HttpJob;
 import com.mcxiaoke.next.http.processor.HttpProcessor;
 import com.mcxiaoke.next.http.transformer.BitmapTransformer;
 import com.mcxiaoke.next.http.transformer.FileTransformer;
-import com.mcxiaoke.next.http.transformer.HttpTransformer;
 import com.mcxiaoke.next.http.transformer.GsonTransformer;
+import com.mcxiaoke.next.http.transformer.HttpTransformer;
 import com.mcxiaoke.next.http.transformer.ResponseTransformer;
 import com.mcxiaoke.next.http.transformer.StringTransformer;
 import com.mcxiaoke.next.task.SimpleTaskCallback;
@@ -127,14 +127,10 @@ public <T> String add(final HttpJob<T> job) {
     public <T> String add(final NextRequest request,
                           final HttpTransformer<T> transformer,
                           final HttpCallback<T> callback,
-                          final Object caller,
-                          final HttpProcessor<NextRequest> requestProcessor,
-                          final HttpProcessor<NextResponse> preProcessor,
-                          final HttpProcessor<T> postProcessor) {
+                          final HttpProcessor<T> processor,
+                          final Object caller) {
         final HttpJob<T> job = new HttpJob<T>(request, transformer, callback, caller);
-        job.addRequestProcessor(requestProcessor)
-                .addPreProcessor(preProcessor)
-                .addPostProcessor(postProcessor);
+        job.addProcessor(processor);
         return enqueue(job);
     }
 
@@ -157,11 +153,6 @@ public <T> String add(final NextRequest request,
                           Object caller) {
         final Gson gson = callback.gson == null ? mGson : callback.gson;
         final GsonTransformer<T> transformer;
-//        if (callback.clazz != null) {
-//            transformer = new JsonTransformer<T>(gson, callback.clazz);
-//        } else {
-//            transformer = new JsonTransformer<T>(gson, callback.type);
-//        }
         transformer = new GsonTransformer<T>(gson, callback.type);
         return add(request, transformer, callback, caller);
     }
@@ -189,8 +180,6 @@ private <T> String enqueue(final HttpJob<T> job) {
         if (mDebug) {
             LogUtils.v(TAG, "[HttpJob][Enqueue]" + job.request.url() + " " + Thread.currentThread());
         }
-        ensureClient();
-        ensureQueue();
         final TaskCallable<Pair<NextResponse, T>> callable =
                 new TaskCallable<Pair<NextResponse, T>>() {
                     @Override
@@ -204,16 +193,14 @@ public Pair<NextResponse, T> call() throws Exception {
     private <T> Pair<NextResponse, T> performRequest(final HttpJob<T> job)
             throws IOException, HttpException {
         long start = SystemClock.elapsedRealtime();
-        invokeProcessors(job.request, job.getRequestProcessors());
         final NextResponse nextResponse = mClient.execute(job.request);
         if (!nextResponse.successful()) {
             // not successful, throw http exception
             throw new HttpException(nextResponse);
         }
-        invokeProcessors(nextResponse, job.getPreProcessors());
         // final T response = mClient.execute(job.request,job.transformer);
         final T response = job.transformer.transform(nextResponse);
-        invokeProcessors(response, job.getPostProcessors());
+        invokeProcessors(response, job.getProcessors());
         if (mDebug) {
             LogUtils.v(TAG, "[HttpJob][Perform] in "
                     + (SystemClock.elapsedRealtime() - start) + "ms " + nextResponse);
@@ -262,19 +249,6 @@ public void onTaskFailure(final Throwable ex, final Bundle extras) {
         };
     }
 
-    private synchronized void ensureClient() {
-        if (mClient == null) {
-            mClient = new NextClient();
-        }
-    }
-
-    private synchronized void ensureQueue() {
-        if (mQueue == null) {
-            mQueue = createQueue();
-        }
-    }
-
-
     private static TaskQueue createQueue() {
         return TaskQueue.concurrent(NUM_THREADS_DEFAULT);
     }

http/src/main/java/com/mcxiaoke/next/http/job/HttpJob.java

@@ -2,7 +2,6 @@
 
 import com.mcxiaoke.next.http.HttpQueue;
 import com.mcxiaoke.next.http.NextRequest;
-import com.mcxiaoke.next.http.NextResponse;
 import com.mcxiaoke.next.http.callback.HttpCallback;
 import com.mcxiaoke.next.http.processor.HttpProcessor;
 import com.mcxiaoke.next.http.transformer.HttpTransformer;
@@ -22,80 +21,43 @@ public class HttpJob<T> {
     public final HttpTransformer<T> transformer;
     public final HttpCallback<T> callback;
     public final Object caller;
-    private List<HttpProcessor<NextRequest>> requestProcessors;
-    private List<HttpProcessor<NextResponse>> preProcessors;
-    private List<HttpProcessor<T>> postProcessors;
+    private List<HttpProcessor<T>> processors;
 
     public HttpJob(final NextRequest request,
                    final HttpTransformer<T> transformer,
                    final HttpCallback<T> callback,
                    final Object caller) {
-        this(request, transformer, callback, caller, null, null, null);
+        this(request, transformer, callback, null, caller);
     }
 
     public HttpJob(final NextRequest request,
                    final HttpTransformer<T> transformer,
                    final HttpCallback<T> callback,
-                   final Object caller,
-                   List<HttpProcessor<NextRequest>> requestProcessors,
-                   final List<HttpProcessor<NextResponse>> preProcessors,
-                   final List<HttpProcessor<T>> postProcessors) {
+                   final List<HttpProcessor<T>> processors,
+                   final Object caller) {
         AssertUtils.notNull(request, "request must not be null.");
         AssertUtils.notNull(transformer, "transformer must not be null.");
         AssertUtils.notNull(caller, "caller must not be null.");
         this.request = request;
         this.transformer = transformer;
         this.callback = callback;
         this.caller = caller;
-        if (requestProcessors != null) {
-            this.requestProcessors = requestProcessors;
-        } else {
-            this.requestProcessors = new ArrayList<HttpProcessor<NextRequest>>(2);
-        }
-        if (preProcessors != null) {
-            this.preProcessors = preProcessors;
-        } else {
-            this.preProcessors = new ArrayList<HttpProcessor<NextResponse>>(2);
-        }
-        if (postProcessors != null) {
-            this.postProcessors = postProcessors;
+        if (processors != null) {
+            this.processors = processors;
         } else {
-            this.postProcessors = new ArrayList<HttpProcessor<T>>(2);
-        }
-    }
-
-
-    public HttpJob<T> addRequestProcessor(HttpProcessor<NextRequest> processor) {
-        if (processor != null) {
-            this.requestProcessors.add(processor);
+            this.processors = new ArrayList<HttpProcessor<T>>(2);
         }
-        return this;
-    }
-
-    public HttpJob<T> addPreProcessor(HttpProcessor<NextResponse> processor) {
-        if (processor != null) {
-            this.preProcessors.add(processor);
-        }
-        return this;
     }
 
-    public HttpJob<T> addPostProcessor(HttpProcessor<T> processor) {
+    public HttpJob<T> addProcessor(HttpProcessor<T> processor) {
         if (processor != null) {
-            this.postProcessors.add(processor);
+            this.processors.add(processor);
         }
         return this;
     }
 
-    public List<HttpProcessor<NextRequest>> getRequestProcessors() {
-        return requestProcessors;
-    }
-
-    public List<HttpProcessor<NextResponse>> getPreProcessors() {
-        return preProcessors;
-    }
-
-    public List<HttpProcessor<T>> getPostProcessors() {
-        return postProcessors;
+    public List<HttpProcessor<T>> getProcessors() {
+        return processors;
     }
 
     public String execute(final HttpQueue queue) {
@@ -112,9 +74,7 @@ public String toString() {
                 "request=" + request +
                 ", transformer=" + transformer +
                 ", callback=" + callback +
-                ", requestProcessors=" + requestProcessors +
-                ", preProcessors=" + preProcessors +
-                ", postProcessors=" + postProcessors +
+                ", processors=" + processors +
                 ", caller=" + caller +
                 '}';
     }

http/src/main/java/com/mcxiaoke/next/http/job/HttpJobBuilder.java

@@ -1,7 +1,6 @@
 package com.mcxiaoke.next.http.job;
 
 import com.mcxiaoke.next.http.NextRequest;
-import com.mcxiaoke.next.http.NextResponse;
 import com.mcxiaoke.next.http.callback.HttpCallback;
 import com.mcxiaoke.next.http.processor.HttpProcessor;
 import com.mcxiaoke.next.http.transformer.HttpTransformer;
@@ -14,9 +13,7 @@ public class HttpJobBuilder<T> {
     private HttpTransformer<T> mTransformer;
     private HttpCallback<T> mCallback;
     private Object mCaller;
-    public List<HttpProcessor<NextRequest>> mRequestProcessors;
-    public List<HttpProcessor<NextResponse>> mPreProcessors;
-    public List<HttpProcessor<T>> mPostProcessors;
+    public List<HttpProcessor<T>> mProcessors;
 
     public HttpJobBuilder<T> request(final NextRequest request) {
         mRequest = request;
@@ -38,38 +35,17 @@ public HttpJobBuilder<T> caller(final Object caller) {
         return this;
     }
 
-    public HttpJobBuilder<T> requestProcessor(HttpProcessor<NextRequest> processor) {
+    public HttpJobBuilder<T> processor(HttpProcessor<T> processor) {
         if (processor != null) {
-            if (mRequestProcessors == null) {
-                mRequestProcessors = new ArrayList<HttpProcessor<NextRequest>>(2);
+            if (mProcessors == null) {
+                mProcessors = new ArrayList<HttpProcessor<T>>(2);
             }
-            mRequestProcessors.add(processor);
-        }
-        return this;
-    }
-
-    public HttpJobBuilder<T> preProcessor(HttpProcessor<NextResponse> processor) {
-        if (processor != null) {
-            if (mPreProcessors == null) {
-                mPreProcessors = new ArrayList<HttpProcessor<NextResponse>>(2);
-            }
-            mPreProcessors.add(processor);
-        }
-        return this;
-    }
-
-    public HttpJobBuilder<T> postProcessor(HttpProcessor<T> processor) {
-        if (processor != null) {
-            if (mPostProcessors == null) {
-                mPostProcessors = new ArrayList<HttpProcessor<T>>(2);
-            }
-            mPostProcessors.add(processor);
+            mProcessors.add(processor);
         }
         return this;
     }
 
     public HttpJob<T> create() {
-        return new HttpJob<T>(mRequest, mTransformer, mCallback, mCaller,
-                mRequestProcessors, mPreProcessors, mPostProcessors);
+        return new HttpJob<T>(mRequest, mTransformer, mCallback, mProcessors, mCaller);
     }
 }