Changed matching logic with regard to missing/null keys. (#12)

Previously, if a INPUT cell was a blank value, it would only match to
blank value input.  For regular input values this was not an issue
since if you didn't supply an input it was defaulted to blank.  However
intermediate values during the staging process were not handled the
same way.  If the input was not in the context, it would not match.
Now it will match since keys not in the context are handled exactly
the same as blank.

(cherry picked from commit b31c2f9)

Author: ctmay4

build.gradle

@@ -26,7 +26,7 @@ dependencies {
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.4'
 
     // morphia annotations are needed to make it easier to use in SEER*API
-    compile 'org.mongodb.morphia:morphia:0.108'
+    compile 'org.mongodb.morphia:morphia:1.0.1'
 
     compile 'com.google.guava:guava:18.0'
 

src/main/java/com/imsweb/staging/entities/StagingStringRange.java

@@ -67,12 +67,16 @@ public boolean contains(String value, Map<String, String> context) {
         if (matchesAll())
             return true;
 
+        // make null values match the same as if they were blank
+        if (value == null)
+            value = "";
+
         // translate the context values if they are there
         String low = DecisionEngine.translateValue(_low, context);
         String high = DecisionEngine.translateValue(_high, context);
 
         // if the context value(s) failed or the low and high values are different length, return false
-        if (value == null || low.length() != high.length() || low.length() != value.length())
+        if (low.length() != high.length() || low.length() != value.length())
             return false;
 
         // compare value to low and high

src/test/java/com/imsweb/decisionengine/DecisionEngineTest.java

@@ -355,6 +355,52 @@ public void testMatchTable() throws IOException {
         Assert.assertNull(DecisionEngine.matchTable(matchTable, input));
     }
 
+    @Test
+    public void testMatchTableWithBlankOrMissingInput() throws IOException {
+        BasicDataProvider provider = new BasicDataProvider();
+        BasicTable table = new BasicTable("basic_test_table");
+        table.addColumnDefinition("size", ColumnType.INPUT);
+        table.addColumnDefinition("description", ColumnType.DESCRIPTION);
+        table.addColumnDefinition("result", ColumnType.ENDPOINT);
+        table.addRawRow("", "BLANK", "MATCH");
+        table.addRawRow("1", "ONE", "MATCH");
+        table.addRawRow("2", "TWO", "MATCH");
+        provider.addTable(table);
+
+        Table matchTable = provider.getTable("basic_test_table");
+        Assert.assertNotNull(matchTable);
+
+        // create context of input fields
+        Map<String, String> input = new HashMap<String, String>();
+
+        // first try it with missing input (null should match just like blank))
+        Assert.assertNotNull(DecisionEngine.matchTable(matchTable, input));
+
+        // now add blank input
+        input.put("size", "");
+        Assert.assertNotNull(DecisionEngine.matchTable(matchTable, input));
+
+        // test matching on multiple mising values
+        table = new BasicTable("basic_test_table_multi");
+        table.addColumnDefinition("a", ColumnType.INPUT);
+        table.addColumnDefinition("b", ColumnType.INPUT);
+        table.addColumnDefinition("c", ColumnType.INPUT);
+        table.addColumnDefinition("d", ColumnType.INPUT);
+        table.addColumnDefinition("e", ColumnType.INPUT);
+        table.addRawRow("1", "", "", "", "");
+        table.addRawRow("2", "", "", "", "");
+        provider.addTable(table);
+
+        matchTable = provider.getTable("basic_test_table_multi");
+        Assert.assertNotNull(matchTable);
+
+        // first try it with missing input (null should match just like blank))
+        Assert.assertNull(DecisionEngine.matchTable(matchTable, new HashMap<String, String>()));
+
+        input.put("a", "2");
+        Assert.assertNotNull(DecisionEngine.matchTable(matchTable, input));
+    }
+
     @Test
     public void testMatchOnSpecificKeys() {
         BasicDataProvider provider = new BasicDataProvider();

src/test/java/com/imsweb/decisionengine/basic/BasicStringRange.java

@@ -23,8 +23,8 @@ public BasicStringRange() {
 
     /**
      * Construct a BasicStringRange with a low and high bound
-     * @param low
-     * @param high
+     * @param low low value
+     * @param high high value
      */
     public BasicStringRange(String low, String high) {
         if (low == null || high == null)
@@ -50,17 +50,21 @@ public String getHigh() {
 
     /**
      * If low and high are both null, then this range matches all strings
-     * @return
+     * @return true if range matches anything
      */
     private boolean matchesAll() {
         return _low == null && _high == null;
     }
 
     @Override
     public boolean contains(String value, Map<String, String> context) {
+        // make null values match the same as if they were blank
+        if (value == null)
+            value = "";
+
         if (_usesContext)
-            return (matchesAll() || (value != null && DecisionEngine.translateValue(_low, context).compareTo(value) <= 0 && DecisionEngine.translateValue(_high, context).compareTo(value) >= 0));
+            return (matchesAll() || (DecisionEngine.translateValue(_low, context).compareTo(value) <= 0 && DecisionEngine.translateValue(_high, context).compareTo(value) >= 0));
         else
-            return (matchesAll() || (value != null && _low.compareTo(value) <= 0 && _high.compareTo(value) >= 0));
+            return (matchesAll() || (_low.compareTo(value) <= 0 && _high.compareTo(value) >= 0));
     }
 }