Merge pull request #26 from telekom/feature/include-operator-details-…

…in-valid-evaluation-result Include operator details in valid evaluation result
telekom · May 10, 2024 · 745cdf5 · 745cdf5
2 parents 1f6a1b2 + daae3d4
commit 745cdf5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/src/main/java/de/telekom/jsonfilter/operator/EvaluationResult.java b/src/main/java/de/telekom/jsonfilter/operator/EvaluationResult.java
@@ -66,7 +66,7 @@ public static EvaluationResult empty() {
      * @return EvaluationResult the created evaluation result, which is valid by default.
      */
     public static EvaluationResult valid(Operator op) {
-        return new EvaluationResult(true, op.getOperator().getValue(), null, "", Collections.emptyList());
+        return new EvaluationResult(true, op.getOperator().getValue(), op, "", Collections.emptyList());
     }
 
     /**
@@ -78,19 +78,19 @@ public static EvaluationResult valid(Operator op) {
      * @return EvaluationResult the created evaluation result, which is valid by default.
      */
     public static EvaluationResult valid(Operator op, List<EvaluationResult> evaluationResults) {
-        return new EvaluationResult(true, op.getOperator().getValue(), null, "", evaluationResults);
+        return new EvaluationResult(true, op.getOperator().getValue(), op, "", evaluationResults);
     }
 
     /**
      * Creates an EvaluationResult instance indicating an error in the evaluation process.
      *
-     * @param rootCause the operator that caused the error.
+     * @param op the operator that caused the error.
      * @param causeDescription the description of the error.
      *
      * @return EvaluationResult the created evaluation result, which is not valid by default.
      */
-    public static EvaluationResult withError(Operator rootCause, String causeDescription) {
-        return new EvaluationResult(false, rootCause.getOperator().getValue(), rootCause, causeDescription, new ArrayList<>());
+    public static EvaluationResult withError(Operator op, String causeDescription) {
+        return new EvaluationResult(false, op.getOperator().getValue(), op, causeDescription, new ArrayList<>());
     }
 
 

diff --git a/src/main/java/de/telekom/jsonfilter/operator/comparison/ComparisonOperator.java b/src/main/java/de/telekom/jsonfilter/operator/comparison/ComparisonOperator.java
@@ -43,7 +43,6 @@ public static <T> Operator instantiate(ComparisonOperatorEnum operator, String j
             case IN -> new InOperator<>(jsonPath, (List<?>) expectedValue);
             case CT -> new ContainsOperator<>(jsonPath, expectedValue);
             case NCT -> new NotContainsOperator<>(jsonPath, expectedValue);
-            default -> null;
         };
     }
 

diff --git a/src/main/java/de/telekom/jsonfilter/operator/comparison/ComparisonOperatorEnum.java b/src/main/java/de/telekom/jsonfilter/operator/comparison/ComparisonOperatorEnum.java
@@ -7,6 +7,7 @@
 import de.telekom.jsonfilter.operator.OperatorEnum;
 import lombok.Getter;
 
+@Getter
 public enum ComparisonOperatorEnum implements OperatorEnum {
 
     EQ("equal"),
@@ -18,10 +19,8 @@ public enum ComparisonOperatorEnum implements OperatorEnum {
     GE("greater or equal"),
     IN("in"),
     CT("contains"),
-    EX("exists"),
     NCT("not contains");
 
-    @Getter
     private final String value;
 
     ComparisonOperatorEnum(String value) {

diff --git a/src/main/java/de/telekom/jsonfilter/operator/logic/LogicOperator.java b/src/main/java/de/telekom/jsonfilter/operator/logic/LogicOperator.java
@@ -11,11 +11,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Getter
 public abstract class LogicOperator implements Operator {
-    @Getter
     final LogicOperatorEnum operator;
-
-    @Getter
     List<Operator> operators = new ArrayList<>();
 
     protected LogicOperator(LogicOperatorEnum operator) {
@@ -34,7 +32,6 @@ public static Operator instantiate(LogicOperatorEnum operator, List<Operator> op
         return switch (operator) {
             case AND -> new AndOperator(operatorList);
             case OR -> new OrOperator(operatorList);
-            default -> null;
         };
     }
 }