[incubator-nlpcraft] branch NLPCRAFT-100 updated: Refactoring.

[ar...@apache.org]

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

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


The following commit(s) were added to refs/heads/NLPCRAFT-100 by this push:
     new 5d1810e  Refactoring.
5d1810e is described below

commit 5d1810ea2a7968943f9ef529b377326c2067c51f
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Thu Aug 20 09:49:18 2020 -0700

    Refactoring.
---
 .../org/apache/nlpcraft/server/ignite/NCIgniteHelpers.scala      | 5 ++++-
 .../nlpcraft/server/nlp/core/spacy/NCSpaCyNerEnricher.scala      | 9 +++++----
 .../scala/org/apache/nlpcraft/server/rest/NCRestManager.scala    | 8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/ignite/NCIgniteHelpers.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/ignite/NCIgniteHelpers.scala
index bfa55d1..a44427c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/ignite/NCIgniteHelpers.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/ignite/NCIgniteHelpers.scala
@@ -75,7 +75,7 @@ object NCIgniteHelpers extends NCIgniteInstance {
          * Gets an entry from the cache.
          *
          * @param key The key whose associated value is to be returned.
-         * @return Return some value, or none if it does't exist.
+         * @return Return some value, or none if it doesn't exist.
          */
         def apply(key: K): Option[V] =
             ic.get(key) match {
@@ -143,6 +143,9 @@ object NCIgniteHelpers extends NCIgniteInstance {
             assert(clause != null)
             assert(args != null)
 
+            // TODO: deprecated to what & how?
+            // TODO: Ignite is missing instructions on this migration.
+            // TODO: Perhaps - https://stackoverflow.com/questions/41309941/sqlquery-and-sqlfieldsquery
             val qry = new SqlQuery[K, V](cls, clause)
 
             if (args != null && args.nonEmpty)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/spacy/NCSpaCyNerEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/spacy/NCSpaCyNerEnricher.scala
index 740e095..5a6eb5d 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/spacy/NCSpaCyNerEnricher.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/spacy/NCSpaCyNerEnricher.scala
@@ -27,7 +27,7 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
 import akka.http.scaladsl.model.StatusCodes.OK
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.stream.ActorMaterializer
+import akka.stream.Materializer
 import io.opencensus.trace.Span
 import org.apache.nlpcraft.common.config.NCConfigurable
 import org.apache.nlpcraft.common.nlp.{NCNlpSentence, NCNlpSentenceNote}
@@ -46,9 +46,10 @@ import scala.concurrent.{Await, Awaitable, ExecutionContextExecutor, TimeoutExce
 object NCSpaCyNerEnricher extends NCService with NCNlpNerEnricher with NCIgniteInstance {
     private final val TIMEOUT_SECS: Int = 5
 
-    private implicit val actSys: ActorSystem = ActorSystem()
-    private implicit val materializer: ActorMaterializer = ActorMaterializer()
-    private implicit val execCtx: ExecutionContextExecutor = actSys.dispatcher
+    private implicit final val SYSTEM: ActorSystem = ActorSystem("spacy-ner")
+    private implicit final val MATERIALIZER: Materializer = Materializer.createMaterializer(SYSTEM)
+    private implicit final val EXEC_CTX: ExecutionContextExecutor = SYSTEM.dispatcher
+
     private implicit val fmt: RootJsonFormat[SpacySpan] = jsonFormat7(SpacySpan)
     
     private object Config extends NCConfigurable {
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCRestManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCRestManager.scala
index f2a55ab..6884109 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCRestManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCRestManager.scala
@@ -20,7 +20,7 @@ package org.apache.nlpcraft.server.rest
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.server._
-import akka.stream.ActorMaterializer
+import akka.stream.Materializer
 import io.opencensus.trace.Span
 import org.apache.nlpcraft.common.config.NCConfigurable
 import org.apache.nlpcraft.common.{NCService, _}
@@ -33,8 +33,8 @@ import scala.util.{Failure, Success}
   */
 object NCRestManager extends NCService {
     private implicit val SYSTEM: ActorSystem = ActorSystem("server-rest")
-    private implicit val MATERIALIZER: ActorMaterializer = ActorMaterializer()
-    private implicit val CTX: ExecutionContextExecutor = SYSTEM.dispatcher
+    private implicit val MATERIALIZER: Materializer = Materializer.createMaterializer(SYSTEM)
+    private implicit val EXEC_CTX: ExecutionContextExecutor = SYSTEM.dispatcher
 
     @volatile private var bindFut: Future[Http.ServerBinding] = _
 
@@ -78,7 +78,7 @@ object NCRestManager extends NCService {
         handleErrors = api.getExceptionHandler
         handleRejections = api.getRejectionHandler
 
-        bindFut = Http().bindAndHandleAsync(Route.asyncHandler(api.getRoute), Config.host, Config.port)
+        bindFut = Http().newServerAt(Config.host, Config.port).bind(Route.toFunction(api.getRoute))
 
         bindFut.onComplete {
             case Success(_) ⇒ logger.info(s"REST server is listening on '$url'.")