This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch scala-2.13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/scala-2.13 by this push:
new 366f7f6 WIP.
366f7f6 is described below
commit 366f7f60703fa0c0d6d81533094a5f559d2fcb46
Author: Aaron Radzinzski <[email protected]>
AuthorDate: Wed May 19 17:21:58 2021 -0700
WIP.
---
.../scala/org/apache/nlpcraft/common/config/NCConfigurable.scala | 2 +-
.../main/scala/org/apache/nlpcraft/common/debug/NCLogHolder.scala | 3 ++-
.../apache/nlpcraft/common/extcfg/NCExternalConfigManager.scala | 2 +-
.../scala/org/apache/nlpcraft/common/makro/NCMacroParser.scala | 3 ++-
.../main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentence.scala | 3 ++-
.../scala/org/apache/nlpcraft/common/nlp/NCNlpSentenceNote.scala | 3 +--
.../org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala | 4 ++--
nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala | 2 +-
.../org/apache/nlpcraft/common/pool/NCThreadPoolManager.scala | 2 +-
.../main/scala/org/apache/nlpcraft/model/impl/NCTokenImpl.scala | 3 +--
.../main/scala/org/apache/nlpcraft/model/impl/NCTokenLogger.scala | 2 +-
.../main/scala/org/apache/nlpcraft/model/impl/NCTokenPimp.scala | 1 -
.../org/apache/nlpcraft/model/intent/compiler/NCIdlCompiler.scala | 1 -
.../org/apache/nlpcraft/model/intent/solver/NCIntentSolver.scala | 2 --
.../apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala | 2 --
.../nlpcraft/model/intent/solver/NCIntentSolverVariant.scala | 1 -
nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala | 2 +-
.../test/scala/org/apache/nlpcraft/common/debug/NCLogSpec.scala | 2 +-
.../scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala | 7 +++----
.../org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala | 2 +-
.../nlpcraft/model/abstract/NCAbstractTokensVariantsSpec.scala | 2 +-
.../test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala | 2 +-
.../model/intent/idl/compiler/functions/NCIdlFunctions.scala | 1 -
.../intent/idl/compiler/functions/NCIdlFunctionsCompany.scala | 1 -
.../model/intent/idl/compiler/functions/NCIdlFunctionsMeta.scala | 1 -
.../model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala | 1 -
.../src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala | 1 -
.../apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala | 1 -
.../nlpcraft/model/properties/NCTokensRestrictionsSpec.scala | 1 -
.../test/scala/org/apache/nlpcraft/model/sparse/NCSparseSpec.scala | 1 -
30 files changed, 23 insertions(+), 38 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 a352c68..55d1bd8 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 bbeeb6a..4aaf02e 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/extcfg/NCExternalConfigManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/extcfg/NCExternalConfigManager.scala
index c572219..f6af428 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/extcfg/NCExternalConfigManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/extcfg/NCExternalConfigManager.scala
@@ -31,9 +31,9 @@ import java.io._
import java.net.URL
import java.nio.file.Files
import java.util.concurrent.ConcurrentHashMap
-import scala.collection.JavaConverters._
import scala.concurrent.ExecutionContext
import scala.io.Source
+import scala.jdk.CollectionConverters.ConcurrentMapHasAsScala
import scala.util.Using
/**
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 15452fb..2948d10 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,8 +18,9 @@
package org.apache.nlpcraft.common.makro
import org.apache.nlpcraft.common._
-import scala.collection.JavaConverters._
+
import scala.collection._
+import scala.jdk.CollectionConverters.ConcurrentMapHasAsScala
object NCMacroParser {
private final val CHARS = "[A-Za-z0-9-_]+"
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentence.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentence.scala
index 31c9bd2..829a8fd 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentence.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/NCNlpSentence.scala
@@ -18,10 +18,11 @@
package org.apache.nlpcraft.common.nlp
import org.apache.nlpcraft.common._
+
import java.io.{Serializable => JSerializable}
import java.util.{Collections, List => JList}
-import scala.collection.JavaConverters._
import scala.collection.{Map, Seq, Set, mutable}
+import scala.jdk.CollectionConverters.CollectionHasAsScala
import scala.language.implicitConversions
object NCNlpSentence {
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 cbccae5..a29d3ed 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
@@ -23,8 +23,7 @@ import org.apache.nlpcraft.common.ascii._
import scala.language.implicitConversions
import java.io.{Serializable => JSerializable}
import scala.collection.mutable
-import scala.compat.java8.FunctionConverters.enrichAsJavaFunction
-import scala.jdk.CollectionConverters.CollectionHasAsScala
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, SeqHasAsJava}
/**
* Sentence token note is a typed map of KV pairs.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala
index 8a60a6b..78c5fcc 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala
@@ -358,12 +358,12 @@ object NCNumericManager extends NCService {
cds(i)
}
- }).toSeq.map(_._2)
+ }).toSeq.map(_._2.toSeq)
val nums = grps.flatMap(seq => {
def mkNums(v: Double, isFractional: Boolean): Seq[NCNumeric] =
{
// Units synonyms are not stemmed.
- Range.inclusive(1, maxSynWords).reverse.toStream.flatMap(i
=> {
+ Range.inclusive(1,
maxSynWords).reverse.to(LazyList).flatMap(i => {
val afterNum = ns.slice(seq.last.index + 1,
seq.last.index + i + 1)
if (afterNum.nonEmpty &&
!afterNum.exists(cds.contains)) {
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 6486ba4..d1d5413 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
@@ -22,8 +22,8 @@ import java.util.function.{BiPredicate, Consumer, Supplier,
Function => JFunctio
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 b057f74..7908760 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 da34d29..d0f4f2e 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
@@ -19,14 +19,13 @@ package org.apache.nlpcraft.model.impl
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.jdk.CollectionConverters.{MapHasAsJava, SeqHasAsJava}
/**
*
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 1f6fbf8..08d2274 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
@@ -361,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.distinct.toSeq)
val tbl = mkTable(md)
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 3710092..f82dd08 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
@@ -19,7 +19,6 @@ package org.apache.nlpcraft.model.impl
import org.apache.nlpcraft.model.NCToken
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 6094a8b..4f37a40 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
@@ -29,7 +29,6 @@ import org.apache.nlpcraft.model.intent.{NCIdlContext,
NCIdlFunction, NCIdlInten
import java.io._
import java.net._
-import scala.collection.JavaConverters._
import java.util.Optional
import java.util.regex.{Pattern, PatternSyntaxException}
import scala.collection.mutable
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 23416e9..a63b3d4 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,8 +28,6 @@ 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._
-
/**
* Front-end for intent solver.
*/
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala
index 2beece5..5403086 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala
@@ -29,8 +29,6 @@ import org.apache.nlpcraft.model.{NCContext,
NCDialogFlowItem, NCIntentMatch, NC
import org.apache.nlpcraft.probe.mgrs.dialogflow.NCDialogFlowManager
import java.util.function.Function
-import scala.collection.JavaConverters._
-import scala.collection.convert.ImplicitConversions._
import scala.collection.mutable
/**
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 ad661a4..c9685d6 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
@@ -21,7 +21,6 @@ import org.apache.nlpcraft.common._
import org.apache.nlpcraft.model.NCToken
import org.apache.nlpcraft.model.impl.NCTokenPimp._
-import scala.collection.JavaConverters._
import java.util
/**
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
index d6b73c2..f5cf10e 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
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 d9c4e0b..08c1419 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 8a24721..32c691d 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.
@@ -72,14 +71,14 @@ class NCMacroParserSpec {
// @Test
def testPerformance() {
- val start = currentTime
+ val start = System.currentTimeMillis()
val N = 50000
for (_ <- 0 to N)
parser.expand("a {{{<C>}}} {c|d|e|f|g|h|j|k|l|n|m|p|r}")
- val duration = currentTime - start
+ val duration = System.currentTimeMillis() - start
println(s"${N * 1000 / duration} expansions/sec.")
}
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 9216473..6a5569d 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 96f0fbe..5c2fbc9 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 =
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 5c2746e..bdd80f6 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 3346348..9c5409a 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,6 @@ import org.junit.jupiter.api.BeforeEach
import java.util
import java.util.{Collections, Optional}
-import scala.collection.JavaConverters._
import scala.language.implicitConversions
/**
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 1a218eb..401e9a0 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,6 @@ import org.junit.jupiter.api.Test
import java.util
import java.util.Optional
-import scala.collection.JavaConverters._
/**
* 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 cf4ea69..c5b86df 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,6 @@ import org.junit.jupiter.api.Test
import java.util
import java.util.Optional
-import scala.collection.JavaConverters._
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 4753344..de5a851 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,6 @@ import org.junit.jupiter.api.Test
import java.util
import java.util.Optional
-import scala.collection.JavaConverters._
/**
* 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 d282c0b..113db18 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,6 @@ import org.apache.nlpcraft.{NCTestElement, NCTestEnvironment}
import org.junit.jupiter.api.Test
import java.util
-import scala.collection.JavaConverters._
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 b95146e..c2b1e1a 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,6 @@ import org.junit.jupiter.api.Test
import java.util.Optional
import java.{lang, util}
-import scala.collection.JavaConverters._
abstract class NCTokenPropertiesModelAbstract extends NCModelAdapter(
"nlpcraft.tokens.prop.test.mdl", "Tokens Properties Test Model", "1.0"
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensRestrictionsSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensRestrictionsSpec.scala
index 8767518..8f227ce 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensRestrictionsSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensRestrictionsSpec.scala
@@ -22,7 +22,6 @@ import org.apache.nlpcraft.{NCTestContext, NCTestElement,
NCTestEnvironment}
import org.junit.jupiter.api.Test
import java.util
-import scala.collection.JavaConverters._
class NCTokensRestrictionsModelAbstract extends NCModelAdapter(
"nlpcraft.tokens.restr.test.mdl", "Tokens Restriction Test Model", "1.0"
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/sparse/NCSparseSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/sparse/NCSparseSpec.scala
index 896c65c..592c676 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/sparse/NCSparseSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/sparse/NCSparseSpec.scala
@@ -23,7 +23,6 @@ import org.apache.nlpcraft.{NCTestContext, NCTestElement,
NCTestEnvironment}
import org.junit.jupiter.api.Test
import java.util
-import scala.collection.JavaConverters._
import scala.collection.mutable
class NCSparseModel extends NCAbstractTokensModel {