Merge pull request #3 from alibaba/develop

sync
binbin0325 · Sep 20, 2020 · 8582c0d · 8582c0d
2 parents b519af0 + 7fd4d9a
commit 8582c0d
Show file tree

Hide file tree

Showing 145 changed files with 1,965 additions and 1,275 deletions.
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/utils/NamingUtils.java b/api/src/main/java/com/alibaba/nacos/api/naming/utils/NamingUtils.java
@@ -28,6 +28,9 @@
 public class NamingUtils {
 
     public static String getGroupedName(final String serviceName, final String groupName) {
+        if (StringUtils.isBlank(serviceName)) {
+            throw new IllegalArgumentException("Param 'serviceName' is illegal, serviceName is blank");
+        }
         final String resultGroupedName = groupName + Constants.SERVICE_INFO_SPLITER + serviceName;
         return resultGroupedName.intern();
     }

diff --git a/auth/pom.xml b/auth/pom.xml
@@ -40,6 +40,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>nacos-sys</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/auth/src/main/java/com/alibaba/nacos/auth/common/AuthConfigs.java b/auth/src/main/java/com/alibaba/nacos/auth/common/AuthConfigs.java
@@ -16,12 +16,11 @@
 
 package com.alibaba.nacos.auth.common;
 
-import com.alibaba.nacos.auth.common.env.ReloadableConfigs;
 import com.alibaba.nacos.common.JustForTest;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
 import io.jsonwebtoken.io.Decoders;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
@@ -40,9 +39,6 @@ public class AuthConfigs {
     @JustForTest
     private static Boolean cachingEnabled = null;
 
-    @Autowired
-    private ReloadableConfigs reloadableConfigs;
-
     /**
      * secret key.
      */
@@ -93,7 +89,7 @@ public boolean isAuthEnabled() {
             return BooleanUtils.toBoolean(enabled);
         }
         return BooleanUtils
-                .toBoolean(reloadableConfigs.getProperties().getProperty("nacos.core.auth.enabled", "false"));
+                .toBoolean(ApplicationUtils.getProperty("nacos.core.auth.enabled", "false"));
     }
 
     /**
@@ -106,7 +102,7 @@ public boolean isCachingEnabled() {
             return cachingEnabled;
         }
         return BooleanUtils
-                .toBoolean(reloadableConfigs.getProperties().getProperty("nacos.core.auth.caching.enabled", "true"));
+                .toBoolean(ApplicationUtils.getProperty("nacos.core.auth.caching.enabled", "true"));
     }
 
     @JustForTest

diff --git a/auth/src/main/java/com/alibaba/nacos/auth/common/env/ReloadableConfigs.java b/auth/src/main/java/com/alibaba/nacos/auth/common/env/ReloadableConfigs.java
diff --git a/common/src/main/java/com/alibaba/nacos/common/http/AbstractApacheHttpClientFactory.java b/common/src/main/java/com/alibaba/nacos/common/http/AbstractApacheHttpClientFactory.java
@@ -30,9 +30,15 @@ public abstract class AbstractApacheHttpClientFactory extends AbstractHttpClient
 
     @Override
     public final NacosRestTemplate createNacosRestTemplate() {
+        final HttpClientConfig originalRequestConfig = buildHttpClientConfig();
         final RequestConfig requestConfig = getRequestConfig();
-        return new NacosRestTemplate(assignLogger(),
-                new DefaultHttpClientRequest(HttpClients.custom().setDefaultRequestConfig(requestConfig).build()));
+        return new NacosRestTemplate(assignLogger(), new DefaultHttpClientRequest(
+                HttpClients.custom().setDefaultRequestConfig(requestConfig)
+                        .setUserAgent(originalRequestConfig.getUserAgent())
+                        .setMaxConnTotal(originalRequestConfig.getMaxConnTotal())
+                        .setMaxConnPerRoute(originalRequestConfig.getMaxConnPerRoute())
+                        .setConnectionTimeToLive(originalRequestConfig.getConnTimeToLive(),
+                                originalRequestConfig.getConnTimeToLiveTimeUnit()).build()));
     }
 
 }
diff --git a/common/src/main/java/com/alibaba/nacos/common/http/AbstractHttpClientFactory.java b/common/src/main/java/com/alibaba/nacos/common/http/AbstractHttpClientFactory.java
@@ -67,15 +67,20 @@ public void onChanged(String filePath) {
 
     @Override
     public NacosAsyncRestTemplate createNacosAsyncRestTemplate() {
-        RequestConfig requestConfig = getRequestConfig();
+        final HttpClientConfig originalRequestConfig = buildHttpClientConfig();
+        final RequestConfig requestConfig = getRequestConfig();
         return new NacosAsyncRestTemplate(assignLogger(), new DefaultAsyncHttpClientRequest(
-                HttpAsyncClients.custom().setDefaultRequestConfig(requestConfig).build()));
+                HttpAsyncClients.custom().setDefaultRequestConfig(requestConfig)
+                        .setMaxConnTotal(originalRequestConfig.getMaxConnTotal())
+                        .setMaxConnPerRoute(originalRequestConfig.getMaxConnPerRoute())
+                        .setUserAgent(originalRequestConfig.getUserAgent()).build()));
     }
 
     protected RequestConfig getRequestConfig() {
         HttpClientConfig httpClientConfig = buildHttpClientConfig();
         return RequestConfig.custom().setConnectTimeout(httpClientConfig.getConTimeOutMillis())
                 .setSocketTimeout(httpClientConfig.getReadTimeOutMillis())
+                .setConnectionRequestTimeout(httpClientConfig.getConnectionRequestTimeout())
                 .setMaxRedirects(httpClientConfig.getMaxRedirects()).build();
     }
 

diff --git a/common/src/main/java/com/alibaba/nacos/common/http/BaseHttpClient.java b/common/src/main/java/com/alibaba/nacos/common/http/BaseHttpClient.java
@@ -16,7 +16,6 @@
 
 package com.alibaba.nacos.common.http;
 
-import com.alibaba.nacos.common.constant.HttpHeaderConsts;
 import com.alibaba.nacos.common.http.handler.ResponseHandler;
 import com.alibaba.nacos.common.http.param.Header;
 import com.alibaba.nacos.common.http.param.Query;
@@ -103,7 +102,7 @@ protected HttpRequestBase build(String url, Header header, Object body, String m
         final BaseHttpMethod httpMethod = BaseHttpMethod.sourceOf(method);
         final HttpRequestBase httpRequestBase = httpMethod.init(url);
         HttpUtils.initRequestHeader(httpRequestBase, header);
-        HttpUtils.initRequestEntity(httpRequestBase, body, header.getValue(HttpHeaderConsts.CONTENT_TYPE));
+        HttpUtils.initRequestEntity(httpRequestBase, body, header);
         return httpRequestBase;
     }
 

diff --git a/common/src/main/java/com/alibaba/nacos/common/http/BaseHttpMethod.java b/common/src/main/java/com/alibaba/nacos/common/http/BaseHttpMethod.java
@@ -84,6 +84,16 @@ protected HttpRequestBase createRequest(String url) {
         }
     },
 
+    /**
+     * delete Large request.
+     */
+    DELETE_LARGE(HttpMethod.DELETE_LARGE) {
+        @Override
+        protected HttpRequestBase createRequest(String url) {
+            return new HttpDeleteWithEntity(url);
+        }
+    },
+
     /**
      * head request.
      */
@@ -155,6 +165,10 @@ public static BaseHttpMethod sourceOf(String name) {
 
     /**
      * get Large implemented.
+     * <p>
+     * Mainly used for GET request parameters are relatively large, can not be placed on the URL, so it needs to be
+     * placed in the body.
+     * </p>
      */
     public static class HttpGetWithEntity extends HttpEntityEnclosingRequestBase {
 
@@ -171,4 +185,26 @@ public String getMethod() {
         }
     }
 
+    /**
+     * delete Large implemented.
+     * <p>
+     * Mainly used for DELETE request parameters are relatively large, can not be placed on the URL, so it needs to be
+     * placed in the body.
+     * </p>
+     */
+    public static class HttpDeleteWithEntity extends HttpEntityEnclosingRequestBase {
+
+        public static final String METHOD_NAME = "DELETE";
+
+        public HttpDeleteWithEntity(String url) {
+            super();
+            setURI(URI.create(url));
+        }
+
+        @Override
+        public String getMethod() {
+            return METHOD_NAME;
+        }
+    }
+
 }