This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-296
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-296 by this push:
new 2b401b0 WIP.
2b401b0 is described below
commit 2b401b097e058ebb735f02a9598ca4846ce3b48e
Author: unknown <[email protected]>
AuthorDate: Wed May 26 22:40:44 2021 -0700
WIP.
---
.../main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala | 4 ++--
.../java/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala | 9 ++++-----
.../org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala | 3 +--
.../org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala | 2 +-
.../common/nlp/core/stanford/NCStanfordTokenizer.scala | 4 ++--
.../server/nlp/core/stanford/NCStanfordNerEnricher.scala | 10 +++++++---
.../nlpcraft/server/nlp/core/stanford/NCStanfordParser.scala | 7 ++++---
.../scala/org/apache/nlpcraft/common/debug/NCLogHolder.scala | 2 +-
.../src/main/scala/org/apache/nlpcraft/common/package.scala | 2 +-
.../scala/org/apache/nlpcraft/model/impl/NCTokenImpl.scala | 2 +-
.../apache/nlpcraft/model/intent/compiler/NCIdlCompiler.scala | 8 ++++----
.../nlpcraft/model/intent/solver/NCIntentSolverVariant.scala | 1 +
.../scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala | 4 ++--
.../org/apache/nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 2 +-
.../org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala | 11 +++++------
.../probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala | 6 +++---
.../mgrs/nlp/enrichers/relation/NCRelationEnricher.scala | 2 +-
.../nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala | 6 +++---
.../nlpcraft/server/nlp/enrichers/date/NCDateParser.scala | 2 +-
.../server/nlp/enrichers/date/tools/NCDateGenerator.scala | 4 ++--
.../probe/mgrs/nlp/enrichers/sort/NCEnricherSortSpec.scala | 2 +-
.../server/nlp/enrichers/date/tools/NCDateGeneratorSpec.scala | 2 +-
22 files changed, 49 insertions(+), 46 deletions(-)
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
index e19d630..1807c5f 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -23,7 +23,7 @@ import org.apache.nlpcraft.examples.sql.db._
import org.apache.nlpcraft.model._
import org.apache.nlpcraft.model.tools.sqlgen._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, ListHasAsScala,
SeqHasAsJava}
import scala.language.implicitConversions
/**
@@ -315,7 +315,7 @@ class SqlModel extends NCModelFileAdapter("sql_model.yaml")
with LazyLogging {
freeDateOpt,
limitTokOpt,
sortTokOpt match {
- case Some(sortTok) => ext.extractSort(sortTok).asScala
+ case Some(sortTok) => ext.extractSort(sortTok).asScala.toSeq
case None => Seq.empty
}
)
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
index b5c9126..d5a9099 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
@@ -18,16 +18,15 @@
package org.apache.nlpcraft.examples.sql.db
import java.sql.Types
-
import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType._
import org.apache.nlpcraft.model.tools.sqlgen._
import org.apache.nlpcraft.model.tools.sqlgen.impl.NCSqlSortImpl
-import scala.collection.JavaConverters._
-import scala.collection.{Seq, mutable}
+import scala.collection.mutable
import scala.compat.java8.OptionConverters._
+import scala.jdk.CollectionConverters.CollectionHasAsScala
/**
* SQL builder that takes parsed SQL schema and creates SQL query based on
configured parameters.
@@ -358,7 +357,7 @@ case class SqlBuilder(schema: NCSqlSchema) extends
LazyLogging {
val weight2 = if (!schemaJoins.exists(_.getToTable == t.getTable))
0 else 1
(weight1, weight2)
- }).flatMap(_.getDefaultDate.asScala).toStream.headOption match {
+ }).flatMap(_.getDefaultDate.asScala).to(LazyList).headOption match {
case Some(col) => Some(col)
case None =>
logger.warn("Free date condition ignored without throwing
exceptions.")
@@ -465,7 +464,7 @@ case class SqlBuilder(schema: NCSqlSchema) extends
LazyLogging {
sortsNorm.foreach(sort => { tblsNorm +=
schemaTblsByNames(sort.getColumn.getTable); colsNorm += sort.getColumn })
var freeDateColOpt =
- if (freeDateRangeOpt.isDefined)
tblsNorm.flatMap(_.getDefaultDate.asScala).toStream.headOption else None
+ if (freeDateRangeOpt.isDefined)
tblsNorm.flatMap(_.getDefaultDate.asScala).to(LazyList).headOption else None
tblsNorm = tblsNorm.distinct
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
index 816b39c..47bca2e 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
@@ -19,11 +19,10 @@ package org.apache.nlpcraft.examples.sql.db
import java.util
import java.util.Collections
-
import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.model._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.SetHasAsJava
import scala.language.implicitConversions
/**
diff --git
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
index 3fd5fda..80b836f 100644
---
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
+++
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
@@ -27,8 +27,8 @@ import org.apache.nlpcraft.examples.sql.db.SqlServer
import org.junit.jupiter.api.Test
import java.util
-import scala.collection.JavaConverters._
import scala.compat.java8.OptionConverters.RichOptionalGeneric
+import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsScala,
SeqHasAsJava}
/**
* SQL model test.
diff --git
a/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/common/nlp/core/stanford/NCStanfordTokenizer.scala
b/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/common/nlp/core/stanford/NCStanfordTokenizer.scala
index 1964597..256d044 100644
---
a/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/common/nlp/core/stanford/NCStanfordTokenizer.scala
+++
b/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/common/nlp/core/stanford/NCStanfordTokenizer.scala
@@ -18,10 +18,10 @@
package org.apache.nlpcraft.common.nlp.core.stanford
import java.io.StringReader
-
import edu.stanford.nlp.process.PTBTokenizer
import org.apache.nlpcraft.common.nlp.core.{NCNlpCoreToken, NCNlpTokenizer}
-import scala.collection.JavaConverters._
+
+import scala.jdk.CollectionConverters.ListHasAsScala
/**
* Stanford tokenizer implementation.
diff --git
a/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/server/nlp/core/stanford/NCStanfordNerEnricher.scala
b/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/server/nlp/core/stanford/NCStanfordNerEnricher.scala
index 70fb0ec..aad9bf0 100644
---
a/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/server/nlp/core/stanford/NCStanfordNerEnricher.scala
+++
b/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/server/nlp/core/stanford/NCStanfordNerEnricher.scala
@@ -24,7 +24,7 @@ import org.apache.nlpcraft.common.nlp.{NCNlpSentence,
NCNlpSentenceNote}
import org.apache.nlpcraft.server.ignite.NCIgniteInstance
import org.apache.nlpcraft.server.nlp.core.NCNlpNerEnricher
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsScala}
/**
* Stanford NLP NER enricher.
@@ -94,8 +94,12 @@ object NCStanfordNerEnricher extends NCService with
NCNlpNerEnricher with NCIgni
val i1 = t1.get.startCharIndex
val i2 = t2.get.endCharIndex
val toks = ns.filter(t => t.startCharIndex >= i1 &&
t.endCharIndex <= i2)
-
- val note = NCNlpSentenceNote(toks.map(_.index),
s"stanford:$typ", buf: _*)
+
+ val note = NCNlpSentenceNote(
+ toks.map(_.index),
+ s"stanford:$typ",
+ buf.toSeq: _*
+ )
toks.foreach(_.add(note))
}
diff --git
a/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/server/nlp/core/stanford/NCStanfordParser.scala
b/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/server/nlp/core/stanford/NCStanfordParser.scala
index 990d867..1449fdf 100644
---
a/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/server/nlp/core/stanford/NCStanfordParser.scala
+++
b/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/server/nlp/core/stanford/NCStanfordParser.scala
@@ -26,12 +26,12 @@ import org.apache.nlpcraft.common.{NCE, NCService}
import org.apache.nlpcraft.server.ignite.NCIgniteInstance
import org.apache.nlpcraft.server.nlp.core.{NCNlpParser, NCNlpWord}
-import scala.collection.JavaConverters._
-import scala.collection.Seq
+import scala.jdk.CollectionConverters.ListHasAsScala
/**
* Stanford NLP parser implementation.
*/
+//noinspection DuplicatedCode
object NCStanfordParser extends NCService with NCNlpParser with
NCIgniteInstance {
/**
*
@@ -79,12 +79,13 @@ object NCStanfordParser extends NCService with NCNlpParser
with NCIgniteInstance
word = t.originalText(),
normalWord = normalWord,
lemma = t.lemma().toLowerCase,
- stem = NCNlpCoreManager.stemWord(normalWord).toString,
+ stem = NCNlpCoreManager.stemWord(normalWord),
pos = t.tag(),
start = t.beginPosition,
end = t.endPosition(),
length = t.endPosition() - t.beginPosition()
)
})
+ .toSeq
}
}
\ No newline at end of file
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/debug/NCLogHolder.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/debug/NCLogHolder.scala
index 91615ca..3781a3c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/debug/NCLogHolder.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/debug/NCLogHolder.scala
@@ -23,7 +23,7 @@ import java.util
import com.google.gson.Gson
import org.apache.nlpcraft.model._
-import scala.jdk.CollectionConverters.{CollectionHasAsScala, SeqHasAsJava}
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsJava,
SeqHasAsJava}
//
// NOTE: these classes are specifically designed for JSON marshalling.
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
index 3b46896..d56e2cb 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
@@ -18,7 +18,7 @@
package org.apache.nlpcraft
import java.util.concurrent.Callable
-import java.util.function.{BiPredicate, Consumer, Supplier, Function ⇒
JFunction, Predicate ⇒ JPredicate}
+import java.util.function.{BiPredicate, Consumer, Supplier, Function =>
JFunction, Predicate => JPredicate}
import org.apache.nlpcraft.common.ansi.NCAnsi._
import org.apache.nlpcraft.common.util._
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenImpl.scala
index fe43bff..c0bf603 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenImpl.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenImpl.scala
@@ -17,7 +17,7 @@
package org.apache.nlpcraft.model.impl
-import java.io.{Serializable ⇒ JSerializable}
+import java.io.{Serializable => JSerializable}
import java.util.Collections
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.common.nlp.NCNlpSentenceToken
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompiler.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompiler.scala
index 80c9514..56e999d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompiler.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompiler.scala
@@ -20,12 +20,12 @@ package org.apache.nlpcraft.model.intent.compiler
import com.typesafe.scalalogging.LazyLogging
import org.antlr.v4.runtime.tree.ParseTreeWalker
import org.antlr.v4.runtime._
-import org.antlr.v4.runtime.{ParserRuleContext ⇒ PRC}
+import org.antlr.v4.runtime.{ParserRuleContext => PRC}
import org.apache.nlpcraft.common._
-import org.apache.nlpcraft.model.intent.compiler.antlr4.{NCIdlBaseListener,
NCIdlLexer, NCIdlParser ⇒ IDP}
-import org.apache.nlpcraft.model.intent.compiler.{NCIdlCompilerGlobal ⇒ Global}
+import org.apache.nlpcraft.model.intent.compiler.antlr4.{NCIdlBaseListener,
NCIdlLexer, NCIdlParser => IDP}
+import org.apache.nlpcraft.model.intent.compiler.{NCIdlCompilerGlobal =>
Global}
import org.apache.nlpcraft.model._
-import org.apache.nlpcraft.model.intent.{NCIdlContext, NCIdlFunction,
NCIdlIntent, NCIdlStack, NCIdlSynonym, NCIdlTerm, NCIdlStackItem ⇒ Z}
+import org.apache.nlpcraft.model.intent.{NCIdlContext, NCIdlFunction,
NCIdlIntent, NCIdlStack, NCIdlSynonym, NCIdlTerm, NCIdlStackItem => Z}
import java.io._
import java.net._
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverVariant.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverVariant.scala
index deabc32..2aa9c9f 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverVariant.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverVariant.scala
@@ -22,6 +22,7 @@ import org.apache.nlpcraft.model.NCToken
import org.apache.nlpcraft.model.impl.NCTokenPimp._
import java.util
+import scala.jdk.CollectionConverters.ListHasAsScala
/**
* Sentence variant & its weight.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
index 065d924..e30d301 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
@@ -134,8 +134,8 @@ class NCProbeSynonym(
state = -1
}
- if (state != -1 && all.size == res.size && (!shouldBeNeighbors ||
U.isIncreased(res.map(getIndex).sorted)))
- Some(res)
+ if (state != -1 && all.size == res.size && (!shouldBeNeighbors ||
U.isIncreased(res.map(getIndex).toSeq.sorted)))
+ Some(res.toSeq)
else
None
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/cmd/NCCommandManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/cmd/NCCommandManager.scala
index 1b17353..a7480fb 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/cmd/NCCommandManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/cmd/NCCommandManager.scala
@@ -17,7 +17,7 @@
package org.apache.nlpcraft.probe.mgrs.cmd
-import java.io.{Serializable ⇒ JSerializable}
+import java.io.{Serializable => JSerializable}
import com.google.gson.Gson
import io.opencensus.trace.Span
import org.apache.nlpcraft.common.{NCService, _}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala
index a6ad87a..1c5b6b0 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala
@@ -24,13 +24,12 @@ import org.apache.nlpcraft.model._
import org.apache.nlpcraft.probe.mgrs.NCProbeModel
import org.apache.nlpcraft.probe.mgrs.deploy._
-import scala.collection.convert.DecorateAsScala
import scala.util.control.Exception._
/**
* Model manager.
*/
-object NCModelManager extends NCService with DecorateAsScala {
+object NCModelManager extends NCService {
// Deployed models keyed by their IDs.
@volatile private var data: Map[String, NCProbeModel] = _
@@ -73,10 +72,10 @@ object NCModelManager extends NCService with
DecorateAsScala {
s"${B}Origin:$RST ${mdl.getOrigin}",
s"${B}Elements:$RST
${withWarn(w.elements.keySet.size)}",
s"${B}Synonyms:$RST",
- s"${B} Simple continuous:$RST $contCnt",
- s"${B} Simple sparse:$RST $sparseCnt",
- s"${B} IDL continuous:$RST $contIdlCnt",
- s"${B} IDL sparse:$RST $sparseIdlCnt",
+ s"$B Simple continuous:$RST $contCnt",
+ s"$B Simple sparse:$RST $sparseCnt",
+ s"$B IDL continuous:$RST $contIdlCnt",
+ s"$B IDL sparse:$RST $sparseIdlCnt",
s"${B}Intents:$RST
${withWarn(w.intents.size)}"
)
})
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
index 867d10a..6b92656 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
@@ -19,18 +19,18 @@ package org.apache.nlpcraft.probe.mgrs.nlp.enrichers.model
import io.opencensus.trace.Span
import org.apache.nlpcraft.common._
-import org.apache.nlpcraft.common.nlp.{NCNlpSentence ⇒ Sentence,
NCNlpSentenceNote ⇒ NlpNote, NCNlpSentenceToken ⇒ NlpToken}
+import org.apache.nlpcraft.common.nlp.{NCNlpSentence => Sentence,
NCNlpSentenceNote => NlpNote, NCNlpSentenceToken => NlpToken}
import org.apache.nlpcraft.model._
import org.apache.nlpcraft.probe.mgrs.NCProbeSynonym.NCIdlContent
import
org.apache.nlpcraft.probe.mgrs.NCProbeSynonymChunkKind.{NCSynonymChunkKind, _}
import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.impl.NCRequestImpl
import org.apache.nlpcraft.probe.mgrs.sentence.NCSentenceManager
-import org.apache.nlpcraft.probe.mgrs.{NCProbeModel, NCProbeVariants,
NCProbeSynonym ⇒ Synonym}
+import org.apache.nlpcraft.probe.mgrs.{NCProbeModel, NCProbeVariants,
NCProbeSynonym => Synonym}
import java.io.Serializable
import java.util
-import java.util.{List ⇒ JList}
+import java.util.{List => JList}
import scala.collection.mutable.ArrayBuffer
import scala.collection.mutable
import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsJava,
MapHasAsScala, SeqHasAsJava}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala
index 946e5ff..1c3e9ea 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala
@@ -18,7 +18,6 @@
package org.apache.nlpcraft.probe.mgrs.nlp.enrichers.relation
import java.io.Serializable
-
import io.opencensus.trace.Span
import org.apache.nlpcraft.common.makro.NCMacroParser
import org.apache.nlpcraft.common.nlp.core.NCNlpCoreManager
@@ -28,6 +27,7 @@ import org.apache.nlpcraft.probe.mgrs.NCProbeModel
import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher
import scala.collection.mutable
+import scala.jdk.CollectionConverters.SeqHasAsJava
/**
* Relation enricher.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala
index cc5171f..d507dcf 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala
@@ -19,7 +19,7 @@ package org.apache.nlpcraft.server.nlp.enrichers.date
import io.opencensus.trace.Span
import org.apache.nlpcraft.common.config.NCConfigurable
-import org.apache.nlpcraft.common.nlp.{NCNlpSentence ⇒ Sentence,
NCNlpSentenceNote ⇒ Note, NCNlpSentenceToken ⇒ Token}
+import org.apache.nlpcraft.common.nlp.{NCNlpSentence => Sentence,
NCNlpSentenceNote => Note, NCNlpSentenceToken => Token}
import org.apache.nlpcraft.common.pool.NCThreadPoolManager
import org.apache.nlpcraft.common.{NCService, _}
import org.apache.nlpcraft.server.nlp.enrichers.NCServerEnricher
@@ -27,10 +27,10 @@ import
org.apache.nlpcraft.server.nlp.enrichers.date.NCDateConstants._
import org.apache.nlpcraft.server.nlp.enrichers.date.NCDateFormatType._
import java.util
-import java.util.{Calendar ⇒ C}
+import java.util.{Calendar => C}
import scala.collection.immutable.Iterable
import scala.collection.mutable
-import scala.collection.mutable.{LinkedHashMap ⇒ LHM}
+import scala.collection.mutable.{LinkedHashMap => LHM}
import scala.concurrent.ExecutionContext
import scala.jdk.CollectionConverters.ListHasAsScala
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateParser.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateParser.scala
index e5c09e1..ae1e583 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateParser.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateParser.scala
@@ -17,7 +17,7 @@
package org.apache.nlpcraft.server.nlp.enrichers.date
-import java.util.{Locale, Calendar ⇒ C}
+import java.util.{Locale, Calendar => C}
import org.apache.nlpcraft.common._
import scala.jdk.CollectionConverters.SeqHasAsJava
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/tools/NCDateGenerator.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/tools/NCDateGenerator.scala
index f9b394c..d20d94e 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/tools/NCDateGenerator.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/tools/NCDateGenerator.scala
@@ -18,13 +18,13 @@
package org.apache.nlpcraft.server.nlp.enrichers.date.tools
import java.text.{DateFormat, SimpleDateFormat}
-import java.util.{Date, Locale, Calendar ⇒ C}
+import java.util.{Date, Locale, Calendar => C}
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.common.nlp.numeric.NCNumericGenerator
import org.apache.nlpcraft.server.nlp.enrichers.date.NCDateConstants._
import org.apache.nlpcraft.server.nlp.enrichers.date.NCDateFormatType._
-import scala.collection.mutable.{LinkedHashMap ⇒ LHM}
+import scala.collection.mutable.{LinkedHashMap => LHM}
import NCDateGenerator._
import scala.collection.mutable
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCEnricherSortSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCEnricherSortSpec.scala
index 94cad05..df089e3 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCEnricherSortSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCEnricherSortSpec.scala
@@ -20,7 +20,7 @@ package org.apache.nlpcraft.probe.mgrs.nlp.enrichers.sort
import org.apache.nlpcraft.{NCTestElement, NCTestEnvironment}
import org.apache.nlpcraft.model.NCElement
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.NCTestSortTokenType._
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.{NCDefaultTestModel,
NCEnricherBaseSpec, NCTestNlpToken ⇒ nlp, NCTestSortToken ⇒ srt,
NCTestUserToken ⇒ usr}
+import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.{NCDefaultTestModel,
NCEnricherBaseSpec, NCTestNlpToken => nlp, NCTestSortToken => srt,
NCTestUserToken => usr}
import org.junit.jupiter.api.Test
import java.util
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/nlp/enrichers/date/tools/NCDateGeneratorSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/nlp/enrichers/date/tools/NCDateGeneratorSpec.scala
index 147a46a..d4d833f 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/nlp/enrichers/date/tools/NCDateGeneratorSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/nlp/enrichers/date/tools/NCDateGeneratorSpec.scala
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test
import java.text.SimpleDateFormat
import java.util.{Calendar, Date, Locale}
-import scala.collection.mutable.{LinkedHashMap ⇒ LHM}
+import scala.collection.mutable.{LinkedHashMap => LHM}
import scala.jdk.CollectionConverters.SeqHasAsJava
import scala.language.implicitConversions
