change http client implementation, Unified apacheHttpClient

common/src/main/java/com/alibaba/nacos/common/http/HttpClientManager.java

@@ -16,6 +16,8 @@
 
 package com.alibaba.nacos.common.http;
 
+import com.alibaba.nacos.common.http.client.ApacheHttpClientRequest;
+import com.alibaba.nacos.common.http.client.NacosRestTemplate;
 import com.alibaba.nacos.common.utils.ShutdownUtils;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.HttpClients;
@@ -44,6 +46,9 @@ public class HttpClientManager {
 	private static final NAsyncHttpClient ASYNC_HTTP_CLIENT = new NacosAsyncHttpClient(
 			HttpAsyncClients.custom().setDefaultRequestConfig(DEFAULT_CONFIG).build());
 
+	private static final NacosRestTemplate NACOS_REST_TEMPLATE = new NacosRestTemplate
+        (new ApacheHttpClientRequest(HttpClients.custom().setDefaultRequestConfig(DEFAULT_CONFIG).build()));
+
 	static {
 		ShutdownUtils.addShutdownHook(new Runnable() {
 			@Override
@@ -69,4 +74,8 @@ public static NAsyncHttpClient getAsyncHttpClient() {
 		return ASYNC_HTTP_CLIENT;
 	}
 
+	public static NacosRestTemplate getNacosRestTemplate() {
+	    return NACOS_REST_TEMPLATE;
+    }
+
 }

common/src/main/java/com/alibaba/nacos/common/http/client/ApacheHttpClientRequest.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.nacos.common.http.client;
+
+import com.alibaba.nacos.api.common.Constants;
+import com.alibaba.nacos.common.http.BaseHttpMethod;
+import com.alibaba.nacos.common.http.param.Header;
+import com.alibaba.nacos.common.model.RequestHttpEntity;
+import com.alibaba.nacos.common.utils.HttpMethod;
+import com.alibaba.nacos.common.utils.IoUtils;
+import com.google.common.net.HttpHeaders;
+import org.apache.http.HttpEntity;
+import org.apache.http.StatusLine;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * {@link HttpClientRequest} implementation that uses apache http client to
+ * execute streaming requests
+ *
+ * @author mai.jh
+ * @date 2020/5/24
+ */
+public class ApacheHttpClientRequest implements HttpClientRequest {
+
+    private static final Logger logger = LoggerFactory.getLogger(NacosRestTemplate.class);
+
+
+    private CloseableHttpClient client;
+
+    public ApacheHttpClientRequest(CloseableHttpClient client) {
+        this.client = client;
+    }
+
+    @Override
+    public HttpClientResponse execute(URI uri, String httpMethod, RequestHttpEntity requestHttpEntity) throws Exception {
+        HttpRequestBase request = build(uri, httpMethod, requestHttpEntity);
+        CloseableHttpResponse response = client.execute(request);
+        if (logger.isDebugEnabled()) {
+            logger.debug("Request from server: " + request.getURI().toString());
+        }
+        return handleResponse(response);
+    }
+
+    private HttpClientResponse handleResponse(CloseableHttpResponse response) throws IOException{
+        StatusLine statusLine = response.getStatusLine();
+        HttpEntity entity = response.getEntity();
+        int responseCode = statusLine.getStatusCode();
+        String responseMessage = statusLine.getReasonPhrase();
+        org.apache.http.Header[] allHeaders = response.getAllHeaders();
+        Header responseHeader = Header.newInstance();
+
+        for (org.apache.http.Header header : allHeaders) {
+            responseHeader.addParam(header.getName(), header.getValue());
+        }
+
+        return new DefaultClientHttpResponse(responseHeader,responseCode, responseMessage, entity.getContent());
+    }
+
+
+    protected HttpRequestBase build(URI uri, String method, RequestHttpEntity requestHttpEntity) throws Exception {
+        Header headers = requestHttpEntity.getHeaders();
+        BaseHttpMethod httpMethod = BaseHttpMethod.sourceOf(method);
+        httpMethod.init(uri.toString());
+        httpMethod.initHeader(headers);
+        httpMethod.initEntity(requestHttpEntity.getBody(), headers.getValue("Content-Type"));
+        return httpMethod.getRequestBase();
+    }
+}

common/src/main/java/com/alibaba/nacos/common/http/client/DefaultClientHttpResponse.java

@@ -27,12 +27,12 @@
 
 
 /**
- * DefaultClientHttpResponse implementation {@link ClientHttpResponse}
+ * DefaultClientHttpResponse implementation {@link HttpClientResponse}
  *
  * @author mai.jh
  * @date 2020/5/25
  */
-public class DefaultClientHttpResponse implements ClientHttpResponse {
+public class DefaultClientHttpResponse implements HttpClientResponse {
 
     private Header header;
 
@@ -50,12 +50,12 @@ public DefaultClientHttpResponse(Header header, int responseCode, String respons
     }
 
     @Override
-    public int getStatusCode() throws IOException {
+    public int getStatusCode() {
         return responseCode;
     }
 
     @Override
-    public String getStatusText() throws IOException {
+    public String getStatusText() {
         return responseCodeMessage;
     }
 

common/src/main/java/com/alibaba/nacos/common/http/client/ClientHttpRequest.java → common/src/main/java/com/alibaba/nacos/common/http/client/HttpClientRequest.java

@@ -18,7 +18,6 @@
 
 import com.alibaba.nacos.common.model.RequestHttpEntity;
 
-import java.io.IOException;
 import java.net.URI;
 
 /**
@@ -28,15 +27,15 @@
  * @author mai.jh
  * @date 2020/5/23
  */
-public interface ClientHttpRequest {
+public interface HttpClientRequest {
 
     /**
      * execute http request
      * @param uri http url
      * @param httpMethod http request method
      * @param requestHttpEntity http request entity
-     * @return ClientHttpResponse
-     * @throws IOException IOException
+     * @return HttpClientResponse
+     * @throws Exception ex
      */
-    ClientHttpResponse execute(URI uri, String httpMethod, RequestHttpEntity requestHttpEntity) throws IOException;
+    HttpClientResponse execute(URI uri, String httpMethod, RequestHttpEntity requestHttpEntity) throws Exception;
 }