Change function name for better readability

nedap · Apr 11, 2017 · 8f1a77c · 8f1a77c
1 parent f0be650
commit 8f1a77c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/nedap/archie/rules/evaluation/evaluators/FunctionUtil.java b/src/main/java/com/nedap/archie/rules/evaluation/evaluators/FunctionUtil.java
@@ -22,7 +22,7 @@ public static double castToDouble(Value value) throws FunctionCallException {
         throw new FunctionCallException("cannot cast " + value.getValue().getClass() + " to a number");
     }
 
-    public static int checkLength(List<ValueList> arguments) {
+    public static int checkEqualLength(List<ValueList> arguments) {
         int length = 1;
         boolean first = true;
         for(ValueList list:arguments) {

diff --git a/src/main/java/com/nedap/archie/rules/evaluation/evaluators/ModelReferenceEvaluator.java b/src/main/java/com/nedap/archie/rules/evaluation/evaluators/ModelReferenceEvaluator.java
@@ -27,6 +27,9 @@ public ValueList evaluate(RuleEvaluation evaluation, ModelReference statement) {
         if(variable != null) {
             //resolve variable and add path prefix
             ValueList value = evaluation.getVariableMap().get(variable);
+            if(value == null) {
+                throw new RuntimeException("Variable " + variable + " not defined");
+            }
             if(value.size() > 1) {
                 throw new IllegalStateException("");
             } else if (value.size() == 1) {

diff --git a/src/main/java/com/nedap/archie/rules/evaluation/evaluators/functions/Max.java b/src/main/java/com/nedap/archie/rules/evaluation/evaluators/functions/Max.java
@@ -7,12 +7,11 @@
 import com.nedap.archie.rules.evaluation.ValueList;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import static com.nedap.archie.rules.evaluation.evaluators.FunctionUtil.castToDouble;
 import static com.nedap.archie.rules.evaluation.evaluators.FunctionUtil.checkAndHandleNull;
-import static com.nedap.archie.rules.evaluation.evaluators.FunctionUtil.checkLength;
+import static com.nedap.archie.rules.evaluation.evaluators.FunctionUtil.checkEqualLength;
 
 /**
  * Created by pieter.bos on 07/04/2017.
@@ -32,7 +31,7 @@ public ValueList evaluate(List<ValueList> arguments) throws FunctionCallExceptio
             return possiblyNullResult;
         }
         //check that all valueList are equal length or 1 length
-        int length = checkLength(arguments);
+        int length = checkEqualLength(arguments);
         if(length == -1) {
             throw new FunctionCallException("value lists of min operator not the same length");
         }

diff --git a/src/main/java/com/nedap/archie/rules/evaluation/evaluators/functions/Min.java b/src/main/java/com/nedap/archie/rules/evaluation/evaluators/functions/Min.java
@@ -5,7 +5,6 @@
 import com.nedap.archie.rules.evaluation.FunctionImplementation;
 import com.nedap.archie.rules.evaluation.Value;
 import com.nedap.archie.rules.evaluation.ValueList;
-import com.nedap.archie.rules.evaluation.evaluators.BinaryOperatorEvaluator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,7 +29,7 @@ public ValueList evaluate(List<ValueList> arguments) throws FunctionCallExceptio
             return possiblyNullResult;
         }
         //check that all valueList are equal length or 1 length
-        int length = checkLength(arguments);
+        int length = checkEqualLength(arguments);
         if(length == -1) {
             throw new FunctionCallException("value lists of min operator not the same length");
         }