[incubator-nlpcraft] branch NLPCRAFT-204 updated: Fix for NLPCRAFT-204.

[aradzinski]

This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch NLPCRAFT-204
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/NLPCRAFT-204 by this push:
     new 5ac8d1b  Fix for NLPCRAFT-204.
5ac8d1b is described below

commit 5ac8d1bff7b0dcdd1399992513c69b8ad34a8850
Author: Aaron Radzinski <aradzin...@datalingvo.com>
AuthorDate: Mon Dec 21 12:48:56 2020 -0800

    Fix for NLPCRAFT-204.
---
 .../model/intent/utils/NCDslTokenPredicate.java      | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslTokenPredicate.java
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslTokenPredicate.java
index c717833..99270a1 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslTokenPredicate.java
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslTokenPredicate.java
@@ -54,13 +54,13 @@ public class NCDslTokenPredicate implements 
Function<NCToken, Boolean> {
         "endidx"
     );
 
-    private List<String> parts;
-    private String param;
-    private String paramFunc;
-    private String op;
-    private Object value;
-    private String valueStr;
-    private Function<NCToken, NCToken> qualFunc;
+    private final List<String> parts;
+    private final String param;
+    private final String paramFunc;
+    private final String op;
+    private final Object value;
+    private final String valueStr;
+    private final Function<NCToken, NCToken> qualFunc;
 
     private boolean validated = false;
 
@@ -93,8 +93,6 @@ public class NCDslTokenPredicate implements Function<NCToken, 
Boolean> {
         this.param = param;
         this.op = op;
 
-        valueStr = null;
-
         if (value == null)
             valueStr = "null";
         else if (value instanceof Collection)
@@ -401,11 +399,11 @@ public class NCDslTokenPredicate implements 
Function<NCToken, Boolean> {
                         }
                     }
                     else if (obj instanceof Map)
-                        lval = ((Map<String, Object>)obj).get(strIdx);
+                        lval = ((Map<String, 
Object>)obj).get(stripQuotes(strIdx));
                     else
                         throw new IllegalArgumentException(String.format(
                             "Invalid token predicate DSL meta parameter value 
" +
-                                "for indexed access (java.util.List or 
java.util.Map only): %s %s %s",
+                            "for indexed access (java.util.List or 
java.util.Map only): %s %s %s",
                             param, op, valueStr));
                 }
             }