numeric first

Eppo-exp · Feb 26, 2024 · 28b9a3e · 28b9a3e
1 parent f748393
commit 28b9a3e
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/src/main/java/com/eppo/sdk/helpers/RuleValidator.java b/src/main/java/com/eppo/sdk/helpers/RuleValidator.java
@@ -25,18 +25,6 @@ interface IConditionFunc<T> {
  * Compare Class
  */
 class Compare {
-    /**
-     * This function is used to compare number
-     *
-     * @param a
-     * @param b
-     * @param conditionFunc
-     * @return
-     */
-    public static boolean compareNumber(double a, double b, IConditionFunc<Double> conditionFunc) {
-        return conditionFunc.check(a, b);
-    }
-
     /**
      * This function is used to compare Regex
      *
@@ -120,33 +108,45 @@ private static boolean evaluateCondition(
             try {
                 switch (condition.operator) {
                     case GTE:
+                        if (value.isNumeric() && condition.value.isNumeric()) {
+                            return value.doubleValue() >= condition.value.doubleValue();
+                        }
+
                         if (valueSemVer.isPresent() && conditionSemVer.isPresent()) {
                             return valueSemVer.get().isHigherThanOrEquivalentTo(conditionSemVer.get());
                         }
 
-                        return Compare.compareNumber(value.doubleValue(), condition.value.doubleValue(),
-                                (a, b) -> a >= b);
+                        return false;
                     case GT:
+                        if (value.isNumeric() && condition.value.isNumeric()) {
+                            return value.doubleValue() > condition.value.doubleValue();
+                        }
+
                         if (valueSemVer.isPresent() && conditionSemVer.isPresent()) {
                             return valueSemVer.get().isHigherThan(conditionSemVer.get());
                         }
 
-                        return Compare.compareNumber(value.doubleValue(), condition.value.doubleValue(),
-                                (a, b) -> a > b);
+                        return false;
                     case LTE:
+                        if (value.isNumeric() && condition.value.isNumeric()) {
+                            return value.doubleValue() <= condition.value.doubleValue();
+                        }
+
                         if (valueSemVer.isPresent() && conditionSemVer.isPresent()) {
                             return valueSemVer.get().isLowerThanOrEquivalentTo(conditionSemVer.get());
                         }
 
-                        return Compare.compareNumber(value.doubleValue(), condition.value.doubleValue(),
-                                (a, b) -> a <= b);
+                        return false;
                     case LT:
+                        if (value.isNumeric() && condition.value.isNumeric()) {
+                            return value.doubleValue() < condition.value.doubleValue();
+                        }
+
                         if (valueSemVer.isPresent() && conditionSemVer.isPresent()) {
                             return valueSemVer.get().isLowerThan(conditionSemVer.get());
                         }
 
-                        return Compare.compareNumber(value.doubleValue(), condition.value.doubleValue(),
-                                (a, b) -> a < b);
+                        return false;
                     case MATCHES:
                         return Compare.compareRegex(value.stringValue(),
                                 Pattern.compile(condition.value.stringValue()));