This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-468
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-468 by this push:
new 612b9d5 WIP.
612b9d5 is described below
commit 612b9d514304179890d875ba955e700857f98392
Author: Sergey Kamov <[email protected]>
AuthorDate: Tue Oct 12 20:36:31 2021 +0300
WIP.
---
.../scala/org/apache/nlpcraft/model/NCConversation.java | 3 ++-
.../scala/org/apache/nlpcraft/model/NCModelConfig.java | 11 +++++------
.../detectors/NCDefaultStopWordsDetector.java | 4 +---
.../detectors/NCDefaultSwearWordsDetector.java | 4 +---
.../detectors/NCFileWordsDetector.java | 2 +-
.../ner/opennlp/NCOpenNlpNerParser.java | 2 +-
.../ner/synonyms/NCSynonymsNerElement.java | 2 +-
.../ner/synonyms/NCSynonymsNerParser.java | 2 +-
.../ner/synonyms/NCSynonymsNerValue.java | 2 +-
.../ner/synonyms/NCSynonymsNerValueLoader.java | 2 +-
.../synonyms/builders/NCSynonymsNerElementBuilder.java | 8 ++++----
.../synonyms/builders/NCSynonymsNerParserBuilder.java | 6 +++---
.../tokenizer/NCOpenNlpTokenizer.java | 2 +-
.../scala/org/apache/nlpcraft/model/nlp/NCNlpToken.java | 4 ++--
nlpcraft/src/test/java/org/apache/nlpcraft/NCSpec.java | 17 ++++++++---------
15 files changed, 33 insertions(+), 38 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCConversation.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCConversation.java
index f4f28dd..fd30366 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCConversation.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCConversation.java
@@ -17,12 +17,13 @@
package org.apache.nlpcraft.model;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerElement;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerElement;
import java.util.List;
import java.util.function.Predicate;
/**
+ * TODO: drop reference to NCSynonymsNerElement.
* Conversation container for unique combination of user and data model.
* <p>
* Conversation management is based on idea of a short-term-memory (STM). STM
can be viewed as a condensed
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
index 0dd105c..2e66e17 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
@@ -17,11 +17,10 @@
package org.apache.nlpcraft.model;
-import org.apache.nlpcraft.model.impl.detectors.NCDefaultStopWordsDetector;
-import org.apache.nlpcraft.model.impl.detectors.NCDefaultSwearWordsDetector;
-import org.apache.nlpcraft.model.impl.detectors.NCFileWordsDetector;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerElement;
-import org.apache.nlpcraft.model.impl.tokenizer.NCOpenNlpTokenizer;
+import
org.apache.nlpcraft.model.components.detectors.NCDefaultStopWordsDetector;
+import
org.apache.nlpcraft.model.components.detectors.NCDefaultSwearWordsDetector;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerElement;
+import org.apache.nlpcraft.model.components.tokenizer.NCOpenNlpTokenizer;
import org.apache.nlpcraft.model.nlp.NCNlpNerParser;
import org.apache.nlpcraft.model.nlp.NCNlpTokenizer;
import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
@@ -31,7 +30,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* Read-only view on data model. Model view defines a declarative, or
configurable, part of the model.
@@ -163,6 +161,7 @@ public interface NCModelConfig {
int MODEL_VERSION_MAXLEN = 16;
/**
+ * TODO: javadoc
* Max length for {@link NCSynonymsNerElement#getId()} method.
*/
int MODEL_ELEMENT_ID_MAXLEN = 64;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCDefaultStopWordsDetector.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultStopWordsDetector.java
similarity index 92%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCDefaultStopWordsDetector.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultStopWordsDetector.java
index baa99bb..5ab3c26 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCDefaultStopWordsDetector.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultStopWordsDetector.java
@@ -15,13 +15,11 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.detectors;
+package org.apache.nlpcraft.model.components.detectors;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
-import java.io.File;
-import java.net.URL;
import java.util.Collections;
import java.util.List;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCDefaultSwearWordsDetector.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultSwearWordsDetector.java
similarity index 92%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCDefaultSwearWordsDetector.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultSwearWordsDetector.java
index 1669e65..44abf59 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCDefaultSwearWordsDetector.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultSwearWordsDetector.java
@@ -15,13 +15,11 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.detectors;
+package org.apache.nlpcraft.model.components.detectors;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
-import java.io.File;
-import java.net.URL;
import java.util.Collections;
import java.util.List;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCFileWordsDetector.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCFileWordsDetector.java
similarity index 95%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCFileWordsDetector.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCFileWordsDetector.java
index 3043843..53765f3 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/detectors/NCFileWordsDetector.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCFileWordsDetector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.detectors;
+package org.apache.nlpcraft.model.components.detectors;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/opennlp/NCOpenNlpNerParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/opennlp/NCOpenNlpNerParser.java
similarity index 95%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/opennlp/NCOpenNlpNerParser.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/opennlp/NCOpenNlpNerParser.java
index d2fbb5b..e030b83 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/opennlp/NCOpenNlpNerParser.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/opennlp/NCOpenNlpNerParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.ner.opennlp;
+package org.apache.nlpcraft.model.components.ner.opennlp;
import org.apache.nlpcraft.model.NCModelConfig;
import org.apache.nlpcraft.model.NCRequest;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerElement.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerElement.java
similarity index 99%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerElement.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerElement.java
index 0c34c05..58ab8e7 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerElement.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerElement.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.ner.synonyms;
+package org.apache.nlpcraft.model.components.ner.synonyms;
import org.apache.nlpcraft.model.NCConversation;
import org.apache.nlpcraft.model.NCToken;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerParser.java
similarity index 99%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerParser.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerParser.java
index 89214c0..ac83b7d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerParser.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.ner.synonyms;
+package org.apache.nlpcraft.model.components.ner.synonyms;
import org.apache.nlpcraft.model.NCModel;
import org.apache.nlpcraft.model.nlp.NCNlpNerParser;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerValue.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerValue.java
similarity index 96%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerValue.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerValue.java
index 075b7e5..b1b6ebb 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerValue.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerValue.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.ner.synonyms;
+package org.apache.nlpcraft.model.components.ner.synonyms;
import java.util.List;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerValueLoader.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerValueLoader.java
similarity index 97%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerValueLoader.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerValueLoader.java
index 0744e7a..a4ea345 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/NCSynonymsNerValueLoader.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/NCSynonymsNerValueLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.ner.synonyms;
+package org.apache.nlpcraft.model.components.ner.synonyms;
import java.util.Set;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/builders/NCSynonymsNerElementBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/builders/NCSynonymsNerElementBuilder.java
similarity index 85%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/builders/NCSynonymsNerElementBuilder.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/builders/NCSynonymsNerElementBuilder.java
index 836d9aa..f0dd2b5 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/builders/NCSynonymsNerElementBuilder.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/builders/NCSynonymsNerElementBuilder.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.ner.synonyms.builders;
+package org.apache.nlpcraft.model.components.ner.synonyms.builders;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerValue;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerElement;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerValueLoader;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerValue;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerElement;
+import
org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerValueLoader;
import java.util.List;
import java.util.Map;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/builders/NCSynonymsNerParserBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/builders/NCSynonymsNerParserBuilder.java
similarity index 88%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/builders/NCSynonymsNerParserBuilder.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/builders/NCSynonymsNerParserBuilder.java
index bf95154..a5f54ae 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/ner/synonyms/builders/NCSynonymsNerParserBuilder.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/ner/synonyms/builders/NCSynonymsNerParserBuilder.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.ner.synonyms.builders;
+package org.apache.nlpcraft.model.components.ner.synonyms.builders;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerElement;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerParser;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerElement;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerParser;
import java.io.File;
import java.util.List;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/tokenizer/NCOpenNlpTokenizer.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/tokenizer/NCOpenNlpTokenizer.java
similarity index 95%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/tokenizer/NCOpenNlpTokenizer.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/tokenizer/NCOpenNlpTokenizer.java
index 7cccfd8..43df0e4 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/tokenizer/NCOpenNlpTokenizer.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/tokenizer/NCOpenNlpTokenizer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.impl.tokenizer;
+package org.apache.nlpcraft.model.components.tokenizer;
import org.apache.nlpcraft.model.NCRequest;
import org.apache.nlpcraft.model.nlp.NCNlpTokenizer;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpToken.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpToken.java
index 0d182e0..e6888f9 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpToken.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpToken.java
@@ -20,7 +20,7 @@ package org.apache.nlpcraft.model.nlp;
import org.apache.nlpcraft.model.NCModel;
import org.apache.nlpcraft.model.NCModelConfig;
import org.apache.nlpcraft.model.NCRequest;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerElement;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerElement;
import java.util.Collections;
import java.util.List;
@@ -34,7 +34,7 @@ public interface NCNlpToken {
* references the element that's already defined in the model.
*
* @return ID of the detected model element.
- * @see NCSynonymsNerElement#getId()
+ * @see NCSynonymsNerElement#getId() TODO: drop it.
* @see NCModel#getElements()
*/
String getId();
diff --git a/nlpcraft/src/test/java/org/apache/nlpcraft/NCSpec.java
b/nlpcraft/src/test/java/org/apache/nlpcraft/NCSpec.java
index d8b9eaf..48bfaea 100644
--- a/nlpcraft/src/test/java/org/apache/nlpcraft/NCSpec.java
+++ b/nlpcraft/src/test/java/org/apache/nlpcraft/NCSpec.java
@@ -24,15 +24,15 @@ import org.apache.nlpcraft.model.NCRejection;
import org.apache.nlpcraft.model.NCModelConfig;
import org.apache.nlpcraft.model.NCResult;
import org.apache.nlpcraft.model.builders.NCModelConfigBuilder;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerValue;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerValue;
import org.apache.nlpcraft.model.builders.NCModelBuilder;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerElement;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerParser;
-import org.apache.nlpcraft.model.impl.ner.synonyms.NCSynonymsNerValueLoader;
-import
org.apache.nlpcraft.model.impl.ner.synonyms.builders.NCSynonymsNerElementBuilder;
-import
org.apache.nlpcraft.model.impl.ner.synonyms.builders.NCSynonymsNerParserBuilder;
-import org.apache.nlpcraft.model.impl.ner.opennlp.NCOpenNlpNerParser;
-import org.apache.nlpcraft.model.impl.tokenizer.NCOpenNlpTokenizer;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerElement;
+import org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerParser;
+import
org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerValueLoader;
+import
org.apache.nlpcraft.model.components.ner.synonyms.builders.NCSynonymsNerElementBuilder;
+import
org.apache.nlpcraft.model.components.ner.synonyms.builders.NCSynonymsNerParserBuilder;
+import org.apache.nlpcraft.model.components.ner.opennlp.NCOpenNlpNerParser;
+import org.apache.nlpcraft.model.components.tokenizer.NCOpenNlpTokenizer;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -40,7 +40,6 @@ import java.net.URL;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Set;
import org.apache.nlpcraft.model.NCIntentRef;
