Refactor semver.

Author: Mike Davis

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

@@ -20,18 +20,13 @@
 
 import static com.optimizely.ab.internal.AttributesUtil.isValidNumber;
 
-class GEMatch extends AttributeMatch<Number> {
-    Number value;
-
-    protected GEMatch(Number value) {
-        this.value = value;
-    }
+class GEMatch implements Match {
 
     @Nullable
-    public Boolean eval(Object attributeValue) {
+    public Boolean eval(Object conditionValue, Object attributeValue) {
         try {
-            if(isValidNumber(attributeValue)) {
-                return castToValueType(attributeValue, value).doubleValue() >= value.doubleValue();
+            if(isValidNumber(attributeValue) && isValidNumber(conditionValue) ) {
+                return ((Number) attributeValue).doubleValue() >= ((Number) conditionValue).doubleValue();
             }
         } catch (Exception e) {
             return null;

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

@@ -20,23 +20,19 @@
 
 import static com.optimizely.ab.internal.AttributesUtil.isValidNumber;
 
-class LEMatch extends AttributeMatch<Number> {
-    Number value;
-
-    protected LEMatch(Number value) {
-        this.value = value;
-    }
+class LEMatch implements Match {
 
     @Nullable
-    public Boolean eval(Object attributeValue) {
+    public Boolean eval(Object conditionValue, Object attributeValue) {
         try {
-            if(isValidNumber(attributeValue)) {
-                return castToValueType(attributeValue, value).doubleValue() <= value.doubleValue();
+            if(isValidNumber(attributeValue) && isValidNumber(conditionValue) ) {
+                return ((Number) attributeValue).doubleValue() <= ((Number) conditionValue).doubleValue();
             }
         } catch (Exception e) {
             return null;
         }
         return null;
+
     }
 }
 

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

@@ -32,15 +32,30 @@ public class MatchRegistry {
     public static final String EXACT = "exact";
     public static final String GREATER_THAN = "gt";
     public static final String LESS_THAN = "lt";
+    public static final String LESS_THAN_EQ = "le";
+    public static final String GREATER_THAN_EQ = "ge";
     public static final String SUBSTRING = "substring";
+    public static final String SEMVER_EQ = "semver_eq";
+    public static final String SEMVER_GE = "semver_ge";
+    public static final String SEMVER_GT = "semver_gt";
+    public static final String SEMVER_LE = "semver_le";
+    public static final String SEMVER_LT = "semver_lt";
+
     public static final String LEGACY = "legacy";
 
     static {
         register(EXISTS, new ExistsMatch());
         register(EXACT, new ExactMatch());
         register(GREATER_THAN, new GTMatch());
         register(LESS_THAN, new LTMatch());
+        register(LESS_THAN_EQ, new LEMatch());
+        register(GREATER_THAN_EQ, new GEMatch());
         register(SUBSTRING, new SubstringMatch());
+        register(SEMVER_EQ, new SemanticVersionEqualsMatch());
+        register(SEMVER_GE, new SemanticVersionGEMatch());
+        register(SEMVER_GT, new SemanticVersionGTMatch());
+        register(SEMVER_LE, new SemanticVersionLEMatch());
+        register(SEMVER_LT, new SemanticVersionLTMatch());
         register(LEGACY, new DefaultMatchForLegacyAttributes());
     }
 

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

@@ -34,6 +34,16 @@ public SemanticVersion(String version) {
         this.version = version;
     }
 
+    public static int compare(Object o1, Object o2) throws Exception {
+        if (o1 instanceof String && o2 instanceof String) {
+            SemanticVersion v1 = new SemanticVersion((String) o1);
+            SemanticVersion v2 = new SemanticVersion((String) o2);
+            return v1.compare(v2);
+        }
+
+        throw new UnexpectedValueTypeException();
+    }
+
     public int compare(SemanticVersion targetedVersion) throws Exception {
 
         if (targetedVersion == null || stringIsNullOrEmpty(targetedVersion.version)) {

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

@@ -19,23 +19,12 @@
 import javax.annotation.Nullable;
 
 class SemanticVersionEqualsMatch implements Match {
-    String value;
-
-    protected SemanticVersionEqualsMatch(String value) {
-        this.value = value;
-    }
-
     @Nullable
-    public Boolean eval(Object attributeValue) {
+    public Boolean eval(Object conditionValue, Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
-                SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
-                return userSemanticVersion.compare(conditionalVersion) == 0;
-            }
+            return SemanticVersion.compare(attributeValue, conditionValue) == 0;
         } catch (Exception e) {
             return null;
         }
-        return null;
     }
 }

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

@@ -19,23 +19,12 @@
 import javax.annotation.Nullable;
 
 class SemanticVersionGEMatch implements Match {
-    String value;
-
-    protected SemanticVersionGEMatch(String value) {
-        this.value = value;
-    }
-
     @Nullable
-    public Boolean eval(Object attributeValue) {
+    public Boolean eval(Object conditionValue, Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
-                SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
-                return userSemanticVersion.compare(conditionalVersion) >= 0;
-            }
+            return SemanticVersion.compare(attributeValue, conditionValue) >= 0;
         } catch (Exception e) {
             return null;
         }
-        return null;
     }
 }

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

@@ -19,23 +19,12 @@
 import javax.annotation.Nullable;
 
 class SemanticVersionGTMatch implements Match {
-    String value;
-
-    protected SemanticVersionGTMatch(String target) {
-        this.value = target;
-    }
-
     @Nullable
-    public Boolean eval(Object attributeValue) {
+    public Boolean eval(Object conditionValue, Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
-                SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
-                return userSemanticVersion.compare(conditionalVersion) > 0;
-            }
+            return SemanticVersion.compare(attributeValue, conditionValue) > 0;
         } catch (Exception e) {
             return null;
         }
-        return null;
     }
 }

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

@@ -19,23 +19,12 @@
 import javax.annotation.Nullable;
 
 class SemanticVersionLEMatch implements Match {
-    String value;
-
-    protected SemanticVersionLEMatch(String target) {
-        this.value = target;
-    }
-
     @Nullable
-    public Boolean eval(Object attributeValue) {
+    public Boolean eval(Object conditionValue, Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
-                SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
-                return userSemanticVersion.compare(conditionalVersion) <= 0;
-            }
+            return SemanticVersion.compare(attributeValue, conditionValue) <= 0;
         } catch (Exception e) {
             return null;
         }
-        return null;
     }
 }

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

@@ -19,23 +19,12 @@
 import javax.annotation.Nullable;
 
 class SemanticVersionLTMatch implements Match {
-    String value;
-
-    protected SemanticVersionLTMatch(String target) {
-        this.value = target;
-    }
-
     @Nullable
-    public Boolean eval(Object attributeValue) {
+    public Boolean eval(Object conditionValue, Object attributeValue) {
         try {
-            if (this.value != null && attributeValue instanceof String) {
-                SemanticVersion conditionalVersion = new SemanticVersion(value);
-                SemanticVersion userSemanticVersion = new SemanticVersion((String) attributeValue);
-                return userSemanticVersion.compare(conditionalVersion) < 0;
-            }
+            return SemanticVersion.compare(attributeValue, conditionValue) < 0;
         } catch (Exception e) {
             return null;
         }
-        return null;
     }
 }