[incubator-nlpcraft] branch NLPCRAFT-491 updated: Minor fixes.

[sergeykamov]

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

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


The following commit(s) were added to refs/heads/NLPCRAFT-491 by this push:
     new c453277c Minor fixes.
c453277c is described below

commit c453277c9184ef9da9c6cbdac45de04e30d334af
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Mon May 9 14:01:19 2022 +0300

    Minor fixes.
---
 .../org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala  | 10 +++++-----
 .../examples/pizzeria/components/PizzeriaOrderExtender.scala   |  4 ++--
 .../examples/pizzeria/components/PizzeriaOrderValidator.scala  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
 
b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
index d1409a4d..5369f1fe 100644
--- 
a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
+++ 
b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
@@ -45,14 +45,14 @@ object PizzeriaModel extends LazyLogging:
     private def getOrder(ctx: NCContext): Order =
         val data = ctx.getConversation.getData
         val usrId = ctx.getRequest.getUserId
-        val o: Order = data.get(usrId)
+        var o: Order = data.get(usrId)
 
-        if o != null then o
-        else
-            val o = new Order()
+        if o == null then
+            o = new Order()
             data.put(usrId, o)
 
-            o
+        o
+
     private def mkResult(msg: String): NCResult = NCResult(msg, ASK_RESULT)
     private def mkDialog(msg: String): NCResult = NCResult(msg, ASK_DIALOG)
 
diff --git 
a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderExtender.scala
 
b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderExtender.scala
index b2075cde..38652c91 100644
--- 
a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderExtender.scala
+++ 
b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderExtender.scala
@@ -88,9 +88,9 @@ case class PizzeriaOrderExtender(mainDataSeq: 
Seq[EntityData], extraData: Entity
 
             val res = (unrelated ++ artificial ++ 
unused).sortBy(_.tokens.head.getIndex)
 
-            def str(es: mutable.Buffer[NCEntity]) =
+            def s(es: Iterable[NCEntity]) =
                 es.map(e => 
s"id=${e.getId}(${e.tokens.map(_.getIndex).mkString("[", ",", 
"]")})").mkString("{", ", ", "}")
-            logger.debug(s"Elements mapped [input=${str(es)}, 
output=${str(res)}]")
+            logger.debug(s"Elements mapped [input=${s(es)}, output=${s(res)}]")
 
             res.asJava
         else entities
\ No newline at end of file
diff --git 
a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
 
b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
index 43d50e40..1d193cb2 100644
--- 
a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
+++ 
b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
@@ -39,6 +39,6 @@ class PizzeriaOrderValidator extends NCEntityValidator:
         // Single size  - it is order specification request.
         if cntSize != 1 && cntSize > cntPizza then
             throw new NCRejection("There are unrecognized pizza sizes in the 
request, maybe because some misprints.")
-
+            
         if cntNums > cntPizza + cntDrink then
             throw new NCRejection("There are many unrecognized numerics in the 
request, maybe because some misprints.")
\ No newline at end of file