[incubator-nlpcraft] branch NLPCRAFT-471 updated: WIP.

[sergeykamov]

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

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


The following commit(s) were added to refs/heads/NLPCRAFT-471 by this push:
     new 4528520  WIP.
4528520 is described below

commit 45285207a4cbd4358377964a7b7dee49f0e54eec
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Tue Dec 28 17:56:04 2021 +0300

    WIP.
---
 .../opennlp/impl/NCOpenNlpEntityParserImpl.scala   | 29 +++++++++++-----------
 .../apache/nlpcraft/internal/util/NCUtils.scala    |  2 ++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/entity/parser/opennlp/impl/NCOpenNlpEntityParserImpl.scala
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/entity/parser/opennlp/impl/NCOpenNlpEntityParserImpl.scala
index b763a98..95e5ecb 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/entity/parser/opennlp/impl/NCOpenNlpEntityParserImpl.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/entity/parser/opennlp/impl/NCOpenNlpEntityParserImpl.scala
@@ -28,6 +28,7 @@ import java.util
 import java.util.{Optional, List as JList, Map as JMap}
 import scala.concurrent.ExecutionContext
 import scala.jdk.CollectionConverters.*
+import scala.language.postfixOps
 import scala.util.Using
 import scala.util.control.Exception.catching
 
@@ -70,19 +71,17 @@ class NCOpenNlpEntityParserImpl(is: InputStream, res: 
String) extends NCEntityPa
             val i1 = calcIndex(_.start)
             lazy val i2 = calcIndex(_.end)
 
-            if i1 != -1 && i2 != -1 then
-                Some(
-                    new NCPropertyMapAdapter with NCEntity {
-                        put(s"opennlp:${h.name}:probability", h.probability)
-
-                        override def getTokens: JList[NCToken] =
-                            toksIdxs.flatMap { case (t, idx) => if idx >= i1 
&& idx <= i2 then Some(t) else None }.asJava
-                        override def getRequestId: String = req.getRequestId
-                        override def getId: String = s"opennlp:${h.name}"
-                        override def getIndex: Int = 0 // TODO:
-                        override def getGuid: String = 
NCUtils.genUUID().toString
-                    }
-                )
-            else
-                None
+            NCUtils.getOpt(
+                i1 != -1 && i2 != -1,
+                new NCPropertyMapAdapter with NCEntity {
+                    put(s"opennlp:${h.name}:probability", h.probability)
+    
+                    override def getTokens: JList[NCToken] =
+                        toksIdxs.flatMap { case (t, idx) => if idx >= i1 && 
idx <= i2 then Some(t) else None }.asJava
+                    override def getRequestId: String = req.getRequestId
+                    override def getId: String = s"opennlp:${h.name}"
+                    override def getIndex: Int = 0 // TODO:
+                    override def getGuid: String = NCUtils.genUUID().toString
+                }            
+            )   
         ).toSeq.asJava
\ No newline at end of file
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
index 77bb9d7..63b9985 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
@@ -933,6 +933,8 @@ object NCUtils extends LazyLogging:
       * @return
       */
     def genUUID(): UUID = UUID.randomUUID()
+    
+    def getOpt[T](cond: Boolean, make: => T): Option[T] = if (cond) Some(make) 
else None
 
     /**
       * Gets all sequential permutations of tokens in this NLP sentence.