Skip to content

Commit 4491a78

Browse files
authored
Merge pull request #40 from sidhant92/array_math_functions
Bug Fix
2 parents 4cae722 + bd14aff commit 4491a78

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.List;
44
import java.util.Map;
5+
import java.util.Optional;
56
import java.util.stream.Collectors;
67
import com.github.sidhant92.boolparser.constant.ContainerDataType;
78
import com.github.sidhant92.boolparser.constant.DataType;
@@ -62,10 +63,11 @@ private Object evaluateToken(final Node node, final Map<String, Object> data) {
6263
}
6364

6465
private Object evaluateFieldToken(final FieldNode fieldNode, final Map<String, Object> data) {
65-
if (!data.containsKey(fieldNode.getField())) {
66+
final Optional<Object> value = ValueUtils.getValueFromMap(fieldNode.getField(), data);
67+
if (!value.isPresent()) {
6668
throw new DataNotFoundException(fieldNode.getField());
6769
}
68-
return data.get(fieldNode.getField());
70+
return value.get();
6971
}
7072

7173
private Object evaluateUnaryToken(final UnaryNode unaryNode, final Map<String, Object> data) {

0 commit comments

Comments
 (0)