refactor:add the dependency probing logic of http and unify the apis of http1 and http2

changes/en-us/2.x.md

@@ -90,6 +90,7 @@ Add changes here for all PR submitted to the 2.x branch.
 
 - [[#7615](https://github.com/seata/seata/pull/7615)] Refactor DataSourceProxy
 - [[#7617](https://github.com/seata/seata/pull/7617)] Refactor Alibaba Dubbo and HSF
+- [[#7684](https://github.com/apache/incubator-seata/pull/7684)] Refactor and unify the apis of http1 and http2
 
 
 ### doc:

changes/zh-cn/2.x.md

@@ -88,6 +88,7 @@
 
 - [[#7615](https://github.com/seata/seata/pull/7615)] 重构 DataSourceProxy
 - [[#7617](https://github.com/seata/seata/pull/7617)] 重构 Alibaba Dubbo 和 HSF 模块
+- [[#7684](https://github.com/apache/incubator-seata/pull/7684)] 重构并统一http1和http2的API
 
 
 ### doc:

common/pom.xml

@@ -55,6 +55,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

common/src/main/java/org/apache/seata/common/util/HttpClientUtil.java → common/src/main/java/org/apache/seata/common/http/Http1HttpExecutor.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.seata.common.util;
+package org.apache.seata.common.http;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.http.NameValuePair;
@@ -31,6 +31,9 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.apache.seata.common.loader.LoadLevel;
+import org.apache.seata.common.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,9 +46,10 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class HttpClientUtil {
+@LoadLevel(name = "Http1", order = 1)
+public class Http1HttpExecutor implements HttpExecutor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(HttpClientUtil.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Http1HttpExecutor.class);
 
     private static final Map<Integer /*timeout*/, CloseableHttpClient> HTTP_CLIENT_MAP = new ConcurrentHashMap<>();
 
@@ -54,6 +58,25 @@ public class HttpClientUtil {
 
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
+    public static volatile Http1HttpExecutor instance;
+
+    /**
+     * Gets instance.
+     *
+     * @return the instance
+     */
+    public static Http1HttpExecutor getInstance() {
+
+        if (instance == null) {
+            synchronized (Http1HttpExecutor.class) {
+                if (instance == null) {
+                    instance = new Http1HttpExecutor();
+                }
+            }
+        }
+        return instance;
+    }
+
     static {
         POOLING_HTTP_CLIENT_CONNECTION_MANAGER.setMaxTotal(10);
         POOLING_HTTP_CLIENT_CONNECTION_MANAGER.setDefaultMaxPerRoute(10);
@@ -69,9 +92,9 @@ public class HttpClientUtil {
                 })));
     }
 
-    // post request
-    public static CloseableHttpResponse doPost(
-            String url, Map<String, String> params, Map<String, String> header, int timeout) throws IOException {
+    @Override
+    public HttpResult doPost(String url, Map<String, String> params, Map<String, String> header, int timeout)
+            throws IOException {
         try {
             URIBuilder builder = new URIBuilder(url);
             URI uri = builder.build();
@@ -96,24 +119,27 @@ public static CloseableHttpResponse doPost(
                     httpPost.setEntity(stringEntity);
                 }
             }
-            CloseableHttpClient client = HTTP_CLIENT_MAP.computeIfAbsent(timeout, k -> HttpClients.custom()
-                    .setConnectionManager(POOLING_HTTP_CLIENT_CONNECTION_MANAGER)
-                    .setDefaultRequestConfig(RequestConfig.custom()
-                            .setConnectionRequestTimeout(timeout)
-                            .setSocketTimeout(timeout)
-                            .setConnectTimeout(timeout)
-                            .build())
-                    .build());
-            return client.execute(httpPost);
+            CloseableHttpClient client = getHttpClient(timeout);
+            try (CloseableHttpResponse response = client.execute(httpPost)) {
+                int statusCode = response.getStatusLine() != null
+                        ? response.getStatusLine().getStatusCode()
+                        : 0;
+
+                String responseBody = null;
+                if (response.getEntity() != null) {
+                    responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                }
+
+                return new HttpResult(statusCode, responseBody, null);
+            }
         } catch (URISyntaxException | ClientProtocolException e) {
             LOGGER.error(e.getMessage(), e);
         }
         return null;
     }
 
-    // post request
-    public static CloseableHttpResponse doPost(String url, String body, Map<String, String> header, int timeout)
-            throws IOException {
+    @Override
+    public HttpResult doPost(String url, String body, Map<String, String> header, int timeout) throws IOException {
         try {
             URIBuilder builder = new URIBuilder(url);
             URI uri = builder.build();
@@ -129,24 +155,28 @@ public static CloseableHttpResponse doPost(String url, String body, Map<String,
                     httpPost.setEntity(stringEntity);
                 }
             }
-            CloseableHttpClient client = HTTP_CLIENT_MAP.computeIfAbsent(timeout, k -> HttpClients.custom()
-                    .setConnectionManager(POOLING_HTTP_CLIENT_CONNECTION_MANAGER)
-                    .setDefaultRequestConfig(RequestConfig.custom()
-                            .setConnectionRequestTimeout(timeout)
-                            .setSocketTimeout(timeout)
-                            .setConnectTimeout(timeout)
-                            .build())
-                    .build());
-            return client.execute(httpPost);
+            CloseableHttpClient client = getHttpClient(timeout);
+            try (CloseableHttpResponse response = client.execute(httpPost)) {
+                int statusCode = response.getStatusLine() != null
+                        ? response.getStatusLine().getStatusCode()
+                        : 0;
+
+                String responseBody = null;
+                if (response.getEntity() != null) {
+                    responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                }
+
+                return new HttpResult(statusCode, responseBody, null);
+            }
         } catch (URISyntaxException | ClientProtocolException e) {
             LOGGER.error(e.getMessage(), e);
         }
         return null;
     }
 
-    // get request
-    public static CloseableHttpResponse doGet(
-            String url, Map<String, String> param, Map<String, String> header, int timeout) throws IOException {
+    @Override
+    public HttpResult doGet(String url, Map<String, String> param, Map<String, String> header, int timeout)
+            throws IOException {
         try {
             URIBuilder builder = new URIBuilder(url);
             if (param != null) {
@@ -159,40 +189,33 @@ public static CloseableHttpResponse doGet(
             if (header != null) {
                 header.forEach(httpGet::addHeader);
             }
-            CloseableHttpClient client = HTTP_CLIENT_MAP.computeIfAbsent(timeout, k -> HttpClients.custom()
-                    .setConnectionManager(POOLING_HTTP_CLIENT_CONNECTION_MANAGER)
-                    .setDefaultRequestConfig(RequestConfig.custom()
-                            .setConnectionRequestTimeout(timeout)
-                            .setSocketTimeout(timeout)
-                            .setConnectTimeout(timeout)
-                            .build())
-                    .build());
-            return client.execute(httpGet);
+            CloseableHttpClient client = getHttpClient(timeout);
+            try (CloseableHttpResponse response = client.execute(httpGet)) {
+                int statusCode = response.getStatusLine() != null
+                        ? response.getStatusLine().getStatusCode()
+                        : 0;
+
+                String responseBody = null;
+                if (response.getEntity() != null) {
+                    responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                }
+
+                return new HttpResult(statusCode, responseBody, null);
+            }
         } catch (URISyntaxException | ClientProtocolException e) {
             LOGGER.error(e.getMessage(), e);
         }
         return null;
     }
 
-    public static CloseableHttpResponse doPostJson(
-            String url, String jsonBody, Map<String, String> headers, int timeout) throws IOException {
-        RequestConfig requestConfig = RequestConfig.custom()
-                .setSocketTimeout(timeout)
-                .setConnectTimeout(timeout)
-                .build();
-
-        HttpPost post = new HttpPost(url);
-        post.setConfig(requestConfig);
-
-        if (headers != null) {
-            headers.forEach(post::addHeader);
-        }
-        post.setHeader("Content-Type", "application/json");
-
-        StringEntity entity = new StringEntity(jsonBody, StandardCharsets.UTF_8);
-        post.setEntity(entity);
-
-        CloseableHttpClient client = HttpClients.createDefault();
-        return client.execute(post);
+    private static CloseableHttpClient getHttpClient(int timeout) {
+        return HTTP_CLIENT_MAP.computeIfAbsent(timeout, k -> HttpClients.custom()
+                .setConnectionManager(POOLING_HTTP_CLIENT_CONNECTION_MANAGER)
+                .setDefaultRequestConfig(RequestConfig.custom()
+                        .setConnectionRequestTimeout(timeout)
+                        .setSocketTimeout(timeout)
+                        .setConnectTimeout(timeout)
+                        .build())
+                .build());
     }
 }