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 76c6f35 WIP.
76c6f35 is described below
commit 76c6f35d4ab8e81cfe7322acf8acd22f8efe43a8
Author: unknown <[email protected]>
AuthorDate: Wed May 26 22:26:48 2021 -0700
WIP.
---
.../apache/nlpcraft/server/ignite/NCIgniteHelpers.scala | 3 +--
.../server/nlp/core/google/NCGoogleNerEnricher.scala | 2 +-
.../server/nlp/enrichers/date/NCDateEnricher.scala | 10 +++++-----
.../nlpcraft/server/nlp/enrichers/date/NCDateParser.scala | 6 ++++--
.../server/nlp/enrichers/date/tools/NCDateGenerator.scala | 14 ++++++++------
.../nlpcraft/server/nlp/wordnet/NCWordNetManager.scala | 2 +-
.../org/apache/nlpcraft/server/probe/NCProbeManager.scala | 4 ++--
.../nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala | 6 +++---
.../org/apache/nlpcraft/server/user/NCUserManager.scala | 1 -
.../nlp/enrichers/date/tools/NCDateGeneratorSpec.scala | 5 ++---
.../org/apache/nlpcraft/server/rest/NCRestAskSpec.scala | 2 +-
.../apache/nlpcraft/server/rest/NCRestCompanySpec.scala | 2 +-
.../org/apache/nlpcraft/server/rest/NCRestErrorsSpec.scala | 2 +-
.../org/apache/nlpcraft/server/rest/NCRestModelSpec.scala | 4 ++--
.../scala/org/apache/nlpcraft/server/rest/NCRestSpec.scala | 2 +-
.../org/apache/nlpcraft/server/rest/NCRestUserSpec.scala | 2 +-
16 files changed, 34 insertions(+), 33 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 18d766e..8491744 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
@@ -18,12 +18,11 @@
package org.apache.nlpcraft.server.ignite
import java.util.UUID
-
import org.apache.ignite.IgniteCache
import org.apache.ignite.events.CacheEvent
import org.apache.ignite.lang.{IgniteBiPredicate, IgnitePredicate}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{IterableHasAsScala, MapHasAsJava,
SeqHasAsJava}
/*
* Helpers for working with Ignite.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/google/NCGoogleNerEnricher.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/google/NCGoogleNerEnricher.scala
index cfc9a26..95cb540 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/google/NCGoogleNerEnricher.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/google/NCGoogleNerEnricher.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
/**
* Google language cloud service NER 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 d7382c9..cc5171f 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,12 +27,12 @@ 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 scala.collection.JavaConverters._
+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
/**
* Date enricher.
@@ -248,7 +248,7 @@ object NCDateEnricher extends NCServerEnricher {
buf += mkHolder(f, p)
mark(f)
- case None => None
+ case None => ()
}
buf
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 2e2653c..e5c09e1 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,13 +17,15 @@
package org.apache.nlpcraft.server.nlp.enrichers.date
-import java.util.{Locale, Calendar => C}
-import scala.collection.JavaConverters._
+import java.util.{Locale, Calendar ⇒ C}
import org.apache.nlpcraft.common._
+import scala.jdk.CollectionConverters.SeqHasAsJava
+
/**
* Date parser.
*/
+//noinspection DuplicatedCode
object NCDateParser {
// For english calendar settings.
Locale.setDefault(Locale.forLanguageTag("EN"))
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 4007d64..f9b394c 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,20 +18,21 @@
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._
-import scala.collection.mutable.{LinkedHashMap => LHM}
+import scala.collection.mutable.{LinkedHashMap ⇒ LHM}
import NCDateGenerator._
+import scala.collection.mutable
+
/**
* Pre-built date ranges generator.
*/
+//noinspection DuplicatedCode
object NCDateGenerator {
// For english names generation.
Locale.setDefault(Locale.forLanguageTag("EN"))
@@ -253,7 +254,7 @@ object NCDateGenerator {
def mkLastNToNow(n: Int): String = toNow(s"$periodShort-$n")
def make(plural: String, isMisspelling: Boolean): Map[String, String]
= {
- var p1 = LHM(
+ val p1 = LHM(
s"couple of $plural" -> mkLastNToNow(2),
s"couple of last $plural" -> mkLastNToNow(2),
s"couple last $plural" -> mkLastNToNow(2),
@@ -293,7 +294,7 @@ object NCDateGenerator {
)
p1 ++ p2 ++ p3
- }
+ }.toMap
val ph = mkPlural(period)
@@ -352,6 +353,7 @@ object NCDateGenerator {
p1 ++ p2 ++ p3
}
+ .toMap
val ph = mkPlural(period)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala
index 9ce163e..50ff718 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala
@@ -24,7 +24,7 @@ import net.sf.extjwnl.dictionary.{Dictionary,
MorphologicalProcessor}
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.common.NCService
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.ListHasAsScala
/**
* WordNet manager.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
index d606226..f572b9f 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
@@ -43,9 +43,9 @@ import java.security.Key
import java.util
import java.util.Collections
import java.util.concurrent.ConcurrentHashMap
-import scala.collection.JavaConverters._
-import scala.collection.{Map, mutable}
+import scala.collection.mutable
import scala.concurrent.{ExecutionContext, Future, Promise}
+import scala.jdk.CollectionConverters.SetHasAsScala
import scala.util.{Failure, Success}
/**
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
index 6caf5c1..e6a9c66 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
@@ -36,9 +36,9 @@ import org.apache.nlpcraft.server.probe.NCProbeManager
import java.util
import java.util.concurrent._
import java.util.concurrent.atomic.{AtomicInteger, AtomicReference}
-import scala.collection.JavaConverters._
-import scala.collection.{Seq, mutable}
+import scala.collection.mutable
import scala.concurrent.{ExecutionContext, Future, Promise}
+import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsScala}
import scala.util.{Failure, Success}
/**
@@ -78,7 +78,7 @@ object NCSuggestSynonymManager extends NCService {
case 200 =>
val data: util.List[util.List[Suggestion]] =
GSON.fromJson(js, TYPE_RESP)
- data.asScala.map(p => if (p.isEmpty) Seq.empty else
p.asScala.tail)
+ data.asScala.map(p => if (p.isEmpty) Seq.empty else
p.asScala.tail.toSeq).toSeq
case _ =>
throw new NCE(
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/user/NCUserManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/user/NCUserManager.scala
index e7b7cd6..0eb0950 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/user/NCUserManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/user/NCUserManager.scala
@@ -31,7 +31,6 @@ import org.apache.nlpcraft.server.mdo.NCUserMdo
import org.apache.nlpcraft.server.sql.{NCSql, NCSqlManager}
import org.apache.nlpcraft.server.tx.NCTxManager
-import scala.collection.JavaConverters._
import scala.util.control.Exception._
/**
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 e36ee6d..147a46a 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,9 +27,8 @@ import org.junit.jupiter.api.Test
import java.text.SimpleDateFormat
import java.util.{Calendar, Date, Locale}
-import scala.collection.JavaConverters._
-import scala.collection._
-import scala.collection.mutable.{LinkedHashMap => LHM}
+import scala.collection.mutable.{LinkedHashMap ⇒ LHM}
+import scala.jdk.CollectionConverters.SeqHasAsJava
import scala.language.implicitConversions
/**
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestAskSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestAskSpec.scala
index f41d6d9..fc26ae2 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestAskSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestAskSpec.scala
@@ -21,7 +21,7 @@ import org.apache.nlpcraft.NCTestEnvironment
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.{BeforeEach, Test}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsJava,
SetHasAsJava}
@NCTestEnvironment(model = classOf[RestTestModel], startClient = false)
class NCRestAskSpec extends NCRestSpec {
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestCompanySpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestCompanySpec.scala
index a39ad42..7868214 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestCompanySpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestCompanySpec.scala
@@ -20,7 +20,7 @@ package org.apache.nlpcraft.server.rest
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.Test
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.MapHasAsJava
class NCRestCompanySpec extends NCRestSpec {
private final val PROPS = Map("k1" -> "v1", "k2" -> "v2").asJava
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestErrorsSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestErrorsSpec.scala
index d932ff5..fc8d90e 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestErrorsSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestErrorsSpec.scala
@@ -21,7 +21,7 @@ import org.apache.nlpcraft.common.U
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsScala}
class NCRestErrorsSpec extends NCRestSpec {
@Test
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala
index f4e1f4d..fc1e22c 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala
@@ -21,7 +21,7 @@ import org.apache.nlpcraft.NCTestEnvironment
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.Test
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.ListHasAsScala
/**
* Note that context word server should be started.
@@ -31,7 +31,7 @@ class NCRestModelSpec extends NCRestSpec {
@Test
def test(): Unit = {
def extract(data: java.util.List[java.util.Map[String, Object]]):
Seq[Double] =
- data.asScala.map(_.get("score").asInstanceOf[Number].doubleValue())
+
data.asScala.map(_.get("score").asInstanceOf[Number].doubleValue()).toSeq
// Note that checked values are valid for current configuration of
`RestTestModel` model.
post("model/sugsyn", "mdlId" -> "rest.test.model")(
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestSpec.scala
index ea4b879..1150411 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestSpec.scala
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.{AfterEach, BeforeEach}
import java.util
import java.util.UUID
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsJava,
MapHasAsScala, SeqHasAsJava}
object NCRestSpec {
private final val DFLT_BASEURL = "http://localhost:8081/api/v1/";
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestUserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestUserSpec.scala
index c011a6c..b8e1992 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestUserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestUserSpec.scala
@@ -20,7 +20,7 @@ package org.apache.nlpcraft.server.rest
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.Test
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters.MapHasAsJava
class NCRestUserSpec extends NCRestSpec {
private final val PROPS = Map("k1" -> "v1", "k2" -> "v2").asJava
