Allowed numbers to parse

Author: mnoman09

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

@@ -28,9 +28,9 @@ protected SemanticVersionEqualsMatch(String value) {
     @Nullable
     public Boolean eval(Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
+            if (this.value != null && attributeValue != null) {
                 SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
+                SemanticVersion userSemanticVersion = new SemanticVersion(attributeValue.toString());
                 return userSemanticVersion.compareTo(conditionalVersion) == 0;
             }
         } catch (Exception e) {

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

@@ -28,9 +28,9 @@ protected SemanticVersionGEMatch(String value) {
     @Nullable
     public Boolean eval(Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
+            if (this.value != null && attributeValue != null) {
                 SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
+                SemanticVersion userSemanticVersion = new SemanticVersion(attributeValue.toString());
                 return userSemanticVersion.compareTo(conditionalVersion) >= 0;
             }
         } catch (Exception e) {

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

@@ -28,9 +28,9 @@ protected SemanticVersionGTMatch(String target) {
     @Nullable
     public Boolean eval(Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
+            if (this.value != null && attributeValue != null) {
                 SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
+                SemanticVersion userSemanticVersion = new SemanticVersion(attributeValue.toString());
                 return userSemanticVersion.compareTo(conditionalVersion) > 0;
             }
         } catch (Exception e) {

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

@@ -28,9 +28,9 @@ protected SemanticVersionLEMatch(String target) {
     @Nullable
     public Boolean eval(Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
+            if (this.value != null && attributeValue != null) {
                 SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
+                SemanticVersion userSemanticVersion = new SemanticVersion(attributeValue.toString());
                 return userSemanticVersion.compareTo(conditionalVersion) <= 0;
             }
         } catch (Exception e) {

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

@@ -28,9 +28,9 @@ protected SemanticVersionLTMatch(String target) {
     @Nullable
     public Boolean eval(Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
+            if (this.value != null && attributeValue != null) {
                 SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
+                SemanticVersion userSemanticVersion = new SemanticVersion(attributeValue.toString());
                 return userSemanticVersion.compareTo(conditionalVersion) < 0;
             }
         } catch (Exception e) {

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

@@ -876,11 +876,11 @@ public void substringMatchConditionEvaluatesNull()  {
 
     // Test SemanticVersionEqualsMatch returns null if given invalid value type
     @Test
-    public void testSemanticVersionEqualsMatchInvalidInput() {
+    public void testSemanticVersionEqualsMatchNumberInput() {
         Map testAttributes = new HashMap<String, String>();
-        testAttributes.put("version", 2.0);
-        UserAttribute testInstanceString = new UserAttribute("version", "custom_attribute", "semver_eq", "2.0.0");
-        assertNull(testInstanceString.evaluate(null, testAttributes));
+        testAttributes.put("version", 2.1);
+        UserAttribute testInstanceString = new UserAttribute("version", "custom_attribute", "semver_eq", "2.1");
+        assertTrue(testInstanceString.evaluate(null, testAttributes));
     }
 
     // Test SemanticVersionEqualsMatch returns null if given invalid UserCondition Variable type
@@ -903,28 +903,37 @@ public void testSemanticVersionGTMatchInvalidInput() {
 
     // Test SemanticVersionGEMatch returns null if given invalid value type
     @Test
-    public void testSemanticVersionGEMatchInvalidInput() {
+    public void testSemanticVersionGEMatchNumberInput() {
         Map testAttributes = new HashMap<String, String>();
-        testAttributes.put("version", 2);
-        UserAttribute testInstanceString = new UserAttribute("version", "custom_attribute", "semver_ge", "2.0.0");
-        assertNull(testInstanceString.evaluate(null, testAttributes));
+        testAttributes.put("version", 3);
+        UserAttribute testInstanceString = new UserAttribute("version", "custom_attribute", "semver_ge", "2");
+        assertTrue(testInstanceString.evaluate(null, testAttributes));
     }
 
     // Test SemanticVersionLTMatch returns null if given invalid value type
     @Test
-    public void testSemanticVersionLTMatchInvalidInput() {
+    public void testSemanticVersionLTMatchNumberInput() {
         Map testAttributes = new HashMap<String, String>();
         testAttributes.put("version", 2);
         UserAttribute testInstanceString = new UserAttribute("version", "custom_attribute", "semver_lt", "2.0.0");
-        assertNull(testInstanceString.evaluate(null, testAttributes));
+        assertTrue(testInstanceString.evaluate(null, testAttributes));
+    }
+
+    // Test SemanticVersionLEMatch returns null if given invalid value type
+    @Test
+    public void testSemanticVersionLEMatchNumberInput() {
+        Map testAttributes = new HashMap<String, String>();
+        testAttributes.put("version", 2.1);
+        UserAttribute testInstanceString = new UserAttribute("version", "custom_attribute", "semver_le", "2.1.0");
+        assertTrue(testInstanceString.evaluate(null, testAttributes));
     }
 
     // Test SemanticVersionLEMatch returns null if given invalid value type
     @Test
     public void testSemanticVersionLEMatchInvalidInput() {
         Map testAttributes = new HashMap<String, String>();
-        testAttributes.put("version", 2);
-        UserAttribute testInstanceString = new UserAttribute("version", "custom_attribute", "semver_le", "2.0.0");
+        testAttributes.put("version", true);
+        UserAttribute testInstanceString = new UserAttribute("version", "custom_attribute", "semver_le", "2.1.0");
         assertNull(testInstanceString.evaluate(null, testAttributes));
     }