This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-520
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-520 by this push:
new 8338ad09 WIP.
8338ad09 is described below
commit 8338ad091481068bf80bdf83f3ffda354db51667
Author: Sergey Kamov <[email protected]>
AuthorDate: Wed Dec 21 10:38:09 2022 +0400
WIP.
---
.../scala/org/apache/nlpcraft/examples/time/CalculatorModel.scala | 2 +-
.../org/apache/nlpcraft/examples/pizzeria/PizzeriaModelSpec.scala | 4 ++--
.../apache/nlpcraft/examples/time/utils/keycdn/GeoManager.scala | 2 +-
.../src/main/scala/org/apache/nlpcraft/NCPropertyMapAdapter.scala | 2 +-
.../org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/nlpcraft-examples/calculator/src/main/scala/org/apache/nlpcraft/examples/time/CalculatorModel.scala
b/nlpcraft-examples/calculator/src/main/scala/org/apache/nlpcraft/examples/time/CalculatorModel.scala
index e1eb0a9c..2725b49b 100644
---
a/nlpcraft-examples/calculator/src/main/scala/org/apache/nlpcraft/examples/time/CalculatorModel.scala
+++
b/nlpcraft-examples/calculator/src/main/scala/org/apache/nlpcraft/examples/time/CalculatorModel.scala
@@ -53,7 +53,7 @@ class CalculatorModel extends
NCModel(NCModelConfig("nlpcraft.calculator.ex", "C
private var mem: Option[Int] = None
private def calc(x: Int, op: String, y: Int): NCResult =
- mem = Some(OPS.getOrElse(op, throw new
IllegalStateException()).apply(x, y))
+ mem = Option(OPS.getOrElse(op, throw new
IllegalStateException()).apply(x, y))
NCResult(mem.get)
/*
diff --git
a/nlpcraft-examples/pizzeria/src/test/scala/org/apache/nlpcraft/examples/pizzeria/PizzeriaModelSpec.scala
b/nlpcraft-examples/pizzeria/src/test/scala/org/apache/nlpcraft/examples/pizzeria/PizzeriaModelSpec.scala
index df559a66..6f619b60 100644
---
a/nlpcraft-examples/pizzeria/src/test/scala/org/apache/nlpcraft/examples/pizzeria/PizzeriaModelSpec.scala
+++
b/nlpcraft-examples/pizzeria/src/test/scala/org/apache/nlpcraft/examples/pizzeria/PizzeriaModelSpec.scala
@@ -45,10 +45,10 @@ object PizzeriaModelSpec:
private val o = new PizzeriaOrder
o.setState(DIALOG_EMPTY)
def withPizza(name: String, size: String, qty: Int): Builder =
- o.add(Seq(Pizza(name, Some(size), Some(qty))), Seq.empty)
+ o.add(Seq(Pizza(name, Option(size), Option(qty))), Seq.empty)
this
def withDrink(name: String, qty: Int): Builder =
- o.add(Seq.empty, Seq(Drink(name, Some(qty))))
+ o.add(Seq.empty, Seq(Drink(name, Option(qty))))
this
def build: PizzeriaOrder = o
diff --git
a/nlpcraft-examples/time/src/main/scala/org/apache/nlpcraft/examples/time/utils/keycdn/GeoManager.scala
b/nlpcraft-examples/time/src/main/scala/org/apache/nlpcraft/examples/time/utils/keycdn/GeoManager.scala
index 4be4d224..49a5e12c 100644
---
a/nlpcraft-examples/time/src/main/scala/org/apache/nlpcraft/examples/time/utils/keycdn/GeoManager.scala
+++
b/nlpcraft-examples/time/src/main/scala/org/apache/nlpcraft/examples/time/utils/keycdn/GeoManager.scala
@@ -76,7 +76,7 @@ object GeoManager:
cache.put(ip, resp.data.geo)
- Some(resp.data.geo)
+ Option(resp.data.geo)
}
case None =>
System.err.println("External IP cannot be detected for
localhost.")
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCPropertyMapAdapter.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCPropertyMapAdapter.scala
index b64da299..20470374 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCPropertyMapAdapter.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCPropertyMapAdapter.scala
@@ -31,7 +31,7 @@ class NCPropertyMapAdapter extends NCPropertyMap:
override def get[T](key: String): Option[T] =
map.get(key) match
case null => None
- case x => Some(x.asInstanceOf[T])
+ case x => x.asInstanceOf[T].`?`
override def put[T](key: String, obj: Any): T = map.put(key,
obj).asInstanceOf[T]
override def putIfAbsent[T](key: String, obj: T): T = map.putIfAbsent(key,
obj).asInstanceOf[T]
override def contains(key: String): Boolean = map.containsKey(key)
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala
index d7385e98..96a8235d 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala
@@ -55,10 +55,10 @@ class NCModelCallbacksSpec extends AnyFunSuite:
else RESULT_INTENT
override def onMatchedIntent(ctx: NCContext, im: NCIntentMatch):
Boolean = getOrElse(MatchFalse, false, true)
- override def onContext(ctx: NCContext): Option[NCResult] =
getOrElse(ContextNotNull, Some(RESULT_CONTEXT), None)
- override def onResult(ctx: NCContext, im: NCIntentMatch, res:
NCResult): Option[NCResult] = getOrElse(ResultNotNull, Some(RESULT_RESULT),
None)
- override def onRejection(ctx: NCContext, im:
Option[NCIntentMatch], e: NCRejection): Option[NCResult] =
getOrElse(RejectionNotNull, Some(RESULT_REJECTION), None)
- override def onError(ctx: NCContext, e: Throwable):
Option[NCResult] = getOrElse(ErrorNotNull, Some(RESULT_ERROR), None)
+ override def onContext(ctx: NCContext): Option[NCResult] =
getOrElse(ContextNotNull, Option(RESULT_CONTEXT), None)
+ override def onResult(ctx: NCContext, im: NCIntentMatch, res:
NCResult): Option[NCResult] = getOrElse(ResultNotNull, Option(RESULT_RESULT),
None)
+ override def onRejection(ctx: NCContext, im:
Option[NCIntentMatch], e: NCRejection): Option[NCResult] =
getOrElse(RejectionNotNull, Option(RESULT_REJECTION), None)
+ override def onError(ctx: NCContext, e: Throwable):
Option[NCResult] = getOrElse(ErrorNotNull, Option(RESULT_ERROR), None)
MDL.pipeline.entParsers +=
NCTestUtils.mkEnSemanticParser(List(NCSemanticTestElement("x")))
