improve validateParameter

atptro · JacksonTian · commit ca4709927953 · 2020-07-28T12:01:26.000+08:00
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/ParameterHelper.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/ParameterHelper.java
@@ -30,6 +30,9 @@ public static String getUniqueNonce() {
     }
 
     public static void validateParameter(String parameter, String parameterName) {
+        if (null == parameter || "".equals(parameter.trim())) {
+            return;
+        }
         if (Pattern.matches(ParameterHelper.PATTERN, parameter)) {
             return;
         }
diff --git a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/utils/ParameterHelperTest.java b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/utils/ParameterHelperTest.java
@@ -24,6 +24,9 @@ public void getUniqueNonce() {
 
     @Test
     public void validateParameterTest() {
+        ParameterHelper.validateParameter("  ", "regionId");
+        ParameterHelper.validateParameter("", "regionId");
+        ParameterHelper.validateParameter(null, "regionId");
         ParameterHelper.validateParameter("cn-hangzhou", "regionId");
         try {
             ParameterHelper.validateParameter("test.test", "regionId");

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ public static String getUniqueNonce() {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public static void validateParameter(String parameter, String parameterName) {`
	`33`	`+ if (null == parameter \|\| "".equals(parameter.trim())) {`
	`34`	`+ return;`
	`35`	`+ }`
`33`	`36`	`if (Pattern.matches(ParameterHelper.PATTERN, parameter)) {`
`34`	`37`	`return;`
`35`	`38`	`}`