Merge pull request #40 from sidhant92/array_math_functions

Bug Fix
sidhant92 · Jul 1, 2024 · 4491a78 · 4491a78
2 parents 4cae722 + bd14aff
commit 4491a78
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import com.github.sidhant92.boolparser.constant.ContainerDataType;
 import com.github.sidhant92.boolparser.constant.DataType;
@@ -62,10 +63,11 @@ private Object evaluateToken(final Node node, final Map<String, Object> data) {
     }
 
     private Object evaluateFieldToken(final FieldNode fieldNode, final Map<String, Object> data) {
-        if (!data.containsKey(fieldNode.getField())) {
+        final Optional<Object> value = ValueUtils.getValueFromMap(fieldNode.getField(), data);
+        if (!value.isPresent()) {
             throw new DataNotFoundException(fieldNode.getField());
         }
-        return data.get(fieldNode.getField());
+        return value.get();
     }
 
     private Object evaluateUnaryToken(final UnaryNode unaryNode, final Map<String, Object> data) {