fix: Semantic version fix and multiple plus signs check added (#394)

* Semantic version fix and multiple plus signs check added

* renamed buildMetacount function to isValidBuildMetadata

Co-authored-by: FOLIO3PK\muhammadnoman <muhammadnoman@folio3.com>

Author: msohailhussain

core-api/src/main/java/com/optimizely/ab/config/audience/match/SemanticVersion.java

@@ -25,7 +25,7 @@
 
 public final class SemanticVersion {
 
-    private static final String BUILD_SEPERATOR = "+";
+    private static final String BUILD_SEPERATOR = "\\+";
     private static final String PRE_RELEASE_SEPERATOR = "-";
 
     private final String version;
@@ -54,8 +54,10 @@ public int compare(SemanticVersion targetedVersion) throws Exception {
             if (userVersionPartInt == null) {
                 // Compare strings
                 int result = userVersionParts[index].compareTo(targetedVersionParts[index]);
-                if (result != 0) {
-                    return result;
+                if (result < 0) {
+                    return targetedVersion.isPreRelease() && !isPreRelease() ? 1 : -1;
+                } else if (result > 0) {
+                    return !targetedVersion.isPreRelease() && isPreRelease() ? -1 : 1;
                 }
             } else if (targetVersionPartInt != null) {
                 if (!userVersionPartInt.equals(targetVersionPartInt)) {
@@ -75,11 +77,25 @@ public int compare(SemanticVersion targetedVersion) throws Exception {
     }
 
     public boolean isPreRelease() {
-        return version.contains(PRE_RELEASE_SEPERATOR);
+        int buildIndex = version.indexOf("+");
+        int preReleaseIndex = version.indexOf("-");
+        if (buildIndex < 0) {
+            return preReleaseIndex > 0;
+        } else if(preReleaseIndex < 0) {
+            return false;
+        }
+        return  preReleaseIndex < buildIndex;
     }
 
     public boolean isBuild() {
-        return version.contains(BUILD_SEPERATOR);
+        int buildIndex = version.indexOf("+");
+        int preReleaseIndex = version.indexOf("-");
+        if (preReleaseIndex < 0) {
+            return buildIndex > 0;
+        } else if(buildIndex < 0) {
+            return false;
+        }
+        return buildIndex < preReleaseIndex;
     }
 
     private int dotCount(String prefixVersion) {
@@ -93,6 +109,17 @@ private int dotCount(String prefixVersion) {
         return count;
     }
 
+    private boolean isValidBuildMetadata() {
+        char[] vCharArray = version.toCharArray();
+        int count = 0;
+        for (char c : vCharArray) {
+            if (c == '+') {
+                count++;
+            }
+        }
+        return count > 1;
+    }
+
     public String[] splitSemanticVersion() throws Exception {
         List<String> versionParts = new ArrayList<>();
         String versionPrefix = "";
@@ -102,13 +129,13 @@ public String[] splitSemanticVersion() throws Exception {
         String[] preVersionParts;
 
         // Contains white spaces
-        if (version.contains(" ")) {   // log and throw error
-            throw new Exception("Semantic version contains white spaces. Invalid Semantic Version.");
+        if (version.contains(" ") || isValidBuildMetadata()) {   // log and throw error
+            throw new Exception("Invalid Semantic Version.");
         }
 
         if (isBuild() || isPreRelease()) {
             String[] partialVersionParts = version.split(isPreRelease() ?
-                PRE_RELEASE_SEPERATOR : BUILD_SEPERATOR);
+                PRE_RELEASE_SEPERATOR : BUILD_SEPERATOR, 2);
 
             if (partialVersionParts.length <= 1) {
                 // throw error

core-api/src/test/java/com/optimizely/ab/config/audience/SemanticVersionTest.java

@@ -49,6 +49,13 @@ public void semanticVersionInvalidDoubleDot() throws Exception {
         semanticVersion.splitSemanticVersion();
     }
 
+    @Test
+    public void semanticVersionInvalidMultipleBuild() throws Exception {
+        thrown.expect(Exception.class);
+        SemanticVersion semanticVersion = new SemanticVersion("3.1.2-2+2.3+1");
+        semanticVersion.splitSemanticVersion();
+    }
+
     @Test
     public void semanticVersionInvalidPlus() throws Exception {
         thrown.expect(Exception.class);
@@ -175,13 +182,56 @@ public void semanticVersionCompareToActualPreReleaseMissing() throws Exception {
         assertTrue(actualSV.compare(targetSV) > 0);
     }
 
+    @Test
+    public void semanticVersionCompareTargetBetaComplex() throws Exception {
+        SemanticVersion targetSV = new SemanticVersion("2.1.3-beta+1");
+        SemanticVersion actualSV = new SemanticVersion("2.1.3-beta+1.2.3");
+        assertTrue(actualSV.compare(targetSV) > 0);
+    }
+
+    @Test
+    public void semanticVersionCompareTargetBuildIgnores() throws Exception {
+        SemanticVersion targetSV = new SemanticVersion("2.1.3");
+        SemanticVersion actualSV = new SemanticVersion("2.1.3+build");
+        assertTrue(actualSV.compare(targetSV) == 0);
+    }
+
+    @Test
+    public void semanticVersionCompareTargetBuildComplex() throws Exception {
+        SemanticVersion targetSV = new SemanticVersion("2.1.3-beta+1.2.3");
+        SemanticVersion actualSV = new SemanticVersion("2.1.3-beta+1");
+        assertTrue(actualSV.compare(targetSV) < 0);
+    }
+
+    @Test
+    public void semanticVersionCompareMultipleDash() throws Exception {
+        SemanticVersion targetSV = new SemanticVersion("2.1.3-beta-1.2.3");
+        SemanticVersion actualSV = new SemanticVersion("2.1.3-beta-1");
+        assertTrue(actualSV.compare(targetSV) < 0);
+    }
+
     @Test
     public void semanticVersionCompareToAlphaBetaAsciiComparision() throws Exception {
         SemanticVersion targetSV = new SemanticVersion("3.7.1-alpha");
         SemanticVersion actualSV = new SemanticVersion("3.7.1-beta");
         assertTrue(actualSV.compare(targetSV) > 0);
     }
 
+    @Test
+    public void semanticVersionComparePrereleaseSmallerThanBuild() throws Exception {
+        SemanticVersion targetSV = new SemanticVersion("3.7.1-prerelease");
+        SemanticVersion actualSV = new SemanticVersion("3.7.1+build");
+        assertTrue(actualSV.compare(targetSV) > 0);
+    }
+
+
+    @Test
+    public void semanticVersionCompareAgainstPreReleaseToPreRelease() throws Exception {
+        SemanticVersion targetSV = new SemanticVersion("3.7.1-prerelease+build");
+        SemanticVersion actualSV = new SemanticVersion("3.7.1-prerelease-prerelease+rc");
+        assertTrue(actualSV.compare(targetSV) > 0);
+    }
+
     @Test
     public void semanticVersionCompareToIgnoreMetaComparision() throws Exception {
         SemanticVersion targetSV = new SemanticVersion("3.7.1-beta.1+2.3");