httpclient config

Author: berry_cooper

src/main/java/com/berry/http/HttpClient.java

@@ -31,7 +31,7 @@ public class HttpClient {
     /**
      * 默认 http 客户端
      */
-    private static final OkHttpClient CLIENT;
+    private static OkHttpClient CLIENT;
     /**
      * 连接超时时间 单位秒(默认10s)
      */
@@ -63,15 +63,12 @@ public class HttpClient {
 
     private static final String APPLICATION_JSON_UTF8_VALUE = "application/json;charset=UTF-8";
 
+    private static Dispatcher dispatcher = new Dispatcher();
+    private static ConnectionPool pool = new ConnectionPool(CONNECTION_POOL_MAX_IDLE_COUNT, CONNECTION_POOL_MAX_IDLE_MINUTES, TimeUnit.MINUTES);
 
     static {
-        Dispatcher dispatcher = new Dispatcher();
         dispatcher.setMaxRequests(DISPATCHER_MAX_REQUESTS);
         dispatcher.setMaxRequestsPerHost(DISPATCHER_MAX_REQUESTS_PER_HOST);
-
-        ConnectionPool pool = new ConnectionPool(CONNECTION_POOL_MAX_IDLE_COUNT,
-                CONNECTION_POOL_MAX_IDLE_MINUTES, TimeUnit.MINUTES);
-
         CLIENT = new OkHttpClient.Builder()
                 .callTimeout(CALL_TIMEOUT, TimeUnit.SECONDS)
                 .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
@@ -81,13 +78,26 @@ public class HttpClient {
                 .build();
     }
 
+    public HttpClient() {
+    }
+
+    public HttpClient(int timeout) {
+        CLIENT = new OkHttpClient.Builder()
+                .callTimeout(timeout, TimeUnit.SECONDS)
+                .connectTimeout(timeout, TimeUnit.SECONDS)
+                .readTimeout(timeout * 3, TimeUnit.SECONDS)
+                .dispatcher(dispatcher)
+                .connectionPool(pool)
+                .build();
+    }
+
     /**
      * Get 请求 无参数，无请求头
      *
      * @param url 地址
      * @return 响应
      */
-    public static Response get(String url) {
+    public Response get(String url) {
         return get(url, null, null);
     }
 
@@ -98,7 +108,7 @@ public static Response get(String url) {
      * @param header
      * @return
      */
-    public static Response get(String url, StringMap header) {
+    public Response get(String url, StringMap header) {
         return get(url, null, header);
     }
 
@@ -110,7 +120,7 @@ public static Response get(String url, StringMap header) {
      * @param header 请求头 map
      * @return 响应
      */
-    public static Response get(String url, @Nullable StringMap params, StringMap header) {
+    public Response get(String url, @Nullable StringMap params, StringMap header) {
         if (params != null) {
             String urlParams = StringUtils.parseUrlParams(params);
             url = url + "?" + urlParams;
@@ -127,7 +137,7 @@ public static Response get(String url, @Nullable StringMap params, StringMap hea
      * @param headers 请求头 map
      * @return 响应
      */
-    public static Response postForm(String url, StringMap params, StringMap headers) {
+    public Response postForm(String url, StringMap params, StringMap headers) {
         final FormBody.Builder fb = new FormBody.Builder();
         for (Map.Entry<String, Object> entry : params.entrySet()) {
             fb.add(entry.getKey(), entry.getValue().toString());
@@ -138,14 +148,14 @@ public static Response postForm(String url, StringMap params, StringMap headers)
     /**
      * 请求体为 字符串， 默认媒体类型-JSON
      */
-    public static Response post(String url, String body, StringMap header) {
+    public Response post(String url, String body, StringMap header) {
         return post(url, StringUtils.utf8Bytes(body), header, JSON_MIME);
     }
 
     /**
      * 复杂Map（包含字节数组）对象 以 json 格式请求，
      */
-    public static Response postComplex(String url, StringMap params, StringMap header) {
+    public Response postComplex(String url, StringMap params, StringMap header) {
         Gson gson = new GsonBuilder().enableComplexMapKeySerialization().create();
         RequestBody requestBody = RequestBody.create(MediaType.get(APPLICATION_JSON_UTF8_VALUE), gson.toJson(params.map()));
         return post(url, requestBody, header);
@@ -154,26 +164,26 @@ public static Response postComplex(String url, StringMap params, StringMap heade
     /**
      * 请求体为 字节数组，默认媒体类型-JSON
      */
-    public static Response post(String url, byte[] body, StringMap header) {
+    public Response post(String url, byte[] body, StringMap header) {
         return post(url, body, header, JSON_MIME);
     }
 
     /**
      * 请求体为 字节数组，指定 媒体类型
      */
-    public static Response post(String url, byte[] body, StringMap header, String contentType) {
+    public Response post(String url, byte[] body, StringMap header, String contentType) {
         RequestBody requestBody = RequestBody.create(MediaType.parse(contentType), body);
         return post(url, requestBody, header);
     }
 
     /**
      * 批量文件上传
      */
-    public static Response multipartPost(String url,
-                                         StringMap fields,
-                                         String name,
-                                         File[] files,
-                                         StringMap headers) {
+    public Response multipartPost(String url,
+                                  StringMap fields,
+                                  String name,
+                                  File[] files,
+                                  StringMap headers) {
         final MultipartBody.Builder mb = new MultipartBody.Builder();
         for (File file : files) {
             RequestBody fileBody = RequestBody.create(MediaType.parse(Constants.MULTIPART_MIME), file);
@@ -193,12 +203,12 @@ public static Response multipartPost(String url,
     /**
      * 文件上传 文件体为 file
      */
-    public static Response multipartPost(String url,
-                                         StringMap fields,
-                                         String name,
-                                         String fileName,
-                                         File fileBody,
-                                         StringMap headers) {
+    public Response multipartPost(String url,
+                                  StringMap fields,
+                                  String name,
+                                  String fileName,
+                                  File fileBody,
+                                  StringMap headers) {
         RequestBody file = RequestBody.create(MediaType.parse(Constants.MULTIPART_MIME), fileBody);
         Request.Builder requestBuilder = getBuilder(url, fields, name, fileName, file);
         return send(requestBuilder, headers);
@@ -216,7 +226,7 @@ public static Response multipartPost(String url,
      * @param contentType 请求体类型
      * @param cb          异步回调
      */
-    public static void asyncPost(String url, byte[] body, int offset, int size, StringMap header, String contentType, AsyncCallback cb) {
+    public void asyncPost(String url, byte[] body, int offset, int size, StringMap header, String contentType, AsyncCallback cb) {
         RequestBody requestBody = RequestBody.create(MediaType.parse(contentType), body, offset, size);
         Request.Builder requestBuilder = new Request.Builder().url(url).post(requestBody);
         asyncSend(requestBuilder, header, cb);
@@ -225,27 +235,27 @@ public static void asyncPost(String url, byte[] body, int offset, int size, Stri
     /**
      * 异步文件上传 文件体为 字节数组
      */
-    public static void asyncMultipartPost(String url,
-                                          StringMap fields,
-                                          String name,
-                                          String fileName,
-                                          byte[] fileBody,
-                                          StringMap headers,
-                                          AsyncCallback cb) {
+    public void asyncMultipartPost(String url,
+                                   StringMap fields,
+                                   String name,
+                                   String fileName,
+                                   byte[] fileBody,
+                                   StringMap headers,
+                                   AsyncCallback cb) {
         RequestBody file = RequestBody.create(MediaType.parse(Constants.MULTIPART_MIME), fileBody);
         asyncMultipartPost(url, fields, name, fileName, file, headers, cb);
     }
 
     /**
      * 异步文件上传 文件体为 file
      */
-    public static void asyncMultipartPost(String url,
-                                          StringMap fields,
-                                          String name,
-                                          String fileName,
-                                          File fileBody,
-                                          StringMap headers,
-                                          AsyncCallback cb) {
+    public void asyncMultipartPost(String url,
+                                   StringMap fields,
+                                   String name,
+                                   String fileName,
+                                   File fileBody,
+                                   StringMap headers,
+                                   AsyncCallback cb) {
         RequestBody file = RequestBody.create(MediaType.parse(Constants.MULTIPART_MIME), fileBody);
         asyncMultipartPost(url, fields, name, fileName, file, headers, cb);
     }

src/main/java/com/berry/http/Response.java

@@ -90,7 +90,7 @@ public <T> T jsonToObject(Class<T> clazz) {
     }
 
     public boolean isJson() {
-        return this.contentType.equals(Constants.JSON_MIME);
+        return StringUtils.isNotBlank(this.contentType) && this.contentType.startsWith(Constants.JSON_MIME);
     }
 
     public int getCode() {

src/main/java/com/berry/storage/Config.java

@@ -16,6 +16,11 @@ public final class Config {
      */
     private String host;
 
+    /**
+     * 上传超时 单位秒
+     */
+    private int uploadTimeout = 10;
+
     /**
      * 空间相关上传管理操作是否使用 https , 默认 否
      */
@@ -25,11 +30,20 @@ public Config(String host) {
         this.host = host;
     }
 
-    public Config(String host, boolean useHttpsDomains) {
+    public Config(String host, int uploadTimeout, boolean useHttpsDomains) {
         this.host = host;
+        this.uploadTimeout = uploadTimeout;
         this.useHttpsDomains = useHttpsDomains;
     }
 
+    public int getUploadTimeout() {
+        return uploadTimeout;
+    }
+
+    public void setUploadTimeout(int uploadTimeout) {
+        this.uploadTimeout = uploadTimeout;
+    }
+
     public String getHost() {
         return host;
     }

src/main/java/com/berry/storage/ObjectManage.java

@@ -36,9 +36,12 @@ public final class ObjectManage {
     private final Auth auth;
     private final Config config;
 
+    private final HttpClient client;
+
     public ObjectManage(Auth auth, Config config) {
         this.auth = auth;
         this.config = config;
+        this.client = new HttpClient(config.getUploadTimeout());
     }
 
     /**
@@ -59,7 +62,7 @@ public ObjectInfo upload(String bucket, String acl, @Nullable String filePath, S
         params.put("data", fileData);
         String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.upload_byte.getUrl());
         StringMap header = auth.authorization(url);
-        Response response = HttpClient.postComplex(url, params, header);
+        Response response = client.postComplex(url, params, header);
         Result result = response.jsonToObject(Result.class);
         if (result.getCode().equals(Constants.API_SUCCESS_CODE) && result.getMsg().equals(Constants.API_SUCCESS_MSG)) {
             return Json.decode(Json.encode(result.getData()), ObjectInfo.class);
@@ -90,7 +93,7 @@ public JSONArray upload(String bucket, String acl, @Nullable String filePath, Fi
         String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.create.getUrl());
 
         StringMap header = auth.authorization(url);
-        Response response = HttpClient.multipartPost(url, fields, "file", files, header);
+        Response response = client.multipartPost(url, fields, "file", files, header);
         Result result = response.jsonToObject(Result.class);
         if (result.getCode().equals(Constants.API_SUCCESS_CODE) && result.getMsg().equals(Constants.API_SUCCESS_MSG)) {
             return JSON.parseArray(JSON.toJSONString(result.getData()));
@@ -114,7 +117,7 @@ public ObjectInfo upload(String bucket, String acl, @Nullable String filePath, S
         params.put("data", base64Data);
         String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.upload_base64.getUrl());
         StringMap header = auth.authorization(url);
-        Response response = HttpClient.postComplex(url, params, header);
+        Response response = client.postComplex(url, params, header);
         Result result = response.jsonToObject(Result.class);
         if (result.getCode().equals(Constants.API_SUCCESS_CODE) && result.getMsg().equals(Constants.API_SUCCESS_MSG)) {
             return Json.decode(Json.encode(result.getData()), ObjectInfo.class);
@@ -216,13 +219,13 @@ private Response get(String url) {
         logger.debug("request url:" + url);
         StringMap header = auth.authorization(url);
         System.out.println("header:" + Json.encode(header));
-        return HttpClient.get(url, header);
+        return client.get(url, header);
     }
 
     private Response post(String url, StringMap params) {
         logger.debug("request url:" + url);
         StringMap header = auth.authorization(url);
         System.out.println("header:" + Json.encode(header));
-        return HttpClient.post(url, params.jsonString(), header);
+        return client.post(url, params.jsonString(), header);
     }
 }