[incubator-nlpcraft] branch master-model updated: WIP.

[sergeykamov]

This is an automated email from the ASF dual-hosted git repository.

sergeykamov pushed a commit to branch master-model
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/master-model by this push:
     new 64fcb03  WIP.
64fcb03 is described below

commit 64fcb03dbfe11535d1c12a1539a36d0a44887ef6
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Thu Oct 7 20:15:49 2021 +0300

    WIP.
---
 .../apache/nlpcraft/model/builders/NCModelActionBuilder.java |  3 +--
 .../model/{impl => providers}/NCElementsProvider.java        |  4 ++--
 .../model/{impl => providers}/NCIntentsProvider.java         |  6 +++---
 nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java | 12 ++++++------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelActionBuilder.java
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelActionBuilder.java
index ce167e7..c57506a 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelActionBuilder.java
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelActionBuilder.java
@@ -34,8 +34,7 @@ public class NCModelActionBuilder {
     public NCModelActionBuilder withOnContext(Function<NCContext, NCResult> 
resultMaker) throws NCRejection {
         return null;
     }
-
-
+    
     public NCModelActionBuilder withOnResult(BiFunction<NCIntentMatch, 
NCResult, NCResult> resultMaker) {
         return null;
     }
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCElementsProvider.java
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCElementsProvider.java
similarity index 92%
rename from 
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCElementsProvider.java
rename to 
nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCElementsProvider.java
index 242ef65..5f902a5 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCElementsProvider.java
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCElementsProvider.java
@@ -1,4 +1,4 @@
-package org.apache.nlpcraft.model.impl;
+package org.apache.nlpcraft.model.providers;
 
 import org.apache.nlpcraft.model.NCElement;
 import org.apache.nlpcraft.model.NCValueLoader;
@@ -55,7 +55,7 @@ public class NCElementsProvider {
         this.elements = elements;
     }
 
-    public List<NCElement> getDetectedElements() {
+    public List<NCElement> getProviderElements() {
         // TODO: implement.
         return null;
     }
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCIntentsProvider.java 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsProvider.java
similarity index 92%
rename from 
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCIntentsProvider.java
rename to 
nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsProvider.java
index 5c06f7d..d220f8e 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCIntentsProvider.java
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsProvider.java
@@ -1,4 +1,4 @@
-package org.apache.nlpcraft.model.impl;
+package org.apache.nlpcraft.model.providers;
 
 import java.io.File;
 import java.net.URL;
@@ -72,12 +72,12 @@ public class NCIntentsProvider {
         this.samples = samples;
     }
 
-    public List<String> getDetectedIntentsDls() {
+    public List<String> getProviderIntentsDls() {
         // TODO: implement.
         return null;
     }
 
-    public Map<String, List<List<String>>> getDetectedIntentsSamples() {
+    public Map<String, List<List<String>>> getProviderIntentsSamples() {
         // TODO: implement.
         return null;
     }
diff --git a/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java 
b/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
index 0d572c3..a1409e0 100644
--- a/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
+++ b/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
@@ -5,8 +5,8 @@ import org.apache.nlpcraft.model.builders.NCElementBuilder;
 import org.apache.nlpcraft.model.builders.NCModelActionBuilder;
 import org.apache.nlpcraft.model.builders.NCModelConfigBuilder;
 import org.apache.nlpcraft.model.builders.NCModelBuilder;
-import org.apache.nlpcraft.model.impl.NCElementsProvider;
-import org.apache.nlpcraft.model.impl.NCIntentsProvider;
+import org.apache.nlpcraft.model.providers.NCElementsProvider;
+import org.apache.nlpcraft.model.providers.NCIntentsProvider;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
@@ -42,7 +42,7 @@ public class NCSpec {
         elemsProvider.setFiles(asList(new java.io.File("path.yaml")));
         elemsProvider.setLoaders(loaders);
 
-        List<NCElement> elements = elemsProvider.getDetectedElements();
+        List<NCElement> elements = elemsProvider.getProviderElements();
 
         elements.add(new 
NCElementBuilder().withId("additionalElementId").make());
 
@@ -65,12 +65,12 @@ public class NCSpec {
 
         intentsProvider.setClasses(asList(SomeClassWithIntents.class));
 
-        List<String> intents = intentsProvider.getDetectedIntentsDls();
+        List<String> intents = intentsProvider.getProviderIntentsDls();
 
         return
             new NCModelActionBuilder().
-                withIntentsDsl(intentsProvider.getDetectedIntentsDls()).
-                
withIntentsDslSamples(intentsProvider.getDetectedIntentsSamples()).
+                withIntentsDsl(intentsProvider.getProviderIntentsDls()).
+                
withIntentsDslSamples(intentsProvider.getProviderIntentsSamples()).
                 withOnRejection(new BiFunction<NCIntentMatch, NCRejection, 
NCResult>() {
                     @Override
                     public NCResult apply(NCIntentMatch math, NCRejection rej) 
{