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 1f378e9 WIP.
1f378e9 is described below
commit 1f378e910236949699c7fba5c33e553519ccd4cb
Author: Aaron Radzinski <[email protected]>
AuthorDate: Wed Oct 7 15:23:56 2020 -0700
WIP.
---
.../nlpcraft/common/ansi/NCAnsiProgressBar.scala | 15 +----
.../nlpcraft/common/ansi/NCAnsiSpinner.scala | 19 +-----
.../org/apache/nlpcraft/common/util/NCUtils.scala | 42 +++++++++++--
.../nlpcraft/examples/weather/WeatherModel.java | 1 +
.../model/intent/impl/NCIntentSolverEngine.scala | 1 -
.../nlpcraft/model/tools/cmdline/NCCli.scala | 68 +++++++++++-----------
.../test/impl/NCTestAutoModelValidatorImpl.scala | 1 -
.../org/apache/nlpcraft/probe/NCProbeBoot.scala | 19 +++---
.../nlpcraft/probe/mgrs/model/NCModelManager.scala | 3 +-
.../org/apache/nlpcraft/server/NCServer.scala | 3 +-
.../nlpcraft/server/probe/NCProbeManager.scala | 2 -
.../nlpcraft/server/query/NCQueryManager.scala | 1 -
.../nlpcraft/server/rest/NCBasicRestApi.scala | 16 ++---
.../nlpcraft/server/rest/NCRestManager.scala | 1 -
.../nlpcraft/server/user/NCUserManager.scala | 1 -
15 files changed, 93 insertions(+), 100 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala
index 28336ce..02fd8a8 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala
@@ -128,18 +128,7 @@ class NCAnsiProgressBar(
*
*/
object NCAnsiProgressBar{
- // Set of UNICODE charsets options for the progress bar.
- private final val PB_CHAR_SETS = Seq(
- Seq('[', '=', '.', ']'),
- Seq('/', '▰', '▱', '/'),
- Seq('[', '▰', '▱', ']'),
- Seq('[', '◼', '◽', ']'),
- Seq('[', '█', '_', ']'),
- Seq('[', '▰', '.', ']')
- )
-
- private final val NON_ANSI_CHAR = '='
-
// Active charset to use.
- private val CHAR_SET = PB_CHAR_SETS(5)
+ private final val NON_ANSI_CHAR = '='
+ private val CHAR_SET = Seq('[', '=', '.', ']')
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiSpinner.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiSpinner.scala
index 449e519..8e8dea5 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiSpinner.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiSpinner.scala
@@ -118,23 +118,6 @@ class NCAnsiSpinner(out: PrintWriter, useAnsi: Boolean =
true) {
*
*/
object NCAnsiSpinner {
- // Set of UNICODE charset options for the spinner.
- private final val SPIN_CHAR_SETS = Seq(
- Seq('-', '\\', '|', '/'),
- Seq('.', 'o', 'O', '@', '*'),
- Seq('←', '↖', '↑', '↗', '→', '↘', '↓', '↙'),
- Seq('▁', '▂', '▃', '▄', '▅', '▆', '▇', '█', '▇', '▆', '▅', '▄', '▃',
'▁'),
- Seq('▖', '▘', '▝', '▗'),
- Seq('┤', '┘', '┴', '└', '├', '┌', '┬', '┐'),
- Seq('◢', '◣', '◤', '◥'),
- Seq('◰', '◳', '◲', '◱'),
- Seq('◴', '◷', '◶', '◵'),
- Seq('◐', '◓', '◑', '◒'),
- Seq('◡', '⊙', '◠', '⊙'),
- Seq('⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷'),
- Seq('⠁', '⠂', '⠄', '⡀', '⢀', '⠠', '⠐', '⠈')
- )
-
// An active charset to use.
- private final val CHAR_SET = SPIN_CHAR_SETS.head
+ private final val CHAR_SET = Seq('-', '\\', '|', '/')
}
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 55eb51b..50f444a 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
@@ -1426,19 +1426,49 @@ object NCUtils extends LazyLogging {
/**
*
- * @param jsStr
+ * @param json
* @return
*/
- def prettyJson(jsStr: String): String =
- GSON.toJson(GSON.getAdapter(classOf[JsonElement]).fromJson(jsStr))
+ def prettyJson(json: String): String =
+ GSON.toJson(GSON.getAdapter(classOf[JsonElement]).fromJson(json))
/**
*
- * @param jsStr
+ * @param json
* @return
*/
- def isJsonValid(jsStr: String): Boolean =
-
scala.util.Try(GSON.getAdapter(classOf[JsonElement]).fromJson(jsStr)).isSuccess
+ def isValidJson(json: String): Boolean =
+
scala.util.Try(GSON.getAdapter(classOf[JsonElement]).fromJson(json)).isSuccess
+
+ /**
+ *
+ * @param json
+ * @param field
+ * @return
+ */
+ @throws[Exception]
+ def getJsonStringField(json: String, field: String): String =
+
GSON.getAdapter(classOf[JsonElement]).fromJson(json).getAsJsonObject.get(field).getAsString
+
+ /**
+ *
+ * @param json
+ * @param field
+ * @return
+ */
+ @throws[Exception]
+ def getJsonIntField(json: String, field: String): Int =
+
GSON.getAdapter(classOf[JsonElement]).fromJson(json).getAsJsonObject.get(field).getAsInt
+
+ /**
+ *
+ * @param json
+ * @param field
+ * @return
+ */
+ @throws[Exception]
+ def getJsonBooleanField(json: String, field: String): Boolean =
+
GSON.getAdapter(classOf[JsonElement]).fromJson(json).getAsJsonObject.get(field).getAsBoolean
/**
*
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
index b392175..2c78e70 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
@@ -133,6 +133,7 @@ public class WeatherModel extends NCModelFileAdapter {
@NCIntentSample({
"What's the local weather forecast?",
"What's the weather in Moscow?",
+ "What's the current forecast for Chicago?",
"What is the weather like outside?",
"How's the weather?",
"What's the weather forecast for the rest of the week?",
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 3ff1e3c..e42c92c 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,6 @@ 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.NCAnsi._
import collection.convert.ImplicitConversions._
import scala.collection.mutable
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
index 720ffa7..cba9d9d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
@@ -17,7 +17,6 @@
package org.apache.nlpcraft.model.tools.cmdline
-import com.google.gson._
import javax.net.ssl.SSLException
import org.apache.commons.lang3.SystemUtils
import org.apache.http.HttpResponse
@@ -127,8 +126,6 @@ object NCCli extends App {
private var term: Terminal = _
- private val gson = new GsonBuilder().setPrettyPrinting().create
-
case class SplitError(index: Int)
extends Exception
case class NoLocalServer()
@@ -620,9 +617,7 @@ object NCCli extends App {
* @return
*/
private def restHealth(endpoint: String): Int =
- httpGet(endpoint, "health", new ResponseHandler[Int]() {
- override def handleResponse(resp: HttpResponse): Int =
resp.getStatusLine.getStatusCode
- })
+ httpGet(endpoint, "health",
mkHttpHandler(_.getStatusLine.getStatusCode))
/**
*
@@ -1329,6 +1324,14 @@ object NCCli extends App {
/**
*
+ * @param body
+ * @return
+ */
+ private def mkHttpHandler[T](body: HttpResponse ⇒ T): ResponseHandler[T] =
+ (resp: HttpResponse) => body(resp)
+
+ /**
+ *
* @param cmd Command descriptor.
* @param args Arguments, if any, for this command.
* @param repl Whether or not executing from REPL.
@@ -1337,7 +1340,7 @@ object NCCli extends App {
val path = args.find(_.parameter.id == "path").getOrElse(throw
MissingParameter(cmd, "path")).value.get
val rawJson = stripQuotes(args.find(_.parameter.id ==
"json").getOrElse(throw MissingParameter(cmd, "json")).value.get)
- if (!U.isJsonValid(rawJson))
+ if (!U.isValidJson(rawJson))
throw MalformedJson()
if (!REST_PATHS.exists(_._1 == path))
@@ -1345,37 +1348,35 @@ object NCCli extends App {
val endpoint = getRestEndpointFromBeacon
- val handler = new ResponseHandler[HttpRestResponse] {
- override def handleResponse(resp: HttpResponse): HttpRestResponse
= {
- val status = resp.getStatusLine
+ val resp = httpPost(endpoint, path, mkHttpHandler(resp ⇒ {
+ val status = resp.getStatusLine
- HttpRestResponse(
- status.getStatusCode,
- Option(EntityUtils.toString(resp.getEntity)).getOrElse(
- throw new IllegalStateException(s"Unexpected REST
error: ${status.getReasonPhrase}")
- )
+ HttpRestResponse(
+ status.getStatusCode,
+ Option(EntityUtils.toString(resp.getEntity)).getOrElse(
+ throw new IllegalStateException(s"Unexpected REST error:
${status.getReasonPhrase}")
)
- }
- }
-
- val resp = httpPost(endpoint, path, handler, stripQuotes(rawJson))
+ )
+ }), stripQuotes(rawJson))
// Ack HTTP response code.
logln(s"HTTP ${if (resp.code == 200) g("200") else r(resp.code)}")
- if (resp.code == 200) {
- if (path == "signin") {
- // TODO
- }
- else if (path == "signout") {
- // TODO
- }
+ if (U.isValidJson(resp.data))
+ logln(U.colorJson(U.prettyJson(resp.data)))
+ else {
+ if (resp.code == 200)
+ logln(s"HTTP response: ${resp.data}")
+ else
+ error(s"HTTP error: ${resp.data}")
}
- if (resp.code == 200 || resp.code == 400)
- logln(U.colorJson(U.prettyJson(resp.data))) // TODO
- else
- logln(resp.data)
+ if (resp.code == 200) {
+ if (path == "signin")
+ replState.accessToken = Some(U.getJsonStringField(resp.data,
"acsTok"))
+ else if (path == "signout")
+ replState.accessToken = None
+ }
}
/**
@@ -1393,7 +1394,6 @@ object NCCli extends App {
parser.setEofOnUnclosedQuote(true)
parser.regexCommand("")
parser.regexVariable("")
- parser.setEscapeChars(null)
val completer = new Completer {
private val cmds = CMDS.map(c ⇒ c.name → c.synopsis)
@@ -1475,7 +1475,7 @@ object NCCli extends App {
.completer(completer)
.parser(parser)
.history(new DefaultHistory())
- .variable(LineReader.SECONDARY_PROMPT_PATTERN,
s"${g("\u2026\u25b6")} ")
+ .variable(LineReader.SECONDARY_PROMPT_PATTERN, s"${g("...>")} ")
.variable(LineReader.INDENTATION, 2)
.build
@@ -1505,10 +1505,10 @@ object NCCli extends App {
while (!exit) {
val rawLine = try {
val srvStr = bo(s"${if (replState.isServerOnline) s"ON " else
s"OFF "}")
- val acsTokStr =
bo(s"${replState.accessToken.getOrElse("<signed off>")} ")
+ val acsTokStr =
bo(s"${replState.accessToken.getOrElse("<signed out>")} ")
reader.printAbove("\n" + rb(w(s" server: $srvStr")) + wb(k(s"
acsTok: $acsTokStr")))
- reader.readLine(s"${g("\u25b6")} ")
+ reader.readLine(s"${g(">")} ")
}
catch {
case _: UserInterruptException ⇒ "" // Ignore.
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 9f94fc0..607e216 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,6 @@ 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.NCAnsi._
/**
* Implementation for `NCTestAutoModelValidator` class.
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 e5c11e9..535a8f7 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,6 @@ 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.NCAnsi._
import org.apache.nlpcraft.common._
import scala.collection.JavaConverters._
@@ -351,7 +350,7 @@ private [probe] object NCProbeBoot extends LazyLogging with
NCOpenCensusTrace {
U.asciiLogo() +
s"${U.NL}" +
s"Embedded Data Probe${U.NL}" +
- s"Version: ${ansiBold(ver.version)}${U.NL}" +
+ s"Version: ${bo(ver.version)}${U.NL}" +
s"${NCVersion.copyright}${U.NL}"
)
}
@@ -364,14 +363,14 @@ private [probe] object NCProbeBoot extends LazyLogging
with NCOpenCensusTrace {
val ver = NCVersion.getCurrent
- tbl += (s"${ansiBlueFg}Probe ID$ansiReset",
s"$ansiBold${cfg.id}$ansiReset")
- tbl += (s"${ansiBlueFg}Probe Token$ansiReset", cfg.token)
- tbl += (s"${ansiBlueFg}API Version$ansiReset", ver.version + ", " +
ver.date.toString)
- tbl += (s"${ansiBlueFg}Down-Link$ansiReset", cfg.downLinkString)
- tbl += (s"${ansiBlueFg}Up-Link$ansiReset", cfg.upLinkString)
- tbl += (s"${ansiBlueFg}Lifecycle$ansiReset", cfg.lifecycle)
- tbl += (s"${ansiBlueFg}Models (${cfg.modelsSeq.size})$ansiReset" ,
cfg.modelsSeq)
- tbl += (s"${ansiBlueFg}JARs Folder$ansiReset",
cfg.jarsFolder.getOrElse(""))
+ tbl += (s"${B}Probe ID$RST", s"$BO${cfg.id}$RST")
+ tbl += (s"${B}Probe Token$RST", cfg.token)
+ tbl += (s"${B}API Version$RST", ver.version + ", " + ver.date.toString)
+ tbl += (s"${B}Down-Link$RST", cfg.downLinkString)
+ tbl += (s"${B}Up-Link$RST", cfg.upLinkString)
+ tbl += (s"${B}Lifecycle$RST", cfg.lifecycle)
+ tbl += (s"${B}Models (${cfg.modelsSeq.size})$RST" , cfg.modelsSeq)
+ tbl += (s"${B}JARs Folder$RST", cfg.jarsFolder.getOrElse(""))
tbl.info(logger, Some("Probe Configuration:"))
}
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 844df70..43f108d 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,6 @@ 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.NCAnsi._
import scala.collection.convert.DecorateAsScala
import scala.util.control.Exception._
@@ -67,7 +66,7 @@ object NCModelManager extends NCService with DecorateAsScala {
tbl += (
Seq(
s"${mdl.getName}",
- s"ID: ${ansiBold(mdl.getId)}, ver: ${mdl.getVersion}",
+ s"ID: ${bo(mdl.getId)}, ver: ${mdl.getVersion}",
s"Elements: $elmCnt" + (if (elmCnt == 0) s"
${r("(!)")}" else ""),
s"Synonyms: $synCnt" + (if (synCnt == 0) s"
${r("(!)")}" else ""),
s"Intents: $intentCnt" + (if (intentCnt == 0) s"
${r("(!)")}" else "")
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 808f56b..d5e6b7a 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
@@ -25,7 +25,6 @@ import com.typesafe.scalalogging.LazyLogging
import org.apache.commons.lang3.SystemUtils
import org.apache.nlpcraft.common._
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
@@ -78,7 +77,7 @@ object NCServer extends App with NCIgniteInstance with
LazyLogging with NCOpenCe
U.asciiLogo() +
s"${U.NL}" +
s"Server${U.NL}" +
- s"Version: ${ansiBold(ver.version)}${U.NL}" +
+ s"Version: ${bo(ver.version)}${U.NL}" +
s"${NCVersion.copyright}${U.NL}"
)
}
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 bb19c26..354739a 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
@@ -22,7 +22,6 @@ import java.net.{InetSocketAddress, ServerSocket, Socket,
SocketTimeoutException
import java.security.Key
import java.util
import java.util.Collections
-import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.ConcurrentHashMap
import com.google.gson.Gson
@@ -43,7 +42,6 @@ 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.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 7082c0e..0b71c04 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,6 @@ 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.NCAnsi._
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.{Future, Promise}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
index fe6aa23..4d725c9 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
@@ -1855,14 +1855,14 @@ class NCBasicRestApi extends NCRestApi with LazyLogging
with NCOpenCensusTrace w
*
* @return
*/
- def getRejectionHandler: RejectionHandler =
- RejectionHandler.newBuilder().
- handle {
- // It doesn't try to process all rejections special way.
- // There is only one reason to wrap rejections - use 'cors'
support in completeError() method.
- // We assume that all rejection implementations have human
readable toString() implementations.
- case err ⇒ completeError(StatusCodes.BadRequest, "NC_ERROR",
s"Bad request: $err")
- }.result
+ def getRejectionHandler: RejectionHandler = RejectionHandler.newBuilder().
+ handle {
+ // It doesn't try to process all rejections special way.
+ // There is only one reason to wrap rejections - use 'cors'
support in completeError() method.
+ // We assume that all rejection implementations have human
readable toString() implementations.
+ case err ⇒ completeError(StatusCodes.BadRequest, "NC_ERROR", s"Bad
request: $err")
+ }
+ .result
/**
*
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCRestManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCRestManager.scala
index 91f2d9d..fa77d2b 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCRestManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCRestManager.scala
@@ -24,7 +24,6 @@ import akka.stream.Materializer
import io.opencensus.trace.Span
import org.apache.nlpcraft.common.config.NCConfigurable
import org.apache.nlpcraft.common.{NCService, _}
-import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.concurrent.{ExecutionContextExecutor, Future}
import scala.util.{Failure, Success}
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 0d2fcf2..bbf169e 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
@@ -30,7 +30,6 @@ import org.apache.nlpcraft.server.ignite.NCIgniteInstance
import org.apache.nlpcraft.server.mdo.{NCUserMdo, NCUserPropertyMdo}
import org.apache.nlpcraft.server.sql.{NCSql, NCSqlManager}
import org.apache.nlpcraft.server.tx.NCTxManager
-import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.collection.JavaConverters._
import scala.util.control.Exception._
