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 63f53ee WIP.
63f53ee is described below
commit 63f53ee78e346fbfb174f17519f76b9e1a2ca171
Author: unknown <[email protected]>
AuthorDate: Wed May 26 21:44:29 2021 -0700
WIP.
---
.../nlpcraft/common/config/NCConfigurable.scala | 2 +-
.../apache/nlpcraft/common/debug/NCLogHolder.scala | 3 ++-
.../nlpcraft/common/makro/NCMacroParser.scala | 11 +++++------
.../nlpcraft/common/nlp/NCNlpSentenceNote.scala | 21 +++++++++++++++++++++
.../scala/org/apache/nlpcraft/common/package.scala | 4 ++--
.../nlpcraft/common/pool/NCThreadPoolManager.scala | 2 +-
.../apache/nlpcraft/model/impl/NCTokenImpl.scala | 11 +++++------
.../apache/nlpcraft/model/impl/NCTokenLogger.scala | 13 ++++++-------
.../apache/nlpcraft/model/impl/NCTokenPimp.scala | 3 ++-
.../model/intent/compiler/NCIdlCompiler.scala | 19 +++++++++----------
.../model/intent/solver/NCIntentSolver.scala | 2 +-
.../test/impl/NCTestAutoModelValidatorImpl.scala | 2 +-
.../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 2 --
.../nlp/enrichers/relation/NCRelationEnricher.scala | 3 +--
.../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 14 +++++++++-----
.../scala/org/apache/nlpcraft/NCTestElement.scala | 2 +-
.../apache/nlpcraft/common/debug/NCLogSpec.scala | 2 +-
.../nlpcraft/common/makro/NCMacroParserSpec.scala | 3 +--
.../model/abstract/NCAbstractTokensModel.scala | 2 +-
.../abstract/NCAbstractTokensVariantsSpec.scala | 6 +++---
.../apache/nlpcraft/model/dialog/NCDialogSpec.scala | 2 +-
.../idl/compiler/functions/NCIdlFunctions.scala | 4 ++--
.../compiler/functions/NCIdlFunctionsCompany.scala | 2 +-
.../idl/compiler/functions/NCIdlFunctionsMeta.scala | 2 +-
.../idl/compiler/functions/NCIdlFunctionsUser.scala | 2 +-
.../org/apache/nlpcraft/model/meta/NCMetaSpec.scala | 2 +-
.../model/properties/NCTokensPropertiesSpec.scala | 2 +-
27 files changed, 81 insertions(+), 62 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/config/NCConfigurable.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/config/NCConfigurable.scala
index 7c889df..d4351ee 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/config/NCConfigurable.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/config/NCConfigurable.scala
@@ -23,7 +23,7 @@ import org.apache.nlpcraft.common._
import java.io.File
import java.net.{MalformedURLException, URL}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.MapHasAsScala
/**
* Mixin for configuration factory based on
https://github.com/lightbend/config.
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 f815f9a..91615ca 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
@@ -18,11 +18,12 @@
package org.apache.nlpcraft.common.debug
import org.apache.nlpcraft.common._
+
import java.util
import com.google.gson.Gson
import org.apache.nlpcraft.model._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, SeqHasAsJava}
//
// NOTE: these classes are specifically designed for JSON marshalling.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/NCMacroParser.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/NCMacroParser.scala
index 4a41eaa..8b32d61 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/NCMacroParser.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/NCMacroParser.scala
@@ -18,15 +18,14 @@
package org.apache.nlpcraft.common.makro
import org.apache.nlpcraft.common._
-import scala.collection.JavaConverters._
-import scala.collection._
+
+import scala.jdk.CollectionConverters.{ConcurrentMapHasAsScala, SetHasAsJava}
object NCMacroParser {
- private final val CHARS = "[A-Za-z0-9-_]+"
private final val ESC_CHARS = """{}\<>_[]|,"""
- private final val MACRO_REGEX = s"<$CHARS>".r
- private final val BROKEN_MACRO_REGEX1 = s"<$CHARS".r
- private final val BROKEN_MACRO_REGEX2 = s"$CHARS>".r
+ private final val MACRO_REGEX = s"<[A-Za-z0-9-_]+>".r
+ private final val BROKEN_MACRO_REGEX1 = s"<[A-Za-z0-9-_]+".r
+ private final val BROKEN_MACRO_REGEX2 = s"[A-Za-z0-9-_]+>".r
/**
* Constructor.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentenceNote.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentenceNote.scala
index 6522b18..5675656 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentenceNote.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentenceNote.scala
@@ -253,6 +253,16 @@ object NCNlpSentenceNote {
apply(indexes, None, typ, params: _*)
/**
+ * Creates new note with given parameters.
+ *
+ * @param indexes Indexes in the sentence.
+ * @param typ Type of the node.
+ * @param params Parameters.
+ */
+ def apply(indexes: mutable.Seq[Int], typ: String, params: (String, Any)*):
NCNlpSentenceNote =
+ apply(indexes.toSeq, None, typ, params: _*)
+
+ /**
* Creates new note with given parameters.
*
* @param indexes Indexes in the sentence.
@@ -262,4 +272,15 @@ object NCNlpSentenceNote {
*/
def apply(indexes: Seq[Int], wordIndexes: Seq[Int], typ: String, params:
(String, Any)*): NCNlpSentenceNote =
apply(indexes, Some(wordIndexes), typ, params: _*)
+
+ /**
+ * Creates new note with given parameters.
+ *
+ * @param indexes Indexes in the sentence.
+ * @param wordIndexes Word indexes in the sentence.
+ * @param typ Type of the node.
+ * @param params Parameters.
+ */
+ def apply(indexes: mutable.Seq[Int], wordIndexes: mutable.Seq[Int], typ:
String, params: (String, Any)*): NCNlpSentenceNote =
+ apply(indexes.toSeq, Some(wordIndexes.toSeq), typ, params: _*)
}
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 329be18..f526864 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
@@ -18,12 +18,12 @@
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._
+import scala.jdk.CollectionConverters.MapHasAsScala
import scala.language.implicitConversions
-import scala.collection.JavaConverters._
/**
* Package scope.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/pool/NCThreadPoolManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/pool/NCThreadPoolManager.scala
index 3bf29c7..0a81a3a 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/pool/NCThreadPoolManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/pool/NCThreadPoolManager.scala
@@ -21,8 +21,8 @@ import io.opencensus.trace.Span
import org.apache.nlpcraft.common._
import java.util.concurrent._
-import scala.collection.JavaConverters._
import scala.concurrent.ExecutionContext
+import scala.jdk.CollectionConverters.CollectionHasAsScala
/**
* Common thread pool manager.
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 bc91231..fe43bff 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,16 +17,15 @@
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
import org.apache.nlpcraft.model._
import org.apache.nlpcraft.probe.mgrs.NCProbeModel
-import scala.collection.JavaConverters._
-import scala.collection.{Seq, mutable}
+import scala.collection.mutable
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsJava,
MapHasAsScala, SeqHasAsJava}
/**
*
@@ -146,9 +145,9 @@ private[nlpcraft] object NCTokenImpl {
mdl.model,
srvReqId = srvReqId,
id = elm.getId,
- grps = elm.getGroups.asScala,
+ grps = elm.getGroups.asScala.toSeq,
parentId = elm.getParentId,
- ancestors = ancestors,
+ ancestors = ancestors.toSeq,
value = usrNote.dataOpt("value").orNull,
startCharIndex = tok.startCharIndex,
endCharIndex = tok.endCharIndex,
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenLogger.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenLogger.scala
index a165d34..0d10880 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenLogger.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenLogger.scala
@@ -19,7 +19,6 @@ package org.apache.nlpcraft.model.impl
import java.text.SimpleDateFormat
import java.util
-
import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.common.ascii._
@@ -28,12 +27,13 @@ import org.apache.nlpcraft.model.NCToken
import org.apache.nlpcraft.model.impl.NCTokenPimp._
import org.apache.nlpcraft.common.ansi.NCAnsi._
-import scala.collection.JavaConverters._
-import scala.collection._
+import scala.collection.mutable
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsScala}
/**
* Utility service that provides supporting functionality for ASCII rendering.
*/
+//noinspection DuplicatedCode
object NCTokenLogger extends LazyLogging {
case class NoteMetadata(noteType: String, filtered: Seq[String], isFull:
Boolean)
@@ -167,8 +167,7 @@ object NCTokenLogger extends LazyLogging {
case None => None
}
def mkString(name: String): String = getValue(name).toString
- def mkJListString(name: String): String =
-
getValue(name).asInstanceOf[java.util.List[String]].asScala.mkString(",")
+ def mkJListString(name: String): String =
getValue(name).asInstanceOf[java.util.List[String]].asScala.mkString(",")
def mkDate(name: String): String =
format(getValue(name).asInstanceOf[Long])
def getValueOpt(name: String): Option[java.io.Serializable] =
@@ -362,7 +361,7 @@ object NCTokenLogger extends LazyLogging {
* Prepares table to print.
*/
def prepareTable(sen: NCNlpSentence): NCAsciiTable = {
- val md = filterKeysPairs(sen.flatMap(t => t.map(n => for (vk <-
n.keys) yield n.noteType -> vk)).flatten.distinct)
+ val md = filterKeysPairs(sen.flatMap(t => t.map(n => for (vk <-
n.keys) yield n.noteType -> vk)).flatten.toSeq.distinct)
val tbl = mkTable(md)
@@ -394,7 +393,7 @@ object NCTokenLogger extends LazyLogging {
if (!allFree)
headers += "token data"
- val tbl = NCAsciiTable(headers :_*)
+ val tbl = NCAsciiTable(headers)
toks.foreach(tok => {
val md = tok.getMetadata
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenPimp.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenPimp.scala
index 2b7db69..f5b405d 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenPimp.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenPimp.scala
@@ -18,8 +18,9 @@
package org.apache.nlpcraft.model.impl
import org.apache.nlpcraft.model.NCToken
+
+import scala.jdk.CollectionConverters.CollectionHasAsScala
import scala.language.implicitConversions
-import scala.collection.JavaConverters._
/**
*
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 02784e4..80c9514 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,20 +20,19 @@ 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, NCIdlStackItem => Z, NCIdlSynonym, NCIdlTerm}
+import org.apache.nlpcraft.model.intent.{NCIdlContext, NCIdlFunction,
NCIdlIntent, NCIdlStack, NCIdlSynonym, NCIdlTerm, NCIdlStackItem ⇒ Z}
import java.io._
import java.net._
-import scala.collection.JavaConverters._
import java.util.Optional
import java.util.regex.{Pattern, PatternSyntaxException}
import scala.collection.mutable
-import scala.collection.mutable.ArrayBuffer
+import scala.jdk.CollectionConverters.MapHasAsJava
object NCIdlCompiler extends LazyLogging {
// Compiler caches.
@@ -51,7 +50,7 @@ object NCIdlCompiler extends LazyLogging {
final private val MINMAX_MAX = 100
// Accumulators for parsed objects.
- private val intents = ArrayBuffer.empty[NCIdlIntent]
+ private val intents = mutable.ArrayBuffer.empty[NCIdlIntent]
private var synonym: NCIdlSynonym = _
// Synonym.
@@ -68,10 +67,10 @@ object NCIdlCompiler extends LazyLogging {
private var intentMeta: ScalaMeta = _
// Accumulator for parsed terms.
- private val terms = ArrayBuffer.empty[NCIdlTerm]
+ private val terms = mutable.ArrayBuffer.empty[NCIdlTerm]
// Currently term.
- private var vars = mutable.HashMap.empty[String, NCIdlFunction]
+ private val vars = mutable.HashMap.empty[String, NCIdlFunction]
private var termId: String = _
private var termConv: Boolean = _
private var min = 1
@@ -84,7 +83,7 @@ object NCIdlCompiler extends LazyLogging {
private var flowMtdName: Option[String] = None
// List of instructions for the current expression.
- private var expr = mutable.Buffer.empty[SI]
+ private val expr = mutable.Buffer.empty[SI]
/**
*
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolver.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolver.scala
index b04b558..17fd13f 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolver.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolver.scala
@@ -28,7 +28,7 @@ import org.apache.nlpcraft.model.intent.NCIdlIntent
import org.apache.nlpcraft.model.{NCContext, NCIntentMatch, NCIntentSkip,
NCModel, NCRejection, NCResult, NCToken, NCVariant}
import org.apache.nlpcraft.probe.mgrs.dialogflow.NCDialogFlowManager
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.SeqHasAsJava
/**
* Front-end for intent solver.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
index 70e355a..5f1cc62 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
@@ -24,7 +24,7 @@ import
org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe
import org.apache.nlpcraft.model.tools.test.{NCTestAutoModelValidator,
NCTestClientBuilder}
import org.apache.nlpcraft.probe.mgrs.model.NCModelManager
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.SeqHasAsJava
/**
* Implementation for `NCTestAutoModelValidator` class.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeModel.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeModel.scala
index ea5eb50..9084fb8 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeModel.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeModel.scala
@@ -21,8 +21,6 @@ import org.apache.nlpcraft.model.intent.NCIdlIntent
import org.apache.nlpcraft.model.intent.solver.NCIntentSolver
import org.apache.nlpcraft.model.{NCElement, NCModel}
-import scala.collection.{Map, Seq}
-
/**
*
* @param model
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 514e8ac..946e5ff 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
@@ -27,8 +27,7 @@ import org.apache.nlpcraft.common.{NCE, NCService}
import org.apache.nlpcraft.probe.mgrs.NCProbeModel
import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher
-import scala.collection.JavaConverters._
-import scala.collection.{Map, Seq, mutable}
+import scala.collection.mutable
/**
* Relation enricher.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
index b84a944..abd956f 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
@@ -27,7 +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.IterableHasAsJava
+import scala.jdk.CollectionConverters.{CollectionHasAsScala,
IterableHasAsJava, MapHasAsScala}
/**
* Sort enricher.
@@ -237,7 +237,7 @@ object NCSortEnricher extends NCProbeEnricher {
s"]"
)
- res
+ res.toSeq
}
/**
@@ -277,8 +277,8 @@ object NCSortEnricher extends NCProbeEnricher {
map(toks => toks.map(_.stem).mkString(" ") -> toks).toMap.
flatMap { case (stem, stemToks) =>
if (keyStems.contains(stem)) Some(KeyWord(stemToks,
keyStems.indexOf(stem))) else None
- }.toStream.headOption
- ).toStream.headOption
+ }.to(LazyList).headOption
+ ).to(LazyList).headOption
}
var res: Option[Match] = None
@@ -468,7 +468,11 @@ object NCSortEnricher extends NCProbeEnricher {
}
def mkNote(params: mutable.ArrayBuffer[(String,
Any)]): Unit = {
- val note =
NCNlpSentenceNote(m.main.map(_.index), TOK_ID, params: _*)
+ val note = NCNlpSentenceNote(
+ m.main.map(_.index),
+ TOK_ID,
+ params.toSeq: _*
+ )
if (!notes.exists(n =>
ns.notesEqualOrSimilar(n, note))) {
notes += note
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
index 7137919..dc465d8 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
@@ -20,7 +20,7 @@ package org.apache.nlpcraft
import org.apache.nlpcraft.model.NCElement
import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{SeqHasAsJava, SetHasAsJava}
import scala.language.implicitConversions
/**
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/common/debug/NCLogSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/common/debug/NCLogSpec.scala
index eb454cd..93c6d1a 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/common/debug/NCLogSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/common/debug/NCLogSpec.scala
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test
import java.lang.Boolean.TRUE
import java.lang.reflect.Type
import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{MapHasAsJava, MapHasAsScala}
import scala.language.implicitConversions
object NCLogSpecModel {
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala
index d3d5008..3364cef 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala
@@ -22,8 +22,7 @@ import org.apache.nlpcraft.model.NCMacroProcessor
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
-import scala.compat.Platform._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.CollectionHasAsScala
/**
* Tests for text parser.
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
index dfa69cb..c6aef60 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
@@ -21,7 +21,7 @@ import org.apache.nlpcraft.NCTestElement
import org.apache.nlpcraft.model.{NCElement, NCModelAdapter}
import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.SetHasAsJava
class NCAbstractTokensModel extends NCModelAdapter(
"nlpcraft.abstract.elems.mdl.test", "Abstract Elements Test Model", "1.0"
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensVariantsSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensVariantsSpec.scala
index d9b3714..a83f697 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensVariantsSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensVariantsSpec.scala
@@ -22,7 +22,7 @@ import org.apache.nlpcraft.{NCTestContext, NCTestEnvironment}
import org.junit.jupiter.api.Test
import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.CollectionHasAsScala
class NCAbstractTokensModelVariants extends NCAbstractTokensModel {
private def checkId(t: NCToken, id: String): Unit =
@@ -95,7 +95,7 @@ class NCAbstractTokensModelVariants extends
NCAbstractTokensModel {
checkToken(toks.head, "nlpcraft:nlp", "10")
checkToken(toks.last,"wrapNum", "w1 10 w2")
- val t2Parts = toks.last.getPartTokens.asScala
+ val t2Parts = toks.last.getPartTokens.asScala.toSeq
require(t2Parts.size == 3)
@@ -130,7 +130,7 @@ class NCAbstractTokensModelVariants extends
NCAbstractTokensModel {
require(variants.nonEmpty)
val vars = variants.
- map(p => p.asScala).
+ map(p => p.asScala.toSeq).
filter(v => v.size == 3 && v(1).getId == "wrapWrapLimit"
&& v.last.getId == "wrapAnyWord")
require(vars.size == 1)
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
index 4da457a..2da6b53 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Assertions.{assertEquals,
assertTrue}
import org.junit.jupiter.api.Test
import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.CollectionHasAsScala
/**
* Test model.
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctions.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctions.scala
index c09d1d2..8acfc81 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctions.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctions.scala
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.BeforeEach
import java.util
import java.util.{Collections, Optional}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{MapHasAsJava, SeqHasAsJava,
SetHasAsJava}
import scala.language.implicitConversions
/**
@@ -35,7 +35,7 @@ import scala.language.implicitConversions
private[functions] trait NCIdlFunctions {
private final val MODEL_ID = "test.mdl.id"
- // It shouldn't be anonimous class because we need access to
'trueAlwaysCustomToken' method via reflection.
+ // It shouldn't be anonymous class because we need access to
'trueAlwaysCustomToken' method via reflection.
class TestModel extends NCModel {
override val getId: String = MODEL_ID
override val getName: String = MODEL_ID
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
index 33376e2..4d74aff 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test
import java.util
import java.util.Optional
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.MapHasAsJava
/**
* Tests for 'company' functions.
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsMeta.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsMeta.scala
index 7932cbb..4efbc96 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsMeta.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsMeta.scala
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test
import java.util
import java.util.Optional
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.MapHasAsJava
import scala.sys.SystemProperties
/**
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
index ce9c753..caf5bb0 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test
import java.util
import java.util.Optional
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.MapHasAsJava
/**
* Tests for 'user' functions.
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala
index 4f0b1ec..15e5d33 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala
@@ -23,7 +23,7 @@ import org.apache.nlpcraft.{NCTestElement, NCTestEnvironment}
import org.junit.jupiter.api.Test
import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.MapHasAsJava
import scala.sys.SystemProperties
/**
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala
index ee52973..5026387 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test
import java.util.Optional
import java.{lang, util}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.SetHasAsJava
abstract class NCTokenPropertiesModelAbstract extends NCModelAdapter(
"nlpcraft.tokens.prop.test.mdl", "Tokens Properties Test Model", "1.0"
