refactor: response struct

Author: hb0730

src/main/java/com/hb0730/https/HttpSync.java

@@ -5,12 +5,12 @@
 import com.hb0730.https.exception.HttpException;
 import com.hb0730.https.inter.AbstractSyncHttp;
 import com.hb0730.https.inter.SyncHttp;
+import com.hb0730.https.support.SimpleHttpResponse;
 import com.hb0730.https.support.httpclient.HttpClientSyncImpl;
 import com.hb0730.https.support.hutool.HutoolSyncImpl;
 import com.hb0730.https.support.okhttp3.OkHttp3SyncImpl;
 import com.hb0730.https.utils.ClassUtils;
 
-import java.io.InputStream;
 import java.util.Map;
 
 /**
@@ -89,7 +89,7 @@ public HttpSync setHeader(HttpHeader header) {
      * @return 结果
      */
     @Override
-    public String get(String url) {
+    public SimpleHttpResponse get(String url) {
         checkHttpNotNull(proxy);
         return proxy.get(url);
     }
@@ -102,7 +102,7 @@ public String get(String url) {
      * @return 结果
      */
     @Override
-    public String get(String url, Map<String, String> params) {
+    public SimpleHttpResponse get(String url, Map<String, String> params) {
         checkHttpNotNull(proxy);
         return proxy.get(url, params);
     }
@@ -114,7 +114,7 @@ public String get(String url, Map<String, String> params) {
      * @return 结果
      */
     @Override
-    public String post(String url) {
+    public SimpleHttpResponse post(String url) {
         checkHttpNotNull(proxy);
         return proxy.post(url);
     }
@@ -127,23 +127,17 @@ public String post(String url) {
      * @return 结果
      */
     @Override
-    public String post(String url, String data) {
+    public SimpleHttpResponse post(String url, String data) {
         checkHttpNotNull(proxy);
         return proxy.post(url, data);
     }
 
     @Override
-    public String post(String url, String dataJson, HttpHeader header) {
+    public SimpleHttpResponse post(String url, String dataJson, HttpHeader header) {
         checkHttpNotNull(proxy);
         return proxy.post(url, dataJson, header);
     }
 
-    @Override
-    public InputStream postStream(String url, String dataJson) {
-        checkHttpNotNull(proxy);
-        return proxy.postStream(url, dataJson);
-    }
-
     /**
      * POST 请求
      *
@@ -152,13 +146,13 @@ public InputStream postStream(String url, String dataJson) {
      * @return 结果
      */
     @Override
-    public String post(String url, Map<String, String> params) {
+    public SimpleHttpResponse post(String url, Map<String, String> params) {
         checkHttpNotNull(proxy);
         return proxy.post(url, params);
     }
 
     @Override
-    public String post(String url, Map<String, String> formData, HttpHeader header) {
+    public SimpleHttpResponse post(String url, Map<String, String> formData, HttpHeader header) {
         checkHttpNotNull(proxy);
         return proxy.post(url, formData, header);
     }

src/main/java/com/hb0730/https/inter/SyncHttp.java

@@ -1,6 +1,7 @@
 package com.hb0730.https.inter;
 
 import com.hb0730.https.HttpHeader;
+import com.hb0730.https.support.SimpleHttpResponse;
 
 import java.io.InputStream;
 import java.util.Map;
@@ -19,7 +20,7 @@ public interface SyncHttp extends Http {
      * @param url 请求地址
      * @return 响应结果
      */
-    String get(String url);
+    SimpleHttpResponse get(String url);
 
     /**
      * get 请求
@@ -28,15 +29,15 @@ public interface SyncHttp extends Http {
      * @param params 请求参数
      * @return 响应结果
      */
-    String get(String url, Map<String, String> params);
+    SimpleHttpResponse get(String url, Map<String, String> params);
 
     /**
      * post请求
      *
      * @param url 请求地址
      * @return 响应结果
      */
-    String post(String url);
+    SimpleHttpResponse post(String url);
 
     /**
      * post请求
@@ -45,7 +46,7 @@ public interface SyncHttp extends Http {
      * @param dataJson 请求参数，json格式
      * @return 响应结果
      */
-    String post(String url, String dataJson);
+    SimpleHttpResponse post(String url, String dataJson);
 
     /**
      * post请求
@@ -55,16 +56,7 @@ public interface SyncHttp extends Http {
      * @param header   一次性请求头
      * @return 响应结果
      */
-    String post(String url, String dataJson, HttpHeader header);
-
-    /**
-     * post请求
-     *
-     * @param url      请求地址
-     * @param dataJson 请求参数,json格式
-     * @return 响应流
-     */
-    InputStream postStream(String url, String dataJson);
+    SimpleHttpResponse post(String url, String dataJson, HttpHeader header);
 
     /**
      * post请求
@@ -73,7 +65,7 @@ public interface SyncHttp extends Http {
      * @param formdata form 参数
      * @return 响应结果
      */
-    String post(String url, Map<String, String> formdata);
+    SimpleHttpResponse post(String url, Map<String, String> formdata);
 
     /**
      * post 请求
@@ -83,6 +75,6 @@ public interface SyncHttp extends Http {
      * @param header   请求头
      * @return 响应结果
      */
-    String post(String url, Map<String, String> formData, HttpHeader header);
+    SimpleHttpResponse post(String url, Map<String, String> formData, HttpHeader header);
 
 }

src/main/java/com/hb0730/https/support/SimpleHttpResponse.java

@@ -0,0 +1,64 @@
+package com.hb0730.https.support;
+
+import cn.hutool.core.io.IoUtil;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 响应封装
+ *
+ * @author <a href="mailto:huangbing0730@gmail">hb0730</a>
+ * @date 2022/3/14
+ * @since 1.0.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SimpleHttpResponse {
+    /**
+     * 是否成功
+     */
+    private boolean success;
+    /**
+     * 请求头
+     */
+    private Map<String, List<String>> headers;
+    /**
+     * body stream
+     */
+    private InputStream body;
+
+    /**
+     * 获取body，默认UTF-8编码
+     *
+     * @return body
+     * @see #getBody(Charset)
+     */
+    public String getBody() {
+        return this.getBody(StandardCharsets.UTF_8);
+    }
+
+    /**
+     * 获取body,自动关闭输入流
+     *
+     * @param charset 编码格式
+     * @return body
+     */
+    public String getBody(Charset charset) {
+        return IoUtil.read(this.body, charset);
+    }
+
+    public SimpleHttpResponse body(byte[] body) {
+        this.body = IoUtil.toStream(body);
+        return this;
+    }
+}

src/main/java/com/hb0730/https/support/callback/HttpCallback.java

@@ -1,10 +1,6 @@
 package com.hb0730.https.support.callback;
 
-import com.hb0730.https.support.httpclient.HttpClientAsyncImpl;
-import com.hb0730.https.support.okhttp3.OkHttp3AsyncImpl;
-import okhttp3.Request;
-import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
-import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
+import com.hb0730.https.support.SimpleHttpResponse;
 
 import java.io.IOException;
 
@@ -21,16 +17,26 @@ public interface HttpCallback {
      *
      * @param result 响应结果
      * @throws IOException 异常
-     * @see OkHttp3AsyncImpl#exec(Request.Builder, HttpCallback)
-     * @see HttpClientAsyncImpl#exec(HttpUriRequestBase, BasicRequestProducer, HttpCallback)
+     * @see #response(SimpleHttpResponse)
      */
-    void success(String result) throws IOException;
+    @Deprecated
+    default void success(String result) throws IOException {
+    }
+
+    /**
+     * 响应成功 200 >= http code < 300
+     *
+     * @param response 响应结果
+     * @throws IOException 异常
+     */
+    void response(SimpleHttpResponse response) throws IOException;
 
     /**
      * 请求参数
      *
      * @param e 异常
      */
-    void failure(Exception e);
-
+    @Deprecated
+    default void failure(Exception e) {
+    }
 }

src/main/java/com/hb0730/https/support/httpclient/HttpClientAsyncImpl.java

@@ -4,12 +4,12 @@
 import com.hb0730.https.constants.Constants;
 import com.hb0730.https.exception.HttpException;
 import com.hb0730.https.inter.AbstractAsyncHttp;
+import com.hb0730.https.support.SimpleHttpResponse;
 import com.hb0730.https.support.callback.HttpCallback;
 import com.hb0730.https.utils.CollectionUtils;
 import com.hb0730.https.utils.MapUtils;
 import com.hb0730.https.utils.StringUtils;
 import lombok.Getter;
-import lombok.SneakyThrows;
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
 import org.apache.hc.client5.http.async.methods.SimpleRequestProducer;
@@ -18,30 +18,33 @@
 import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.Message;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.config.CharCodingConfig;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.core5.http.nio.AsyncRequestProducer;
-import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
+import org.apache.hc.core5.http.nio.entity.BasicAsyncEntityConsumer;
 import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
 import org.apache.hc.core5.net.URIBuilder;
 import org.apache.hc.core5.net.WWWFormCodec;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * HTTPClient async,需要自行关闭{@link #httpClient}
@@ -140,21 +143,28 @@ public void post(String url, Map<String, String> formdata, HttpCallback httpCall
 
     private void exec(AsyncRequestProducer producer, HttpCallback httpCallback) {
         this.httpClient.start();
-        CharCodingConfig config = CharCodingConfig.custom().setCharset(getCharSet()).build();
-        StringAsyncEntityConsumer stringConsumer = new StringAsyncEntityConsumer(config);
-        BasicResponseConsumer<String> responseConsumer = new BasicResponseConsumer<>(stringConsumer);
-        this.httpClient.execute(producer, responseConsumer, new FutureCallback<Message<HttpResponse, String>>() {
-            @SneakyThrows
+        this.httpClient.execute(producer, new BasicResponseConsumer<byte[]>(new BasicAsyncEntityConsumer()), new FutureCallback<Message<HttpResponse, byte[]>>() {
             @Override
-            public void completed(Message<HttpResponse, String> result) {
-                if (null == httpCallback) {
-                    return;
-                }
-                HttpResponse head = result.getHead();
-                if (head.getCode() >= HttpStatus.SC_SUCCESS && head.getCode() < HttpStatus.SC_REDIRECTION) {
-                    httpCallback.success(result.getBody());
-                } else {
-                    httpCallback.failure(new HttpException("Unexpected response status: " + head.getCode()));
+            public void completed(Message<HttpResponse, byte[]> result) {
+                HttpResponse response = result.getHead();
+                boolean success = (response.getCode() >= HttpStatus.SC_SUCCESS && response.getCode() < HttpStatus.SC_REDIRECTION);
+                Map<String, List<String>> headers = Arrays.stream(response.getHeaders())
+                    .collect(Collectors.toMap(Header::getName,
+                        (value) -> {
+                            List<String> valueList = new ArrayList<>();
+                            valueList.add(value.getValue());
+                            return valueList;
+                        }
+                        , (v1Value, v2Value) -> v2Value));
+                SimpleHttpResponse httpResponse = SimpleHttpResponse
+                    .builder()
+                    .success(success)
+                    .headers(headers)
+                    .build().body(result.getBody());
+                try {
+                    httpCallback.response(httpResponse);
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
             }