This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-108
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-108 by this push:
new c79afbd WIP.
c79afbd is described below
commit c79afbd80085bb030ff16f78edd5a45414acb9ac
Author: Aaron Radzinski <[email protected]>
AuthorDate: Thu Sep 24 21:02:21 2020 -0700
WIP.
---
nlpcraft/src/main/scala/org/apache/nlpcraft/NCStart.scala | 4 ++--
.../src/main/scala/org/apache/nlpcraft/common/NCService.scala | 2 +-
.../nlpcraft/common/ansi/{NCAnsiColor.scala => NCAnsi.scala} | 8 ++++----
.../scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala | 2 +-
.../src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala | 2 +-
.../main/scala/org/apache/nlpcraft/model/impl/NCTokenLogger.scala | 2 +-
.../org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala | 2 +-
.../apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala | 2 +-
.../org/apache/nlpcraft/model/tools/cmdline/NCCommandLine.scala | 6 +++---
.../model/tools/test/impl/NCTestAutoModelValidatorImpl.scala | 2 +-
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbe.scala | 4 ++--
.../src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 +-
.../org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala | 2 +-
.../apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 2 +-
nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala | 6 +++---
.../scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala | 2 +-
.../scala/org/apache/nlpcraft/server/query/NCQueryManager.scala | 2 +-
.../scala/org/apache/nlpcraft/common/ascii/NCAsciiTableSpec.scala | 2 +-
18 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCStart.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCStart.scala
index c0d6f59..b5bcce1 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCStart.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCStart.scala
@@ -22,8 +22,8 @@ import org.apache.nlpcraft.common.version.NCVersion
import org.apache.nlpcraft.probe.NCProbe
import org.apache.nlpcraft.server.NCServer
import org.apache.nlpcraft.common._
-import org.apache.nlpcraft.common.ansi.NCAnsiColor
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi
+import org.apache.nlpcraft.common.ansi.NCAnsi._
/**
* Server or probe command line starter.
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/NCService.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/NCService.scala
index a3a5e12..2e1be93 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/NCService.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/NCService.scala
@@ -20,7 +20,7 @@ package org.apache.nlpcraft.common
import com.typesafe.scalalogging.LazyLogging
import io.opencensus.trace.Span
import org.apache.nlpcraft.common.opencensus.NCOpenCensusTrace
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.compat.Platform._
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiColor.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsi.scala
similarity index 96%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiColor.scala
rename to nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsi.scala
index b140b14..a00b49e 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiColor.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsi.scala
@@ -21,10 +21,10 @@ import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.common._
/**
- * Scala 2.13 shim for `scala.io.AnsiColor`.
+ * Scala 2.13 shim for `scala.io.AnsiColor` + more functionality.
*/
-trait NCAnsiColor extends LazyLogging {
- import NCAnsiColor._
+sealed trait NCAnsi extends LazyLogging {
+ import NCAnsi._
private final val BLACK = "\u001b[30m"
private final val RED = "\u001b[31m"
@@ -83,7 +83,7 @@ trait NCAnsiColor extends LazyLogging {
def ansiBlue(s: String): String = s"$ansiBlueFg$s$ansiReset"
}
-object NCAnsiColor extends NCAnsiColor {
+object NCAnsi extends NCAnsi {
// Enabled by default.
// NOTE: it's not static as it can be changed at runtime.
private final val PROP = "NLPCRAFT_ANSI_COLOR_DISABLED"
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
index daf586a..d314966 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
@@ -23,7 +23,7 @@ import com.typesafe.scalalogging.Logger
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.common.ascii.NCAsciiTable._
import resource._
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.collection.JavaConverters._
import scala.collection.mutable
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
index 96a7e88..d2f2dbf 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
@@ -44,7 +44,7 @@ import org.apache.commons.codec.binary.Base64
import org.apache.commons.codec.digest.DigestUtils
import org.apache.commons.io.IOUtils
import org.apache.nlpcraft.common._
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import org.apache.nlpcraft.common.blowfish.NCBlowfishHasher
import resource._
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 0598912..b43cda0 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
@@ -26,7 +26,7 @@ import org.apache.nlpcraft.common.ascii._
import org.apache.nlpcraft.common.nlp._
import org.apache.nlpcraft.model.NCToken
import org.apache.nlpcraft.model.impl.NCTokenPimp._
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.collection.JavaConverters._
import scala.collection._
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala
index 267cf91..ce6e1ca 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala
@@ -27,7 +27,7 @@ import org.apache.nlpcraft.model.impl.NCVariantImpl
import org.apache.nlpcraft.model.intent.utils.NCDslIntent
import org.apache.nlpcraft.model.{NCContext, NCIntentMatch, NCIntentSkip,
NCModel, NCRejection, NCResult, NCToken, NCVariant}
import org.apache.nlpcraft.probe.mgrs.dialogflow.NCDialogFlowManager
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.collection.JavaConverters._
/**
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
index 0ca1897..e82fc67 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
@@ -28,7 +28,7 @@ import org.apache.nlpcraft.model.intent.utils.{NCDslFlowItem,
NCDslIntent, NCDsl
import org.apache.nlpcraft.model._
import org.apache.nlpcraft.model.impl.NCTokenLogger
import org.apache.nlpcraft.probe.mgrs.dialogflow.NCDialogFlowManager
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import collection.convert.ImplicitConversions._
import scala.collection.mutable
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCommandLine.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCommandLine.scala
index 8647df6..c1a31ce 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCommandLine.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCommandLine.scala
@@ -22,8 +22,8 @@ import java.io.{File, FileInputStream, ObjectInputStream}
import org.apache.commons.lang3.SystemUtils
import org.apache.nlpcraft.common.ascii.NCAsciiTable
import org.apache.nlpcraft.common._
-import org.apache.nlpcraft.common.ansi.NCAnsiColor
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import org.apache.nlpcraft.common.version.NCVersion
import resource.managed
@@ -319,7 +319,7 @@ object NCCommandLine extends App {
* @param params Parameters, if any, for this command.
*/
private def cmdNoAnsi(cmd: Command, params: Seq[String]): Unit = {
- NCAnsiColor.setEnabled(false)
+ NCAnsi.setEnabled(false)
}
/**
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 b6d7d31..ad7f4f9 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.NCTestClientBuilder
import org.apache.nlpcraft.model._
import org.apache.nlpcraft.probe.mgrs.model.NCModelManager
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
/**
* Implementation for `NCTestAutoModelValidator` class.
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbe.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbe.scala
index 3283e72..33d7aa6 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbe.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbe.scala
@@ -19,7 +19,7 @@ package org.apache.nlpcraft.probe
import java.util.concurrent.CompletableFuture
-import org.apache.nlpcraft.common.ansi.NCAnsiColor
+import org.apache.nlpcraft.common.ansi.NCAnsi
import scala.util.control.Exception.ignoring
@@ -29,7 +29,7 @@ import scala.util.control.Exception.ignoring
object NCProbe extends App {
val fut = new CompletableFuture[Integer]
- NCAnsiColor.ackStatus()
+ NCAnsi.ackStatus()
NCProbeBoot.start(args, fut)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
index 3051158..d5d7177 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -48,7 +48,7 @@ import
org.apache.nlpcraft.probe.mgrs.nlp.enrichers.sort.NCSortEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.stopword.NCStopWordEnricher
import
org.apache.nlpcraft.probe.mgrs.nlp.enrichers.suspicious.NCSuspiciousNounsEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.validate.NCValidateManager
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.collection.JavaConverters._
import scala.collection.mutable
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 88bac77..86bfa47 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
@@ -23,7 +23,7 @@ import org.apache.nlpcraft.common.ascii.NCAsciiTable
import org.apache.nlpcraft.model._
import org.apache.nlpcraft.probe.mgrs.NCProbeModel
import org.apache.nlpcraft.probe.mgrs.deploy._
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.collection.convert.DecorateAsScala
import scala.util.control.Exception._
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
index 191e228..304c026 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
@@ -26,7 +26,7 @@ import java.util.{Date, Objects}
import io.opencensus.trace.{Span, Status}
import org.apache.nlpcraft.common.NCErrorCodes._
import org.apache.nlpcraft.common._
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import org.apache.nlpcraft.common.ascii.NCAsciiTable
import org.apache.nlpcraft.common.config.NCConfigurable
import org.apache.nlpcraft.common.debug.NCLogHolder
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
index ec3af09..4b46039 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
@@ -24,8 +24,8 @@ import com.typesafe.config.Config
import com.typesafe.scalalogging.LazyLogging
import org.apache.commons.lang3.SystemUtils
import org.apache.nlpcraft.common._
-import org.apache.nlpcraft.common.ansi.NCAnsiColor
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import org.apache.nlpcraft.common.ascii.NCAsciiTable
import org.apache.nlpcraft.common.config.NCConfigurable
import org.apache.nlpcraft.common.extcfg.NCExternalConfigManager
@@ -168,7 +168,7 @@ object NCServer extends App with NCIgniteInstance with
LazyLogging with NCOpenCe
*
*/
private def start(): Unit = {
- NCAnsiColor.ackStatus()
+ NCAnsi.ackStatus()
setSysProps()
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 59616a8..f939248 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,7 +43,7 @@ import
org.apache.nlpcraft.server.nlp.enrichers.NCServerEnrichmentManager
import org.apache.nlpcraft.server.proclog.NCProcessLogManager
import org.apache.nlpcraft.server.query.NCQueryManager
import org.apache.nlpcraft.server.sql.NCSql
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.collection.JavaConverters._
import scala.collection.{Map, mutable}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
index c1d2b26..213b541 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
@@ -35,7 +35,7 @@ import org.apache.nlpcraft.server.probe.NCProbeManager
import org.apache.nlpcraft.server.proclog.NCProcessLogManager
import org.apache.nlpcraft.server.tx.NCTxManager
import org.apache.nlpcraft.server.user.NCUserManager
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.{Future, Promise}
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/common/ascii/NCAsciiTableSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/common/ascii/NCAsciiTableSpec.scala
index 6153aac..01edb3e 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/common/ascii/NCAsciiTableSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/common/ascii/NCAsciiTableSpec.scala
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.common.ascii
import org.junit.jupiter.api.Test
-import org.apache.nlpcraft.common.ansi.NCAnsiColor._
+import org.apache.nlpcraft.common.ansi.NCAnsi._
/**
* Test for ASCII text table.
