This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-398
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-398 by this push:
new b0e2b09 WIP on NLPCRAFT-398
b0e2b09 is described below
commit b0e2b09e4d7bf7931ff01039d482f46d27c47f11
Author: Aaron Radzinski <[email protected]>
AuthorDate: Tue Aug 10 12:41:06 2021 -0700
WIP on NLPCRAFT-398
---
.../apache/nlpcraft/model/NCModelAddPackage.java | 8 ++--
.../probe/mgrs/deploy/NCDeployManager.scala | 50 +++++++++++-----------
.../mgrs/deploy/NCModelNestedSamplesSpec.scala | 16 +++++++
.../probe/mgrs/deploy/NCModelReferencesSpec.scala | 40 ++++++++++++++---
.../{jv => javatest}/NCModelClassesWrapper.java | 5 ++-
.../{jv => javatest}/NCModelDeploySpecAdapter.java | 8 +++-
.../{jv => javatest}/NCModelPackagesWrapper.java | 7 ++-
.../deploy/{jv => javatest}/NCNestedClass.java | 5 ++-
.../deploy/{jv => javatest}/NCNestedStatic.java | 5 ++-
.../{sc => scalatest}/NCModelClassesWrapper.scala | 5 ++-
.../NCModelDeploySpecAdapter.scala | 5 ++-
.../{sc => scalatest}/NCModelPackagesWrapper.scala | 7 ++-
.../deploy/{sc => scalatest}/NCNestedClass.scala | 8 +++-
.../deploy/{sc => scalatest}/NCNestedStatic.scala | 9 +++-
.../model/NCEnricherNestedModelSpec5.scala | 1 +
15 files changed, 134 insertions(+), 45 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelAddPackage.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelAddPackage.java
index 5da8006..41ca9dc 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelAddPackage.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelAddPackage.java
@@ -25,8 +25,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* Annotation to add one or more JVM packages that contain classes with intent
callbacks. This annotation should be
- * applied to the main model class. When found the internal intent detection
algorithm will scan these additional
- * packages and their classes searching for intent callbacks.
+ * applied to the main model class. When found the internal intent detection
algorithm will recursively scan these
+ * additional packages and their classes searching for intent callbacks.
* <p>
* Additionally with {@link NCModelAddClasses} annotation, these two
annotations allowing to have model implementation,
* i.e. intent callbacks, in external classes not linked through sub-type
relationship to the main model class. This
@@ -47,9 +47,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Target(value=TYPE)
public @interface NCModelAddPackage {
/**
- * Array of JVM package names to additionally scan for intent callbacks.
+ * Array of JVM package names to recursively scan for intent callbacks.
*
- * @return Array of JVM package names to additionally scan for intent
callbacks.
+ * @return Array of JVM package names to recursively scan for intent
callbacks.
*/
String[] value();
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index 6edd808..e27eee6 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@ -61,8 +61,8 @@ object NCDeployManager extends NCService {
private final val CLS_SLV_CTX = classOf[NCIntentMatch]
private final val CLS_SAMPLE = classOf[NCIntentSample]
private final val CLS_SAMPLE_REF = classOf[NCIntentSampleRef]
- private final val CLS_MDL_CLASSES_REF = classOf[NCModelAddClasses]
- private final val CLS_MDL_PACKAGES_REF = classOf[NCModelAddPackage]
+ private final val CLS_MDL_CLS_REF = classOf[NCModelAddClasses]
+ private final val CLS_MDL_PKGS_REF = classOf[NCModelAddPackage]
// Java and scala lists.
private final val CLS_SCALA_SEQ = classOf[Seq[_]]
@@ -1562,8 +1562,7 @@ object NCDeployManager extends NCService {
s"origin=${mdl.getOrigin}, " +
s"class=$cls, " +
s"id=${intent.id}" +
- s"]"
- )
+ s"]")
else
intentDecls += intent
catch {
@@ -1585,7 +1584,7 @@ object NCDeployManager extends NCService {
s"origin=${mdl.getOrigin}, " +
s"class=${mo.objClassName}, " +
s"intentId=${intent.id}" +
- s"]")
+ s"]")
else {
intentDecls += intent
intents += (intent -> prepareCallback(mo, mdl, intent))
@@ -1608,8 +1607,7 @@ object NCDeployManager extends NCService {
s"origin=${mdl.getOrigin}, " +
s"callback=$mtdStr, " +
s"id=${intent.id}" +
- s"]"
- )
+ s"]")
else
bindIntent(intent, prepareCallback(mo, mdl, intent))
@@ -1625,7 +1623,7 @@ object NCDeployManager extends NCService {
s"origin=${mdl.getOrigin}, " +
s"refId=$refId, " +
s"callback=$mtdStr" +
- s"]"
+ s"]"
)
}
}
@@ -1635,20 +1633,23 @@ object NCDeployManager extends NCService {
for (m <- getAllMethods(mdl))
processMethod(MethodOwner(method = m, objClassName = null, obj =
mdl))
- // External references.
- def processReferences[T <: Annotation](clazz: Class[T], getReferences:
T => Seq[Class[_]]): Unit = {
+ /**
+ *
+ * @param clazz
+ * @param getReferences
+ * @tparam T
+ */
+ def scanAdditionalClasses[T <: Annotation](clazz: Class[T],
getReferences: T => Seq[Class[_]]): Unit = {
val anns = mdl.getClass.getAnnotationsByType(clazz)
if (anns != null && anns.nonEmpty) {
val refs = getReferences(anns.head)
if (refs == null || refs.isEmpty)
- // TODO:
throw new NCE(
- s"Invalid empty references [" +
- s"mdlId=$mdlId, " +
- s"origin=${mdl.getOrigin}, " +
- s"reference=${clazz.getName}" +
+ s"Additional reference in @${clazz.getSimpleName}
annotation is empty [" +
+ s"mdlId=$mdlId, " +
+ s"origin=${mdl.getOrigin}" +
s"]"
)
@@ -1661,23 +1662,24 @@ object NCDeployManager extends NCService {
}
}
- processReferences(CLS_MDL_CLASSES_REF, (a: NCModelAddClasses) =>
a.value())
+ // Process @NCModelAddClasses annotation.
+ scanAdditionalClasses(CLS_MDL_CLS_REF, (a: NCModelAddClasses) =>
a.value())
- processReferences(
- CLS_MDL_PACKAGES_REF,
+ // Process @NCModelAddPackages annotation.
+ scanAdditionalClasses(
+ CLS_MDL_PKGS_REF,
(a: NCModelAddPackage) =>
a.value().flatMap(p => {
if (cl.getDefinedPackage(p) == null)
throw new NCE(
- // TODO:
- s"Invalid references [" +
- s"mdlId=$mdlId, " +
- s"origin=${mdl.getOrigin}, " +
- s"reference=${CLS_MDL_PACKAGES_REF.getName}, " +
- s"package=$p" +
+ s"Invalid additional references in
@${CLS_MDL_PKGS_REF.getSimpleName} annotation [" +
+ s"mdlId=$mdlId, " +
+ s"origin=${mdl.getOrigin}, " +
+ s"package=$p" +
s"]"
)
+ //noinspection UnstableApiUsage
ClassPath.from(cl).getTopLevelClassesRecursive(p).asScala.map(_.load())
})
)
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelNestedSamplesSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelNestedSamplesSpec.scala
index 9bf3e95..0295983 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelNestedSamplesSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelNestedSamplesSpec.scala
@@ -22,15 +22,31 @@ import org.apache.nlpcraft.model.{NCIntent, NCIntentSample,
NCModelAdapter, NCRe
import org.apache.nlpcraft.probe.mgrs.model.NCModelManager
import org.junit.jupiter.api.Test
+/**
+ *
+ */
class NCModelNested extends NCModelAdapter("nlpcraft.samples.test.mdl", "Test
Model", "1.0") {
+ /**
+ *
+ * @return
+ */
@NCIntentSample(Array("a"))
@NCIntent("intent=nested term={tok_id() == 'a'}*")
def m(): NCResult = NCResult.text("OK")
}
+/**
+ *
+ */
class NCModelWrapper extends NCModelNested
+/**
+ *
+ */
class NCModelNestedSamplesSpec {
+ /**
+ *
+ */
@Test
def test(): Unit = {
try {
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelReferencesSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelReferencesSpec.scala
index 66e4794..35af10e 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelReferencesSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelReferencesSpec.scala
@@ -24,10 +24,13 @@ import org.junit.jupiter.api.Test
import java.util
/**
- * Note than we can't name packages 'java' and 'scala', so their names are
'jv' and 'sc'.
+ *
*/
-@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.sc.NCModelClassesWrapper],
startClient = true)
+@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.scalatest.NCModelClassesWrapper],
startClient = true)
class NCModelClassesWrapperScalaSpec extends NCTestContext {
+ /**
+ *
+ */
@Test
def test(): Unit = {
checkIntent("scalaClass", "scalaClass")
@@ -37,8 +40,14 @@ class NCModelClassesWrapperScalaSpec extends NCTestContext {
}
}
-@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.sc.NCModelPackagesWrapper],
startClient = true)
+/**
+ *
+ */
+@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.scalatest.NCModelPackagesWrapper],
startClient = true)
class NCModelPackagesWrapperScalaSpec extends NCTestContext {
+ /**
+ *
+ */
@Test
def test(): Unit = {
checkIntent("scalaClass", "scalaClass")
@@ -48,8 +57,14 @@ class NCModelPackagesWrapperScalaSpec extends NCTestContext {
}
}
-@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.jv.NCModelClassesWrapper],
startClient = true)
+/**
+ *
+ */
+@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.javatest.NCModelClassesWrapper],
startClient = true)
class NCModelClassesWrapperJavaSpec extends NCTestContext {
+ /**
+ *
+ */
@Test
def test(): Unit = {
checkIntent("javaClass", "javaClass")
@@ -59,8 +74,14 @@ class NCModelClassesWrapperJavaSpec extends NCTestContext {
}
}
-@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.jv.NCModelPackagesWrapper],
startClient = true)
+/**
+ *
+ */
+@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.javatest.NCModelPackagesWrapper],
startClient = true)
class NCModelPackagesWrapperJavaSpec extends NCTestContext {
+ /**
+ *
+ */
@Test
def test(): Unit = {
checkIntent("javaClass", "javaClass")
@@ -70,6 +91,9 @@ class NCModelPackagesWrapperJavaSpec extends NCTestContext {
}
}
+/**
+ *
+ */
@NCModelAddPackage(Array("org.apache.nlpcraft.probe.mgrs.deploy"))
class NCModelPackagesWrapperMix extends
NCModelAdapter("nlpcraft.deploy.test.mix.mdl", "Test Model", "1.0") {
override def getElements: util.Set[NCElement] =
@@ -81,8 +105,14 @@ class NCModelPackagesWrapperMix extends
NCModelAdapter("nlpcraft.deploy.test.mix
)
}
+/**
+ *
+ */
@NCTestEnvironment(model =
classOf[org.apache.nlpcraft.probe.mgrs.deploy.NCModelPackagesWrapperMix],
startClient = true)
class NCModelPackagesWrapperMixSpec extends NCTestContext {
+ /**
+ *
+ */
@Test
def test(): Unit = {
checkIntent("scalaClass", "scalaClass")
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelClassesWrapper.java
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelClassesWrapper.java
similarity index 93%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelClassesWrapper.java
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelClassesWrapper.java
index 18dac28..d59e43a 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelClassesWrapper.java
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelClassesWrapper.java
@@ -15,10 +15,13 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.jv;
+package org.apache.nlpcraft.probe.mgrs.deploy.javatest;
import org.apache.nlpcraft.model.NCModelAddClasses;
+/**
+ *
+ */
@NCModelAddClasses({NCNestedClass.class, NCNestedStatic.class})
public class NCModelClassesWrapper extends NCModelDeploySpecAdapter {
// No-op.
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelDeploySpecAdapter.java
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelDeploySpecAdapter.java
similarity index 93%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelDeploySpecAdapter.java
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelDeploySpecAdapter.java
index 0a88991..b4ab85a 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelDeploySpecAdapter.java
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelDeploySpecAdapter.java
@@ -15,14 +15,20 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.jv;
+package org.apache.nlpcraft.probe.mgrs.deploy.javatest;
import org.apache.nlpcraft.model.NCElement;
import org.apache.nlpcraft.model.NCModelAdapter;
import java.util.Set;
+/**
+ *
+ */
class NCModelDeploySpecAdapter extends NCModelAdapter {
+ /**
+ *
+ */
public NCModelDeploySpecAdapter() {
super("nlpcraft.deploy.test.java", "Test Model", "1.0");
}
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelPackagesWrapper.java
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelPackagesWrapper.java
similarity index 87%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelPackagesWrapper.java
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelPackagesWrapper.java
index db2dac6..a03fcb6 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCModelPackagesWrapper.java
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCModelPackagesWrapper.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.jv;
+package org.apache.nlpcraft.probe.mgrs.deploy.javatest;
import org.apache.nlpcraft.model.NCModelAddPackage;
-@NCModelAddPackage("org.apache.nlpcraft.probe.mgrs.deploy.jv")
+/**
+ *
+ */
+@NCModelAddPackage("org.apache.nlpcraft.probe.mgrs.deploy.javatest")
public class NCModelPackagesWrapper extends NCModelDeploySpecAdapter {
// No-op.
}
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCNestedClass.java
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCNestedClass.java
similarity index 94%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCNestedClass.java
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCNestedClass.java
index 8e47de2..131f02e 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCNestedClass.java
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCNestedClass.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.jv;
+package org.apache.nlpcraft.probe.mgrs.deploy.javatest;
import org.apache.nlpcraft.model.NCIntent;
import org.apache.nlpcraft.model.NCResult;
+/**
+ *
+ */
public class NCNestedClass {
@NCIntent("intent=javaClass term={tok_id() == 'javaClass'}")
public NCResult m() {
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCNestedStatic.java
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCNestedStatic.java
similarity index 94%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCNestedStatic.java
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCNestedStatic.java
index c2c86bd..a91faa9 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/jv/NCNestedStatic.java
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/javatest/NCNestedStatic.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.jv;
+package org.apache.nlpcraft.probe.mgrs.deploy.javatest;
import org.apache.nlpcraft.model.NCIntent;
import org.apache.nlpcraft.model.NCResult;
+/**
+ *
+ */
public class NCNestedStatic {
@NCIntent("intent=javaStatic term={tok_id() == 'javaStatic'}")
public static NCResult m() {
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelClassesWrapper.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelClassesWrapper.scala
similarity index 93%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelClassesWrapper.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelClassesWrapper.scala
index 5456a08..6443deb 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelClassesWrapper.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelClassesWrapper.scala
@@ -15,9 +15,12 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.sc
+package org.apache.nlpcraft.probe.mgrs.deploy.scalatest
import org.apache.nlpcraft.model.NCModelAddClasses
+/**
+ *
+ */
@NCModelAddClasses(Array(classOf[NCNestedClass], classOf[NCNestedStatic.type]))
class NCModelClassesWrapper extends NCModelDeploySpecAdapter
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelDeploySpecAdapter.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelDeploySpecAdapter.scala
similarity index 94%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelDeploySpecAdapter.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelDeploySpecAdapter.scala
index b0fa796..ba605e6 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelDeploySpecAdapter.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelDeploySpecAdapter.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.sc
+package org.apache.nlpcraft.probe.mgrs.deploy.scalatest
import org.apache.nlpcraft.NCTestElement
import org.apache.nlpcraft.model.{NCElement, NCModelAdapter}
@@ -23,6 +23,9 @@ import org.apache.nlpcraft.model.{NCElement, NCModelAdapter}
import java.util
import scala.language.implicitConversions
+/**
+ *
+ */
class NCModelDeploySpecAdapter extends
NCModelAdapter("nlpcraft.deploy.test.scala", "Test Model", "1.0") {
override def getElements: util.Set[NCElement] =
Set(NCTestElement("scalaClass"), NCTestElement("scalaStatic"))
}
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelPackagesWrapper.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelPackagesWrapper.scala
similarity index 92%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelPackagesWrapper.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelPackagesWrapper.scala
index 2c3e8ad..5bff402 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCModelPackagesWrapper.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCModelPackagesWrapper.scala
@@ -15,9 +15,12 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.sc
+package org.apache.nlpcraft.probe.mgrs.deploy.scalatest
import org.apache.nlpcraft.model.NCModelAddPackage
-@NCModelAddPackage(Array("org.apache.nlpcraft.probe.mgrs.deploy.sc"))
+/**
+ *
+ */
+@NCModelAddPackage(Array("org.apache.nlpcraft.probe.mgrs.deploy.scalatest"))
class NCModelPackagesWrapper extends NCModelDeploySpecAdapter
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCNestedClass.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCNestedClass.scala
similarity index 91%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCNestedClass.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCNestedClass.scala
index 944ca2d..352777b 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCNestedClass.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCNestedClass.scala
@@ -15,11 +15,17 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.sc
+package org.apache.nlpcraft.probe.mgrs.deploy.scalatest
import org.apache.nlpcraft.model.{NCIntent, NCResult}
+/**
+ *
+ */
class NCNestedClass {
+ /**
+ *
+ */
@NCIntent("intent=scalaClass term={tok_id() == 'scalaClass'}")
def m(): NCResult = NCResult.text("OK")
}
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCNestedStatic.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCNestedStatic.scala
similarity index 90%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCNestedStatic.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCNestedStatic.scala
index 6b03841..9790efb 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/sc/NCNestedStatic.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy/scalatest/NCNestedStatic.scala
@@ -15,11 +15,18 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.deploy.sc
+package org.apache.nlpcraft.probe.mgrs.deploy.scalatest
import org.apache.nlpcraft.model.{NCIntent, NCResult}
+/**
+ *
+ */
object NCNestedStatic {
+ /**
+ *
+ * @return
+ */
@NCIntent("intent=scalaStatic term={tok_id() == 'scalaStatic'}")
def m(): NCResult = NCResult.text("OK")
}
\ No newline at end of file
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec5.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec5.scala
index a6a7e81..f4ceeb5 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec5.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec5.scala
@@ -42,6 +42,7 @@ class NCNestedTestModel5 extends NCModelAdapter(
)
private def onBigCity(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
+
/**
*
*/
