change syntax for strings and variables

Author: sidhant92

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

@@ -7,10 +7,12 @@
 import com.github.sidhant92.boolparser.constant.DataType;
 import com.github.sidhant92.boolparser.constant.Operator;
 import com.github.sidhant92.boolparser.domain.EvaluatedNode;
+import com.github.sidhant92.boolparser.domain.FieldNode;
 import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode;
 import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode;
 import com.github.sidhant92.boolparser.domain.logical.Node;
 import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode;
+import com.github.sidhant92.boolparser.exception.DataNotFoundException;
 import com.github.sidhant92.boolparser.exception.UnsupportedToken;
 import com.github.sidhant92.boolparser.function.FunctionEvaluatorService;
 import com.github.sidhant92.boolparser.operator.OperatorService;
@@ -54,15 +56,23 @@ private Object evaluateToken(final Node node, final Map<String, Object> data) {
                 return evaluateArithmeticFunctionToken((ArithmeticFunctionNode) node, data);
             case UNARY:
                 return evaluateUnaryToken((UnaryNode) node, data);
+            case FIELD:
+                return evaluateFieldToken((FieldNode) node, data);
             default:
                 log.error("unsupported token {}", node.getTokenType());
                 throw new UnsupportedToken();
         }
     }
 
+    private Object evaluateFieldToken(final FieldNode fieldNode, final Map<String, Object> data) {
+        if (!data.containsKey(fieldNode.getField())) {
+            throw new DataNotFoundException();
+        }
+        return data.get(fieldNode.getField());
+    }
+
     private Object evaluateUnaryToken(final UnaryNode unaryNode, final Map<String, Object> data) {
-        return unaryNode.getDataType() == DataType.STRING ? ValueUtils.getValueFromMap(unaryNode.getValue().toString(), data)
-                                                                      .orElse(unaryNode.getValue()) : unaryNode.getValue();
+        return unaryNode.getValue();
     }
 
     private Object evaluateArithmeticFunctionToken(final ArithmeticFunctionNode arithmeticFunctionNode, final Map<String, Object> data) {

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

@@ -73,7 +73,7 @@ private boolean evaluateToken(final Node node, final Map<String, Object> data) {
     private boolean evaluateComparisonToken(final ComparisonNode comparisonToken, final Map<String, Object> data) {
         final Object fieldData = ValueUtils.getValueFromMap(comparisonToken.getField(), data).orElseThrow(DataNotFoundException::new);
         final Object value = comparisonToken.getValue() instanceof ArithmeticBaseNode ? arithmeticExpressionEvaluator.evaluate(
-                (Node) comparisonToken.getValue(), data) : comparisonToken.getValue();
+                comparisonToken.getValue(), data) : comparisonToken.getValue();
         return operatorService.evaluateLogicalOperator(comparisonToken.getOperator(), ContainerDataType.PRIMITIVE, comparisonToken.getDataType(),
                                                        fieldData, value);
     }

src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java

@@ -11,6 +11,7 @@ public enum NodeType {
     IN,
     ARRAY,
     UNARY,
+    FIELD,
     ARITHMETIC,
     ARITHMETIC_FUNCTION
 }

src/main/java/com/github/sidhant92/boolparser/domain/FieldNode.java

@@ -0,0 +1,21 @@
+package com.github.sidhant92.boolparser.domain;
+
+import com.github.sidhant92.boolparser.constant.NodeType;
+import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticBaseNode;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@AllArgsConstructor
+@Getter
+@Setter
+@Builder
+public class FieldNode extends ArithmeticBaseNode {
+    private final String field;
+
+    @Override
+    public NodeType getTokenType() {
+        return NodeType.FIELD;
+    }
+}

src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java

@@ -19,7 +19,7 @@
 public class ComparisonNode extends Node {
     private final String field;
 
-    private final Object value;
+    private final Node value;
 
     private final Operator operator;
 

src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java

@@ -1,4 +1,4 @@
-package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter1/BooleanExpression.g4 by ANTLR 4.13.1
+package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter2/BooleanExpression.g4 by ANTLR 4.13.1
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;

src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionLexer.java

@@ -1,4 +1,4 @@
-package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter1/BooleanExpression.g4 by ANTLR 4.13.1
+package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter2/BooleanExpression.g4 by ANTLR 4.13.1
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
 /**