You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by sm...@apache.org on 2020/04/20 10:13:21 UTC
[incubator-nlpcraft] 01/01: NLPCRAFT-39: Upgrade to Scala 2.12
This is an automated email from the ASF dual-hosted git repository.
smakov pushed a commit to branch NLPCRAFT-39
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 3462f6bc7eec03d5ab62aacd073b5fc92c4663a2
Author: smakov <sm...@apache.org>
AuthorDate: Mon Apr 20 13:13:04 2020 +0300
NLPCRAFT-39: Upgrade to Scala 2.12
---
pom.xml | 27 +++++++++++-----------
.../org/apache/nlpcraft/common/util/NCUtils.scala | 8 +++----
.../server/geo/tools/NCGeoNamesGenerator.scala | 8 +++----
.../geo/tools/NCGeoStateNamesGenerator.scala | 2 +-
.../geo/tools/NCGeoSyntheticNamesGenerator.scala | 4 ++--
.../geo/tools/metro/NCGeoMetroGenerator.scala | 4 ++--
.../org/apache/nlpcraft/server/json/NCJson.scala | 6 ++---
.../enrichers/stopword/NCStopWordEnricher.scala | 2 +-
8 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 575571d..179730d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,13 +69,13 @@
<properties>
<!-- Major Scala version. -->
- <scala.base>2.11</scala.base>
+ <scala.base>2.12</scala.base>
<!-- Versions. -->
<ignite.ver>2.7.5</ignite.ver>
- <scala.plugin.ver>3.3.1</scala.plugin.ver>
+ <scala.plugin.ver>4.3.1</scala.plugin.ver>
<log4j.ver>2.12.0</log4j.ver>
- <scala.ver>${scala.base}.12</scala.ver>
+ <scala.ver>${scala.base}.11</scala.ver>
<scala.config.ver>1.3.4</scala.config.ver>
<commons.codec.ver>1.12</commons.codec.ver>
<commons.io.ver>2.6</commons.io.ver>
@@ -89,8 +89,7 @@
<scala.xml.ver>1.1.1</scala.xml.ver>
<c3p0.ver>0.9.5.4</c3p0.ver> <!-- Upgraded to due security vulnerability. -->
<scalatest.ver>3.0.8</scalatest.ver>
- <akka.ver>2.5.21</akka.ver>
- <lift.json.ver>2.6.3</lift.json.ver>
+ <lift.json.ver>3.3.0</lift.json.ver>
<scalaj.ver>2.4.1</scalaj.ver>
<spray.ver>1.3.5</spray.ver>
<tika.ver>1.21</tika.ver>
@@ -120,9 +119,9 @@
<maven.bazaarvoice.plugin.ver>0.9</maven.bazaarvoice.plugin.ver>
<apache.rat.plugin.ver>0.13</apache.rat.plugin.ver>
<org.antlr4.ver>4.8</org.antlr4.ver>
- <akka.http.2.11.ver>10.1.9</akka.http.2.11.ver>
- <akka.stream.2.11.ver>2.5.23</akka.stream.2.11.ver>
- <akka.http.spray.json.2.11.ver>10.1.9</akka.http.spray.json.2.11.ver>
+ <akka.http.2.12.ver>10.1.9</akka.http.2.12.ver>
+ <akka.stream.2.12.ver>2.5.23</akka.stream.2.12.ver>
+ <akka.http.spray.json.2.12.ver>10.1.9</akka.http.spray.json.2.12.ver>
<google.guava.ver>28.1-jre</google.guava.ver>
<diff.utils.ver>4.5</diff.utils.ver>
<vertical.blank.ver>1.0</vertical.blank.ver>
@@ -360,18 +359,18 @@
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http_2.11</artifactId>
- <version>${akka.http.2.11.ver}</version>
+ <artifactId>akka-http_2.12</artifactId>
+ <version>${akka.http.2.12.ver}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-stream_2.11</artifactId>
- <version>${akka.stream.2.11.ver}</version>
+ <artifactId>akka-stream_2.12</artifactId>
+ <version>${akka.stream.2.12.ver}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http-spray-json_2.11</artifactId>
- <version>${akka.http.spray.json.2.11.ver}</version>
+ <artifactId>akka-http-spray-json_2.12</artifactId>
+ <version>${akka.http.spray.json.2.12.ver}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
diff --git a/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala b/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
index 8c67e94..656d6f9 100644
--- a/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
+++ b/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
@@ -928,14 +928,14 @@ object NCUtils extends LazyLogging {
body: Unit ⇒ T,
onFailure: Throwable ⇒ Unit = _ ⇒ Unit,
onSuccess: T ⇒ Unit = (_: T) ⇒ ())(implicit ec: ExecutionContext = global): Future[T] = {
- val fut = Future { body(()) }
+ val fut = Future { body(()) }(ec)
fut.onFailure {
case e: Throwable ⇒ onFailure(e)
- }
+ }(ec)
fut.onSuccess {
case t ⇒ onSuccess(t)
- }
+ }(ec)
fut
}
@@ -1577,7 +1577,7 @@ object NCUtils extends LazyLogging {
* @param ec
*/
def executeParallel(bodies: (() ⇒ Any)*)(implicit ec: ExecutionContext = global): Unit =
- bodies.map(body ⇒ { Future { body() } } ).foreach(f ⇒ Await.result(f, Duration.Inf))
+ bodies.map(body ⇒ { Future { body() }(ec) } ).foreach(f ⇒ Await.result(f, Duration.Inf))
/**
*
diff --git a/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoNamesGenerator.scala b/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoNamesGenerator.scala
index 5039533..c6330d5 100644
--- a/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoNamesGenerator.scala
+++ b/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoNamesGenerator.scala
@@ -361,7 +361,7 @@ object NCGeoNamesGenerator extends App {
for (country ← countries)
managed(new PrintStream(new File(s"$outDir/countries/${country.iso}.json"))) acquireAndGet { ps ⇒
- ps.println(pretty(render(decompose(country))))
+ ps.println(prettyRender(decompose(country)))
}
}
@@ -443,7 +443,7 @@ object NCGeoNamesGenerator extends App {
// Burn it.
managed(new PrintStream(new File(outSynonyms))) acquireAndGet { ps ⇒
- ps.println(pretty(render(decompose(hs))))
+ ps.println(prettyRender(decompose(hs)))
}
}
@@ -482,7 +482,7 @@ object NCGeoNamesGenerator extends App {
).sortBy(p ⇒ (p.country, p.name))
managed(new PrintStream(new File(file))) acquireAndGet { ps ⇒
- ps.println(pretty(render(decompose(sorder))))
+ ps.println(prettyRender(decompose(sorder)))
}
}
@@ -508,7 +508,7 @@ object NCGeoNamesGenerator extends App {
).toMap
managed(new PrintStream(new File(outContinents))) acquireAndGet { ps ⇒
- ps.println(pretty(render(decompose(hs))))
+ ps.println(prettyRender(decompose(hs)))
}
}
diff --git a/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoStateNamesGenerator.scala b/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoStateNamesGenerator.scala
index 6ddbe23..6393cd5 100644
--- a/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoStateNamesGenerator.scala
+++ b/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoStateNamesGenerator.scala
@@ -79,7 +79,7 @@ object NCGeoStateNamesGenerator extends App {
// Burn it.
managed(new PrintStream(new File(out))) acquireAndGet { ps ⇒
- ps.println(pretty(render(decompose(syns))))
+ ps.println(prettyRender(decompose(syns)))
}
println(s"Files generated OK: $out")
diff --git a/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoSyntheticNamesGenerator.scala b/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoSyntheticNamesGenerator.scala
index f9a2b6f..bd33df8 100644
--- a/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoSyntheticNamesGenerator.scala
+++ b/src/main/scala/org/apache/nlpcraft/server/geo/tools/NCGeoSyntheticNamesGenerator.scala
@@ -129,7 +129,7 @@ object NCGeoSyntheticNamesGenerator extends App {
// Short representation (without subcontinent and continent.)
case e: NCGeoRegion ⇒
- NCGeoSynonym(None, Some(e.name), Some(e.country.name),None, None, None, List(s))
+ NCGeoSynonym(None, Some(e.name), Some(e.country.name), None, None, None, List(s))
// Short representation (without subcontinent and continent.)
case e: NCGeoCity ⇒
@@ -157,7 +157,7 @@ object NCGeoSyntheticNamesGenerator extends App {
val data = (syns.values ++ exists).toSet
managed(new PrintStream(new File(outFile))) acquireAndGet { ps ⇒
- ps.println(pretty(render(decompose(data))))
+ ps.println(prettyRender(decompose(data)))
}
}
diff --git a/src/main/scala/org/apache/nlpcraft/server/geo/tools/metro/NCGeoMetroGenerator.scala b/src/main/scala/org/apache/nlpcraft/server/geo/tools/metro/NCGeoMetroGenerator.scala
index da81246..2a613aa 100644
--- a/src/main/scala/org/apache/nlpcraft/server/geo/tools/metro/NCGeoMetroGenerator.scala
+++ b/src/main/scala/org/apache/nlpcraft/server/geo/tools/metro/NCGeoMetroGenerator.scala
@@ -58,7 +58,7 @@ object NCGeoMetroGenerator extends App {
implicit val formats: DefaultFormats.type = net.liftweb.json.DefaultFormats
managed(new PrintStream(new File(out_vals))) acquireAndGet { ps ⇒
- ps.println(pretty(render(decompose(metro))))
+ ps.println(prettyRender(decompose(metro)))
}
println(s"File created: $out_vals")
@@ -81,7 +81,7 @@ object NCGeoMetroGenerator extends App {
})
managed(new PrintStream(new File(out_syns))) acquireAndGet { ps ⇒
- ps.println(pretty(render(decompose(sync))))
+ ps.println(prettyRender(decompose(sync)))
}
println(s"Synonyms file created: $out_syns")
diff --git a/src/main/scala/org/apache/nlpcraft/server/json/NCJson.scala b/src/main/scala/org/apache/nlpcraft/server/json/NCJson.scala
index 922408b..919b982 100644
--- a/src/main/scala/org/apache/nlpcraft/server/json/NCJson.scala
+++ b/src/main/scala/org/apache/nlpcraft/server/json/NCJson.scala
@@ -21,7 +21,7 @@ import java.io.{IOException, _}
import java.util.zip._
import com.typesafe.scalalogging.LazyLogging
-import net.liftweb.json.{compact ⇒ liftCompact, pretty ⇒ liftPretty, render ⇒ liftRender, _}
+import net.liftweb.json.{compactRender ⇒ liftCompact, prettyRender ⇒ liftPretty, _}
import org.apache.nlpcraft.common._
import scala.annotation.tailrec
@@ -90,14 +90,14 @@ class NCJson(val json: JValue) {
*
* @return String presentation of this JSON object.
*/
- def pretty: String = liftPretty(liftRender(json))
+ def pretty: String = liftPretty(json)
/**
* Renders this JSON in a compact form (suitable for exchange).
*
* @return String presentation of this JSON object.
*/
- def compact: String = liftCompact(liftRender(json))
+ def compact: String = liftCompact(json)
/**
* Zips this JSON object into array of bytes using GZIP.
diff --git a/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala b/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala
index 92168ba..d948ed4 100644
--- a/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala
+++ b/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala
@@ -228,7 +228,7 @@ object NCStopWordEnricher extends NCServerEnricher {
def add(m: mutable.HashMap[String, mutable.HashSet[T]], incl: Boolean): Unit =
poses.filter { case (_, isIncl) ⇒ isIncl == incl }.keys.foreach(pos ⇒
m.get(pos) match {
- case Some(set) ⇒ set += cond
+ case Some(set) ⇒ set.add(cond)
case _ ⇒
val set = mutable.HashSet.empty[T]