Merge pull request #26 from sidhant92/nested_fields_n

Support nesting upto n Levels

Author: sidhant92

src/main/java/com/github/sidhant92/boolparser/util/ValueUtils.java

@@ -1,7 +1,9 @@
 package com.github.sidhant92.boolparser.util;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import com.github.sidhant92.boolparser.constant.DataType;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +19,10 @@ public static Optional<Object> getValueFromMap(final String key, final Map<Strin
         }
         if (fieldData.isPresent() && fieldData.get() instanceof Map) {
             try {
-                return getValueFromMap(keys[1], (Map<String, Object>) fieldData.get());
+                final String newKey = Arrays
+                        .stream(keys).skip(1)
+                        .collect(Collectors.joining("."));
+                return getValueFromMap(newKey, (Map<String, Object>) fieldData.get());
             } catch (ClassCastException ex) {
                 return Optional.empty();
             }
@@ -40,10 +45,10 @@ public static Object convertValue(final String value, final DataType dataType) {
                 new ComparableVersion(value);
             default:
                 if (value.startsWith("'") && value.endsWith("'")) {
-                    return value.substring(1, value.length() -1);
+                    return value.substring(1, value.length() - 1);
                 }
                 if (value.startsWith("\"") && value.endsWith("\"")) {
-                    return value.substring(1, value.length() -1);
+                    return value.substring(1, value.length() - 1);
                 }
                 return value;
         }

src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java

@@ -123,6 +123,19 @@ public void testNestedField() {
         assertTrue(booleanOptional.get());
     }
 
+    @Test
+    public void testTwoNestedField() {
+        final Map<String, Object> data = new HashMap<>();
+        final Map<String, Object> person = new HashMap<>();
+        final Map<String, Object> details = new HashMap<>();
+        details.put("age", 24);
+        person.put("details", details);
+        data.put("person", person);
+        final Try<Boolean> booleanOptional = booleanExpressionEvaluator.evaluate("person.details.age > 20", data);
+        assertTrue(booleanOptional.isSuccess());
+        assertTrue(booleanOptional.get());
+    }
+
     @Test
     public void testMissingNestedField() {
         final Map<String, Object> data = new HashMap<>();