Merge pull request cdapio#16034 from cdapio/CDAP-21202_fix_regex

CDAP-21202 : making validation regex to support dot

Author: itsankit-google

cdap-api/src/main/java/io/cdap/cdap/api/artifact/ArtifactVersion.java

@@ -37,7 +37,7 @@ public final class ArtifactVersion implements Comparable<ArtifactVersion> {
   private static final Pattern PATTERN = Pattern.compile(VERSION_REGEX);
   private static final Pattern SUFFIX_PATTERN = Pattern.compile("\\-" + VERSION_REGEX);
   //  Suffix can contain only alphanumeric characters and hyphen(-)
-  private static final String  SUFFIX_VALIDATION_REGEX = "^[a-zA-Z0-9-]+$";
+  private static final String  SUFFIX_VALIDATION_REGEX = "^[a-zA-Z0-9-.]+$";
   private static final Pattern SUFFIX_VALIDATION_PATTERN = Pattern.compile(SUFFIX_VALIDATION_REGEX);
 
   private final String version;
@@ -85,10 +85,10 @@ public ArtifactVersion(String str, boolean matchSuffix) {
     }
 
     if (suffix != null) {
-      Matcher suffix_validation_matcher = SUFFIX_VALIDATION_PATTERN.matcher(suffix);
-      if (!suffix_validation_matcher.matches()) {
-        throw new IllegalArgumentException("The suffix of the version is not valid. It should contain only " +
-                                             "alphanumeric characters and hyphen(-)");
+      Matcher suffixValidationMatcher = SUFFIX_VALIDATION_PATTERN.matcher(suffix);
+      if (!suffixValidationMatcher.matches()) {
+        throw new IllegalArgumentException("The suffix of the version is not valid. It should contain only "
+                                             + "alphanumeric characters, hyphen(-) and dot(.)");
       }
     }
 

cdap-api/src/test/java/io/cdap/cdap/api/artifact/ArtifactVersionTest.java

@@ -95,6 +95,7 @@ public void testArtifactVersionValidationSuccess() {
     new ArtifactVersion("1.5.0-SNAPSHOT");
     new ArtifactVersion("1.5.0-RC1");
     new ArtifactVersion("1.5.0-v2-beta3");
+    new ArtifactVersion("8-1.0.16-jar-with-driver-and-dependencies");
   }
 
   @Test (expected = IllegalArgumentException.class)