You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2022/10/17 05:56:40 UTC
[incubator-nlpcraft] branch master updated: Minor refactoring.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/master by this push:
new addefa53 Minor refactoring.
addefa53 is described below
commit addefa5377d98a5cc1dc8a8bcb7f3e7fcd4b64b9
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Mon Oct 17 09:56:30 2022 +0400
Minor refactoring.
---
.../{NCModelValidationSpec.scala => LightSwitchFrModelSpec.scala} | 2 +-
.../{NCModelValidationSpec.scala => LightSwitchRuModelSpec.scala} | 2 +-
.../{LightSwitchScalaModel.scala => LightSwitchModel.scala} | 2 +-
.../{LightSwitchScalaModelSpec.scala => LightSwitchModelSpec.scala} | 4 ++--
.../org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala | 0
.../org/apache/nlpcraft/examples/pizzeria/PizzeriaOrder.scala | 0
.../nlpcraft/examples/pizzeria/components/PizzeriaModelPipeline.scala | 0
.../nlpcraft/examples/pizzeria/components/PizzeriaOrderMapper.scala | 0
.../examples/pizzeria/components/PizzeriaOrderValidator.scala | 0
.../time/{NCModelValidationSpec.scala => TimeModelSpec.scala} | 2 +-
10 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/nlpcraft-examples/lightswitch-fr/src/test/scala/org/apache/nlpcraft/examples/lightswitch/NCModelValidationSpec.scala b/nlpcraft-examples/lightswitch-fr/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchFrModelSpec.scala
similarity index 97%
rename from nlpcraft-examples/lightswitch-fr/src/test/scala/org/apache/nlpcraft/examples/lightswitch/NCModelValidationSpec.scala
rename to nlpcraft-examples/lightswitch-fr/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchFrModelSpec.scala
index 43ae3aba..4e9a6191 100644
--- a/nlpcraft-examples/lightswitch-fr/src/test/scala/org/apache/nlpcraft/examples/lightswitch/NCModelValidationSpec.scala
+++ b/nlpcraft-examples/lightswitch-fr/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchFrModelSpec.scala
@@ -25,7 +25,7 @@ import scala.util.Using
/**
* JUnit models validation.
*/
-class NCModelValidationSpec extends AnyFunSuite:
+class LightSwitchFrModelSpec extends AnyFunSuite:
test("test") {
Using.resource(new NCModelClient(new LightSwitchFrModel)) { client =>
def check(txt: String): Unit =
diff --git a/nlpcraft-examples/lightswitch-ru/src/test/scala/org/apache/nlpcraft/examples/lightswitch/NCModelValidationSpec.scala b/nlpcraft-examples/lightswitch-ru/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchRuModelSpec.scala
similarity index 97%
rename from nlpcraft-examples/lightswitch-ru/src/test/scala/org/apache/nlpcraft/examples/lightswitch/NCModelValidationSpec.scala
rename to nlpcraft-examples/lightswitch-ru/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchRuModelSpec.scala
index b4518982..0a1d2814 100644
--- a/nlpcraft-examples/lightswitch-ru/src/test/scala/org/apache/nlpcraft/examples/lightswitch/NCModelValidationSpec.scala
+++ b/nlpcraft-examples/lightswitch-ru/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchRuModelSpec.scala
@@ -25,7 +25,7 @@ import scala.util.Using
/**
* JUnit models validation.
*/
-class NCModelValidationSpec extends AnyFunSuite:
+class LightSwitchRuModelSpec extends AnyFunSuite:
test("test") {
Using.resource(new NCModelClient(new LightSwitchRuModel)) { client =>
def check(txt: String): Unit =
diff --git a/nlpcraft-examples/lightswitch/src/main/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModel.scala b/nlpcraft-examples/lightswitch/src/main/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchModel.scala
similarity index 97%
rename from nlpcraft-examples/lightswitch/src/main/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModel.scala
rename to nlpcraft-examples/lightswitch/src/main/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchModel.scala
index 801a4621..1974b7fc 100644
--- a/nlpcraft-examples/lightswitch/src/main/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModel.scala
+++ b/nlpcraft-examples/lightswitch/src/main/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchModel.scala
@@ -36,7 +36,7 @@ import org.apache.nlpcraft.nlp.parsers.{NCOpenNLPTokenParser, NCSemanticEntityPa
*
* See 'README.md' file in the same folder for running and testing instructions.
*/
-class LightSwitchScalaModel extends NCModelAdapter(
+class LightSwitchModel extends NCModelAdapter(
NCModelConfig("nlpcraft.lightswitch.java.ex", "LightSwitch Example Model", "1.0"),
new NCPipelineBuilder().withSemantic("en", "lightswitch_model.yaml").build
):
diff --git a/nlpcraft-examples/lightswitch/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModelSpec.scala b/nlpcraft-examples/lightswitch/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchModelSpec.scala
similarity index 96%
rename from nlpcraft-examples/lightswitch/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModelSpec.scala
rename to nlpcraft-examples/lightswitch/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchModelSpec.scala
index 94d770af..0e6e81a8 100644
--- a/nlpcraft-examples/lightswitch/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModelSpec.scala
+++ b/nlpcraft-examples/lightswitch/src/test/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchModelSpec.scala
@@ -25,7 +25,7 @@ import scala.util.Using
/**
* JUnit models validation.
*/
-class LightSwitchScalaModelSpec extends AnyFunSuite:
+class LightSwitchModelSpec extends AnyFunSuite:
private def test(mdl: NCModel): Unit = Using.resource(new NCModelClient(mdl)) { client =>
def check(txt: String): Unit =
require(client.debugAsk(txt, "userId", true).getIntentId == "ls")
@@ -55,5 +55,5 @@ class LightSwitchScalaModelSpec extends AnyFunSuite:
}
test("test") {
- test(new LightSwitchScalaModel())
+ test(new LightSwitchModel())
}
diff --git a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala b/nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
similarity index 100%
rename from nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
rename to nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
diff --git a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaOrder.scala b/nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/PizzeriaOrder.scala
similarity index 100%
rename from nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaOrder.scala
rename to nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/PizzeriaOrder.scala
diff --git a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaModelPipeline.scala b/nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaModelPipeline.scala
similarity index 100%
rename from nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaModelPipeline.scala
rename to nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaModelPipeline.scala
diff --git a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderMapper.scala b/nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderMapper.scala
similarity index 100%
rename from nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderMapper.scala
rename to nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderMapper.scala
diff --git a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala b/nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
similarity index 100%
rename from nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
rename to nlpcraft-examples/pizzeria/src/main/scala/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
diff --git a/nlpcraft-examples/time/src/test/scala/org/apache/nlpcraft/examples/time/NCModelValidationSpec.scala b/nlpcraft-examples/time/src/test/scala/org/apache/nlpcraft/examples/time/TimeModelSpec.scala
similarity index 97%
rename from nlpcraft-examples/time/src/test/scala/org/apache/nlpcraft/examples/time/NCModelValidationSpec.scala
rename to nlpcraft-examples/time/src/test/scala/org/apache/nlpcraft/examples/time/TimeModelSpec.scala
index 694e226d..52012ecb 100644
--- a/nlpcraft-examples/time/src/test/scala/org/apache/nlpcraft/examples/time/NCModelValidationSpec.scala
+++ b/nlpcraft-examples/time/src/test/scala/org/apache/nlpcraft/examples/time/TimeModelSpec.scala
@@ -25,7 +25,7 @@ import scala.util.Using
/**
* JUnit model validation.
*/
-class NCModelValidationSpec extends AnyFunSuite:
+class TimeModelSpec extends AnyFunSuite:
test("test") {
Using.resource(new NCModelClient(new TimeModel())) { client =>
def check(txt: String, intentId: String): Unit =