http: tweak request, fix progress body and listener

Author: mcxiaoke

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

@@ -16,14 +16,15 @@
 package com.mcxiaoke.next.http;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 public enum HttpMethod {
 
     GET, POST, PUT, DELETE, HEAD, PATCH, OPTIONS, TRACE;
 
-    public static final Set<String> METHODS = new LinkedHashSet<String>(Arrays.asList(
+    public static final Set<String> METHODS = new HashSet<String>(Arrays.asList(
             "OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "PATCH"));
 
     public static boolean isValid(final String method) {
@@ -37,7 +38,6 @@ public static boolean supportBody(final String method) {
     public static boolean supportBody(final HttpMethod method) {
         return HttpMethod.POST.equals(method)
                 || HttpMethod.PUT.equals(method)
-                || HttpMethod.PATCH.equals(method)
-                || HttpMethod.DELETE.equals(method);
+                || HttpMethod.PATCH.equals(method);
     }
 }

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

@@ -15,8 +15,8 @@
  * Time: 16:01
  */
 public class LoggingInterceptor implements Interceptor {
-    private final boolean mHeaders;
-    private final boolean mBody;
+    private final boolean dumpHeaders;
+    private final boolean dumpBody;
 
     public LoggingInterceptor() {
         this(false, false);
@@ -27,8 +27,8 @@ public LoggingInterceptor(final boolean headers) {
     }
 
     public LoggingInterceptor(final boolean headers, final boolean body) {
-        mHeaders = headers;
-        mBody = body;
+        dumpHeaders = headers;
+        dumpBody = body;
     }
 
     @Override
@@ -37,7 +37,7 @@ public Response intercept(final Chain chain) throws IOException {
         final Request request = chain.request();
         Log.v(NextClient.TAG, String.format("[OkHttp Request] %s %s on %s%n",
                 request.method(), request.url(), chain.connection()));
-        if (mHeaders) {
+        if (dumpHeaders) {
             Log.v(NextClient.TAG, "[Request Headers] " + request.headers());
         }
         final Response response = chain.proceed(request);
@@ -46,10 +46,10 @@ public Response intercept(final Chain chain) throws IOException {
                 , request.method(), request.url()
                 , response.code(), response.message()
                 , (t2 - t1) / 1e6d));
-        if (mHeaders) {
+        if (dumpHeaders) {
             Log.v(NextClient.TAG, "[Response Headers] " + response.headers());
         }
-        if (mBody) {
+        if (dumpBody) {
             Log.v(NextClient.TAG, "[Response Body] " + responseToText(response));
         }
         return response;

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

@@ -7,6 +7,7 @@
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 
 import java.io.IOException;
@@ -335,8 +336,7 @@ protected <T> T executeInternal(final NextRequest request,
                                     final HttpTransformer<T> transformer)
             throws IOException {
         final Response response = sendRequest(request);
-        final NextResponse nextResponse = new NextResponse(response);
-        return transformer.transform(nextResponse);
+        return transformer.transform(new NextResponse(response));
     }
 
     public Response sendRequest(final NextRequest request)
@@ -347,14 +347,6 @@ public Response sendRequest(final NextRequest request)
             logHttpCurl(request);
             builder.addNetworkInterceptor(new LoggingInterceptor());
         }
-        final ProgressListener li = request.getListener();
-        if (li != null) {
-            builder.addInterceptor(new ProgressInterceptor(li));
-        }
-        final OkClientInterceptor it = request.getInterceptor();
-        if (it != null) {
-            it.intercept(builder);
-        }
         final OkHttpClient client = builder.build();
         return sendOkRequest(createOkRequest(request), client, request.isDebug());
     }

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

@@ -14,7 +14,7 @@
  * Date: 14-2-8
  * Time: 11:22
  */
-public final class NextParams {
+public class NextParams {
     final Map<String, String> headers;
     final Map<String, String> queries;
     final Map<String, String> forms;

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

@@ -22,6 +22,7 @@
 import okhttp3.HttpUrl;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
+import okio.ByteString;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,7 +39,6 @@ public class NextRequest {
     protected NextParams params;
     protected byte[] body;
     protected ProgressListener listener;
-    protected OkClientInterceptor interceptor;
     protected boolean debug;
 
     public static NextRequest head(final String url) {
@@ -98,16 +98,11 @@ public NextRequest debug(final boolean debug) {
         return this;
     }
 
-    public NextRequest listener(final ProgressListener listener) {
+    public NextRequest progressListener(final ProgressListener listener) {
         this.listener = listener;
         return this;
     }
 
-    public NextRequest interceptor(final OkClientInterceptor interceptor) {
-        this.interceptor = interceptor;
-        return this;
-    }
-
     public NextRequest userAgent(final String userAgent) {
         return header(HttpConsts.USER_AGENT, userAgent);
     }
@@ -282,14 +277,10 @@ public String originalUrl() {
         return httpUrl.toString();
     }
 
-    public ProgressListener getListener() {
+    public ProgressListener getProgressListener() {
         return listener;
     }
 
-    public OkClientInterceptor getInterceptor() {
-        return interceptor;
-    }
-
     protected boolean supportBody() {
         return HttpMethod.supportBody(method);
     }
@@ -405,19 +396,17 @@ protected void copy(final NextRequest source) {
         this.params = source.params;
         this.body = source.body;
         this.listener = source.listener;
-        this.interceptor = source.interceptor;
         this.debug = source.debug;
     }
 
     protected RequestBody getRequestBody() throws IOException {
         if (!supportBody()) {
             return null;
         }
-        if (body != null) {
-            return RequestBody.create(HttpConsts.MEDIA_TYPE_OCTET_STREAM, body);
-        }
         RequestBody requestBody;
-        if (hasParts()) {
+        if (body != null) {
+            requestBody = RequestBody.create(HttpConsts.MEDIA_TYPE_OCTET_STREAM, body);
+        } else if (hasParts()) {
             final MultipartBody.Builder multipart = new MultipartBody.Builder();
             for (final BodyPart part : parts()) {
                 if (part.getBody() != null) {
@@ -441,12 +430,26 @@ protected RequestBody getRequestBody() throws IOException {
         } else {
             requestBody = null;
         }
+        if (requestBody == null) {
+            return getEmptyBody();
+        }
+        if (listener != null) {
+            requestBody = new ProgressRequestBody(requestBody, listener);
+        }
         return requestBody;
     }
 
     @Override
     public String toString() {
-        return "Request{HTTP " + method + " " + httpUrl + ' ' + params + '}';
+        return "Request{HTTP " + method() + " " + url() + ' ' + params + '}';
+    }
+
+    public RequestBody getEmptyBody() {
+        if (supportBody()) {
+            return RequestBody.create(null, ByteString.EMPTY);
+        } else {
+            return null;
+        }
     }
 
 }

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

@@ -7,7 +7,6 @@
 import okhttp3.Headers;
 import okhttp3.Response;
 
-import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,7 +20,7 @@
  * Date: 14-2-8
  * Time: 11:22
  */
-public class NextResponse implements Closeable {
+public class NextResponse {
     public static final String TAG = NextResponse.class.getSimpleName();
 
     private Response mResponse;
@@ -64,7 +63,7 @@ public String description() {
         return mStatusCode + ":" + mMessage;
     }
 
-    public long contentLength() throws IOException {
+    public long contentLength() {
         return mResponse.body().contentLength();
     }
 
@@ -88,39 +87,31 @@ public String location() {
         return header(HttpConsts.LOCATION);
     }
 
-    private InputStream getInputStream() throws IOException {
+    public InputStream stream() {
         return mResponse.body().byteStream();
     }
 
-    private byte[] getByteArray() throws IOException {
-        return IOUtils.readBytes(mResponse.body().byteStream());
-    }
-
-    public InputStream stream() throws IOException {
-        return getInputStream();
-    }
-
     public byte[] bytes() throws IOException {
-        return getByteArray();
+        return mResponse.body().bytes();
     }
 
-    public Reader reader() throws IOException {
+    public Reader reader() {
         return mResponse.body().charStream();
     }
 
     public String string() throws IOException {
-        return IOUtils.readString(reader());
+        return mResponse.body().string();
     }
 
     public int writeTo(OutputStream os) throws IOException {
-        return IOUtils.copy(getInputStream(), os);
+        return IOUtils.copy(stream(), os);
     }
 
     public boolean writeTo(File file) throws IOException {
-        return IOUtils.writeStream(file, getInputStream());
+        return IOUtils.writeStream(file, stream());
     }
 
-    public void close() throws IOException {
+    public void close() {
         mResponse.body().close();
     }
 

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

@@ -1,15 +1,11 @@
-package com.mcxiaoke.next.http;
-
 /**
  * User: mcxiaoke
- * Date: 14-5-30
- * Time: 14:21
+ * Date: 2016/10/25
+ * Time: 12:28
  */
 
-/**
- * http write data progress listener
- */
-public interface ProgressListener {
+package com.mcxiaoke.next.http;
 
-    void update(long bytesRead, long contentLength, boolean done);
+public interface ProgressListener {
+    void onProgress(long bytesWritten, long contentLength, boolean done);
 }

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

@@ -0,0 +1,68 @@
+/**
+ * User: mcxiaoke
+ * Date: 2016/10/25
+ * Time: 12:28
+ */
+
+package com.mcxiaoke.next.http;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.ForwardingSink;
+import okio.Okio;
+import okio.Sink;
+
+import java.io.IOException;
+
+public class ProgressRequestBody extends RequestBody {
+
+    private final RequestBody body;
+    private final ProgressListener listener;
+    private BufferedSink buffer;
+
+    public ProgressRequestBody(RequestBody body, ProgressListener listener) {
+        this.body = body;
+        this.listener = listener;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return body.contentType();
+    }
+
+    @Override
+    public long contentLength() throws IOException {
+        return body.contentLength();
+    }
+
+    @Override
+    public void writeTo(BufferedSink sink) throws IOException {
+        if (buffer == null) {
+            buffer = Okio.buffer(sink(sink));
+        }
+        body.writeTo(buffer);
+        buffer.flush();
+    }
+
+    private Sink sink(Sink sink) {
+        return new ForwardingSink(sink) {
+            long bytesWritten = 0L;
+            long contentLength = 0L;
+
+            @Override
+            public void write(Buffer source, long byteCount) throws IOException {
+                super.write(source, byteCount);
+                if (contentLength == 0) {
+                    contentLength = contentLength();
+                }
+                bytesWritten += byteCount;
+                if (listener != null) {
+                    listener.onProgress(
+                            bytesWritten, contentLength, bytesWritten == contentLength);
+                }
+            }
+        };
+    }
+}