add InputValidatorTest

apolloconfig · Sep 15, 2022 · 6448534 · 6448534
1 parent f07a3f3
commit 6448534
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/InputValidator.java b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/InputValidator.java
@@ -26,8 +26,8 @@
 public class InputValidator {
   public static final String INVALID_CLUSTER_NAMESPACE_MESSAGE = "Only digits, alphabets and symbol - _ . (except single .) are allowed";
   public static final String INVALID_NAMESPACE_NAMESPACE_MESSAGE = "not allowed to end with .json, .yml, .yaml, .xml, .properties";
-  public static final String CLUSTER_NAMESPACE_VALIDATOR = "[0-9a-zA-Z-]+[0-9a-zA-Z._-]*";
-  private static final String APP_NAMESPACE_VALIDATOR = "[a-zA-Z0-9._-]+(?<!\\.(json|yml|yaml|xml|properties))$";
+  public static final String CLUSTER_NAMESPACE_VALIDATOR = "[0-9a-zA-Z_-]+[0-9a-zA-Z_.-]*";
+  private static final String APP_NAMESPACE_VALIDATOR = "[a-zA-Z0-9_-]+[a-zA-Z0-9._-]*(?<!\\.(json|yml|yaml|xml|properties))$";
   private static final Pattern CLUSTER_NAMESPACE_PATTERN = Pattern.compile(CLUSTER_NAMESPACE_VALIDATOR);
   private static final Pattern APP_NAMESPACE_PATTERN = Pattern.compile(APP_NAMESPACE_VALIDATOR);
 

diff --git a/apollo-common/src/test/java/com/ctrip/framework/apollo/common/utils/InputValidatorTest.java b/apollo-common/src/test/java/com/ctrip/framework/apollo/common/utils/InputValidatorTest.java
@@ -29,6 +29,7 @@ public void testValidClusterName() throws Exception {
     checkClusterName("some.&.name", false);
     checkClusterName("", false);
     checkClusterName(null, false);
+    checkClusterName(".",false);
   }
 
   @Test
@@ -42,6 +43,7 @@ public void testValidAppNamespaceName() throws Exception {
     checkAppNamespaceName("some.name.yaml", false);
     checkAppNamespaceName("some.name.xml", false);
     checkAppNamespaceName("some.name.properties", false);
+    checkAppNamespaceName("..xml", false);
   }
 
   private void checkClusterName(String name, boolean valid) {