FieldNotFoundException throws when rule field doesnot exist in data map

Author: ibrahimaltinoluk

src/main/java/com/jquerybuilder/exception/FieldNotFoundException.java

@@ -0,0 +1,11 @@
+package com.jquerybuilder.exception;
+
+public class FieldNotFoundException extends Exception {
+  public FieldNotFoundException(String detail) {
+    super(detail);
+  }
+
+  public FieldNotFoundException(String detail, Throwable cause) {
+    super(detail, cause);
+  }
+}

src/main/java/com/jquerybuilder/validation/ValidationGroup.java

@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.jquerybuilder.exception.FieldNotFoundException;
+
 public class ValidationGroup {
 
   public enum Condition {
@@ -41,7 +43,7 @@ private void build(Map map) {
     }
   }
 
-  public boolean execute(Map data) {
+  public boolean execute(Map data) throws FieldNotFoundException {
 
     Boolean result = null;
 
@@ -55,18 +57,17 @@ public boolean execute(Map data) {
         result |= ruleResult;
       }
     }
+
     for (ValidationGroup validationGroup : validationGroups) {
       boolean ruleResult = validationGroup.execute(data);
       if (result == null) {
         result = ruleResult;
-      if (Condition.AND.equals(condition)) {
+      } else if (Condition.AND.equals(condition)) {
         result &= ruleResult;
       } else {
         result |= ruleResult;
       }
     }
-
     return not ? !result : result;
   }
-
 }

src/main/java/com/jquerybuilder/validation/ValidationRule.java

@@ -2,6 +2,8 @@
 
 import java.util.Map;
 
+import com.jquerybuilder.exception.FieldNotFoundException;
+
 public class ValidationRule {
   private String id;
   private String field;
@@ -21,9 +23,9 @@ public void build(Map<String, String> map) {
     setValue(map.get("value"));
   }
 
-  public boolean execute(Map data) {
+  public boolean execute(Map data) throws FieldNotFoundException {
     if (!data.containsKey(field)) {
-      return false;
+     throw new FieldNotFoundException("(field:"+field + ") not found in map");
     }
     String rawDataValue = data.get(field).toString();
     return Operation.apply(operator, rawDataValue, value);

src/test/java/com/jquerybuilder/test/FieldNotFoundExceptionTest.java

@@ -0,0 +1,29 @@
+package com.jquerybuilder.test;
+
+import java.util.Map;
+
+import com.jquerybuilder.exception.FieldNotFoundException;
+import com.jquerybuilder.validation.ValidationGroup;
+
+public class FieldNotFoundExceptionTest extends BaseTest {
+
+  public FieldNotFoundExceptionTest() {
+    data1.put("foo", "bar");
+  }
+
+  public void testInOperation() {
+    Map map = gson.fromJson(readFile("input/operation/in.json"), Map.class);
+    ValidationGroup validationGroup = new ValidationGroup(map);
+
+    Exception exception = null;
+    try {
+      validationGroup.execute(data1);
+    } catch (Exception e) {
+      exception = e;
+    }
+    assertNotNull(exception);
+    assertTrue(exception instanceof FieldNotFoundException);
+    assertEquals("(field:number) not found in map", exception.getMessage());
+  }
+
+}

src/test/java/com/jquerybuilder/test/OperationTest.java

@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import com.jquerybuilder.exception.FieldNotFoundException;
 import com.jquerybuilder.validation.ValidationGroup;
 
 public class OperationTest extends BaseTest {
@@ -24,7 +25,7 @@ public OperationTest() {
 
   }
 
-  public void testInOperation() {
+  public void testInOperation() throws FieldNotFoundException {
     Map map = gson.fromJson(readFile("input/operation/in.json"), Map.class);
     ValidationGroup validationGroup = new ValidationGroup(map);
 
@@ -35,7 +36,7 @@ public void testInOperation() {
 
   }
 
-  public void testLessOperation() {
+  public void testLessOperation() throws FieldNotFoundException {
     Map map = gson.fromJson(readFile("input/operation/less.json"), Map.class);
     ValidationGroup validationGroup = new ValidationGroup(map);
 
@@ -44,7 +45,7 @@ public void testLessOperation() {
 
   }
 
-  public void testBetweenOperation() {
+  public void testBetweenOperation() throws FieldNotFoundException {
     Map map = gson.fromJson(readFile("input/operation/between.json"), Map.class);
     ValidationGroup conditionGroup = new ValidationGroup(map);
 

src/test/java/com/jquerybuilder/test/ValidationTest.java

@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import com.jquerybuilder.exception.FieldNotFoundException;
 import com.jquerybuilder.validation.ValidationGroup;
 
 public class ValidationTest extends BaseTest {
@@ -33,7 +34,7 @@ public ValidationTest() {
     data10.put("username", "gürsel");
   }
 
-  public void testAgeValidation() {
+  public void testAgeValidation() throws FieldNotFoundException {
     Map map = gson.fromJson(readFile("input/age_validation.json"), Map.class);
     ValidationGroup validationGroup = new ValidationGroup(map);
 
@@ -42,7 +43,7 @@ public void testAgeValidation() {
     assertFalse(validationGroup.execute(data3));
   }
 
-  public void testAgeValidationNot() {
+  public void testAgeValidationNot() throws FieldNotFoundException {
     Map map = gson.fromJson(readFile("input/age_validation_not.json"), Map.class);
 
     ValidationGroup validationGroup = new ValidationGroup(map);
@@ -52,29 +53,27 @@ public void testAgeValidationNot() {
 
   }
 
-  public void testHobbyValidation() {
+  public void testHobbyValidation() throws FieldNotFoundException {
     Map map = gson.fromJson(readFile("input/hobby_validation.json"), Map.class);
 
     ValidationGroup validationGroup = new ValidationGroup(map);
 
-    assertFalse(validationGroup.execute(data1));
     assertTrue(validationGroup.execute(data2));
     assertFalse(validationGroup.execute(data3));
     assertTrue(validationGroup.execute(data4));
   }
 
-  public void testHobbyValidationNot() {
+  public void testHobbyValidationNot() throws FieldNotFoundException {
     Map map = gson.fromJson(readFile("input/hobby_validation_not.json"), Map.class);
 
     ValidationGroup validationGroup = new ValidationGroup(map);
 
-    assertFalse(validationGroup.execute(data1));
     assertFalse(validationGroup.execute(data2));
     assertTrue(validationGroup.execute(data3));
     assertFalse(validationGroup.execute(data4));
   }
 
-  public void testNumberValidation() {
+  public void testNumberValidation() throws FieldNotFoundException {
     Map map = gson.fromJson(readFile("input/validation3.json"), Map.class);
 
     ValidationGroup validationGroup = new ValidationGroup(map);