Add NoHttp 4 OkHttp.

Author: yanzhenjie

README-cn.md

@@ -5,8 +5,9 @@
 
 [**English document**][1]  
 
-技术交流群：547839514  
-加群请一定阅读[群行为规范][2]。  
+如果你想用OkHttp作为NoHttp的底层库，请看这个项目：[NoHttp4OkHttp](https://github.com/yanzhenjie/NoHttp4OkHttp)
+
+技术交流群：547839514，加群请一定阅读[群行为规范][2]。  
 
 严振杰的主页：[http://www.yanzhenjie.com][12]  
 严振杰的博客：[http://blog.yanzhenjie.com](http://blog.yanzhenjie.com) 

README.md

@@ -5,6 +5,8 @@
 
 [**中文版文档**](https://github.com/yanzhenjie/NoHttp/blob/master/README-cn.md)  
 
+If you want to use OkHttp to do the bottom of the NoHttp, please see this project: [NoHttp4OkHttp](https://github.com/yanzhenjie/NoHttp4OkHttp).
+
 ----
 # NoHttp home page and doc url
 NoHttp source code: [https://github.com/yanzhenjie/NoHttp](https://github.com/yanzhenjie/NoHttp/)

nohttp/src/main/java/com/yolanda/nohttp/Connection.java

@@ -50,6 +50,7 @@ public class Connection implements Closeable {
     /**
      * Create a response.
      *
+     * @param connection      {@link HttpURLConnection}.
      * @param responseHeaders response headers.
      * @param inputStream     According to the response code, the incoming data stream server.
      * @param exception       Connection exceptions that occur in the process.

…yolanda/nohttp/rest/IRestConnection.java …/com/yolanda/nohttp/IRestConnection.javanohttp/src/main/java/com/yolanda/nohttp/rest/IRestConnection.java renamed to nohttp/src/main/java/com/yolanda/nohttp/IRestConnection.java nohttp/src/main/java/com/yolanda/nohttp/rest/IRestConnection.java renamed to nohttp/src/main/java/com/yolanda/nohttp/IRestConnection.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yolanda.nohttp.rest;
+package com.yolanda.nohttp;
 
 import com.yolanda.nohttp.Connection;
 import com.yolanda.nohttp.IBasicRequest;

nohttp/src/main/java/com/yolanda/nohttp/NoHttp.java

@@ -29,7 +29,6 @@
 import com.yolanda.nohttp.download.Downloader;
 import com.yolanda.nohttp.download.RestDownloadRequest;
 import com.yolanda.nohttp.rest.IParserRequest;
-import com.yolanda.nohttp.rest.IRestConnection;
 import com.yolanda.nohttp.rest.IRestParser;
 import com.yolanda.nohttp.rest.IRestProtocol;
 import com.yolanda.nohttp.rest.ImageRequest;
@@ -38,7 +37,6 @@
 import com.yolanda.nohttp.rest.Request;
 import com.yolanda.nohttp.rest.RequestQueue;
 import com.yolanda.nohttp.rest.Response;
-import com.yolanda.nohttp.rest.RestConnection;
 import com.yolanda.nohttp.rest.RestParser;
 import com.yolanda.nohttp.rest.RestProtocol;
 import com.yolanda.nohttp.rest.StringRequest;
@@ -366,7 +364,19 @@ public static DownloadQueue newDownloadQueue() {
      * @see #newDownloadQueue(Downloader, int)
      */
     public static DownloadQueue newDownloadQueue(int threadPoolSize) {
-        return newDownloadQueue(new DownloadConnection(), threadPoolSize);
+        return newDownloadQueue(RestConnection.getInstance(), threadPoolSize);
+    }
+
+    /**
+     * Create a new download queue.
+     *
+     * @param threadPoolSize thread pool number, here is the number of concurrent tasks.
+     * @return {@link DownloadQueue}.
+     * @see #newDownloadQueue()
+     * @see #newDownloadQueue(Downloader, int)
+     */
+    public static DownloadQueue newDownloadQueue(IRestConnection iRestConnection, int threadPoolSize) {
+        return newDownloadQueue(DownloadConnection.getInstance(iRestConnection), threadPoolSize);
     }
 
     /**

…/com/yolanda/nohttp/BasicConnection.java …a/com/yolanda/nohttp/RestConnection.javanohttp/src/main/java/com/yolanda/nohttp/BasicConnection.java renamed to nohttp/src/main/java/com/yolanda/nohttp/RestConnection.java nohttp/src/main/java/com/yolanda/nohttp/BasicConnection.java renamed to nohttp/src/main/java/com/yolanda/nohttp/RestConnection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Yan Zhenjie
+ * Copyright © Yan Zhenjie. All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,21 +52,30 @@
 import javax.net.ssl.SSLSocketFactory;
 
 /**
- * <p>
- * Package good Http implementation class, establish connection, read and write data.
- * </p>
- * Created in Aug 4, 2015 10:12:38 AM.
- *
- * @author Yan Zhenjie.
+ * Created by Yan Zhenjie on 2016/9/4.
  */
-public class BasicConnection {
+public class RestConnection implements IRestConnection {
+
+    private static IRestConnection instance;
+
+    public static IRestConnection getInstance() {
+        synchronized (RestConnection.class) {
+            if (instance == null)
+                instance = new RestConnection();
+            return instance;
+        }
+    }
+
+    private RestConnection() {
+    }
 
     /**
      * Send the request, send only head, parameters, such as file information.
      *
      * @param request {@link IBasicRequest}.
      * @return {@link ProtocolResult}.
      */
+    @Override
     public Connection getConnection(IBasicRequest request) {
         Logger.d("--------------Request start--------------");
 

nohttp/src/main/java/com/yolanda/nohttp/download/DownloadConnection.java

@@ -18,7 +18,6 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.yolanda.nohttp.BasicConnection;
 import com.yolanda.nohttp.Connection;
 import com.yolanda.nohttp.Headers;
 import com.yolanda.nohttp.Logger;
@@ -30,6 +29,7 @@
 import com.yolanda.nohttp.error.TimeoutError;
 import com.yolanda.nohttp.error.URLError;
 import com.yolanda.nohttp.error.UnKnownHostError;
+import com.yolanda.nohttp.IRestConnection;
 import com.yolanda.nohttp.tools.HeaderUtil;
 import com.yolanda.nohttp.tools.IOUtils;
 import com.yolanda.nohttp.tools.NetUtil;
@@ -51,9 +51,23 @@
  *
  * @author Yan Zhenjie.
  */
-public class DownloadConnection extends BasicConnection implements Downloader {
+public class DownloadConnection implements Downloader {
 
-    public DownloadConnection() {
+    private IRestConnection iRestConnection;
+
+    private static Downloader instance;
+
+    public static Downloader getInstance(IRestConnection iRestConnection) {
+        synchronized (DownloadConnection.class) {
+            if (instance == null) {
+                instance = new DownloadConnection(iRestConnection);
+            }
+            return instance;
+        }
+    }
+
+    private DownloadConnection(IRestConnection iRestConnection) {
+        this.iRestConnection = iRestConnection;
     }
 
     @Override
@@ -105,7 +119,7 @@ public void download(int what, DownloadRequest downloadRequest, DownloadListener
             }
 
             // 连接服务器。
-            connection = getConnection(downloadRequest);
+            connection = iRestConnection.getConnection(downloadRequest);
             Exception exception = connection.exception();
             if (exception != null)
                 throw exception;

nohttp/src/main/java/com/yolanda/nohttp/rest/RestConnection.java

@@ -15,9 +15,10 @@
  */
 package com.yolanda.nohttp.rest;
 
-import com.yolanda.nohttp.BasicConnection;
 import com.yolanda.nohttp.Connection;
 import com.yolanda.nohttp.Headers;
+import com.yolanda.nohttp.IRestConnection;
+import com.yolanda.nohttp.RestConnection;
 import com.yolanda.nohttp.cache.Cache;
 import com.yolanda.nohttp.cache.CacheEntity;
 import com.yolanda.nohttp.error.NotFoundCacheError;
@@ -135,7 +136,7 @@ private ProtocolResult getHttpResponse(IProtocolRequest request) {
         Headers responseHeaders = connection.responseHeaders();
         Exception exception = connection.exception();
         if (exception == null) {
-            if (BasicConnection.hasResponseBody(request.getRequestMethod(), responseHeaders.getResponseCode()))
+            if (RestConnection.hasResponseBody(request.getRequestMethod(), responseHeaders.getResponseCode()))
                 try {
                     responseBody = IOUtils.toByteArray(connection.serverStream());
                 } catch (IOException e) {// IOException.