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 7f95470 Tests packages refactoring.
7f95470 is described below
commit 7f95470fb22450229c714fda344f76f4c6a09727
Author: Sergey Kamov <[email protected]>
AuthorDate: Thu Mar 17 10:07:44 2022 +0300
Tests packages refactoring.
---
.../src/main/java/org/apache/nlpcraft/examples/time/EchoModel.java | 4 +++-
.../src/main/scala/org/apache/nlpcraft/NCModelPipelineBuilder.java | 2 ++
.../org/apache/nlpcraft/internal/impl/NCModelPipelineManager.scala | 2 +-
.../nlp/entity/parser/impl/semantic/NCSemanticEntityParserImpl.scala | 5 ++---
.../nlp/entity/parser/impl/semantic/NCSemanticSourceReader.scala | 2 +-
.../nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonym.scala | 2 +-
.../entity/parser/impl/semantic/NCSemanticSynonymsProcessor.scala | 4 ++--
.../apache/nlpcraft/internal/impl/NCModelPipelineManagerSpec.scala | 2 +-
.../org/apache/nlpcraft/internal/impl/scan/NCTestModelJava.java | 2 +-
.../org/apache/nlpcraft/internal/impl/scan/NCTestModelScala.scala | 1 -
.../nlpcraft/nlp/entity/parser/{nlp => }/NCNLPEntityParserSpec.scala | 2 +-
.../nlp/entity/parser/{opennlp => }/NCOpenNLPEntityParserSpec.scala | 2 +-
.../nlp/entity/parser/semantic/NCSemanticEntityParserLemmaSpec.scala | 1 -
.../nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala | 1 -
.../nlpcraft/nlp/entity/parser/semantic/NCSemanticTestElement.scala | 2 +-
.../nlp/token/enricher/{en => }/NCBracketsTokenEnricherSpec.scala | 3 +--
.../nlp/token/enricher/{en => }/NCDictionaryTokenEnricherSpec.scala | 3 +--
.../nlp/token/enricher/{en => }/NCQuotesTokenEnricherSpec.scala | 3 +--
.../nlp/token/enricher/{en => }/NCStopWordsEnricherSpec.scala | 3 +--
.../nlp/token/enricher/{en => }/NCSwearWordsTokenEnricherSpec.scala | 3 +--
.../nlp/token/enricher/{en => }/impl/NCStopWordsImplSpec.scala | 3 +--
.../nlp/token/parser/{opennlp => }/NCOpenNLPTokenParserSpec.scala | 3 +--
.../test/scala/org/apache/nlpcraft/nlp/util/NCTestConfigJava.java | 1 -
23 files changed, 24 insertions(+), 32 deletions(-)
diff --git
a/nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/examples/time/EchoModel.java
b/nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/examples/time/EchoModel.java
index 9715f70..2bb6b19 100644
---
a/nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/examples/time/EchoModel.java
+++
b/nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/examples/time/EchoModel.java
@@ -28,6 +28,8 @@ import org.apache.nlpcraft.NCRejection;
import org.apache.nlpcraft.NCRequest;
import org.apache.nlpcraft.NCResult;
import org.apache.nlpcraft.NCResultType;
+import org.apache.nlpcraft.internal.util.NCResourceReader;
+import org.apache.nlpcraft.nlp.token.parser.NCOpenNLPTokenParser;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +41,7 @@ public class EchoModel extends NCModelAdapter {
public EchoModel() {
super(
new NCModelConfig("nlpcraft.echo.ex", "Echo Example Model", "1.0"),
- new NCModelPipelineBuilder().build()
+ new NCModelPipelineBuilder().withTokenParser(new
NCOpenNLPTokenParser(NCResourceReader.getPath("opennlp/en-token.bin"))).build()
);
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelPipelineBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelPipelineBuilder.java
index 1fd8500..631015b 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelPipelineBuilder.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelPipelineBuilder.java
@@ -231,6 +231,8 @@ public class NCModelPipelineBuilder {
NCResourceReader.getPath("opennlp/en-lemmatizer.dict")
));
tokEnrichers.add(new NCEnStopWordsTokenEnricher());
+
+ // TODO: Do we need following components here?
tokEnrichers.add(new
NСEnSwearWordsTokenEnricher(NCResourceReader.getPath("badfilter/swear_words.txt")));
tokEnrichers.add(new NCEnQuotesTokenEnricher());
tokEnrichers.add(new NCEnDictionaryTokenEnricher());
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManager.scala
index 907bc7e..fca609c 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManager.scala
@@ -18,13 +18,13 @@
package org.apache.nlpcraft.internal.impl
import com.typesafe.scalalogging.LazyLogging
+import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.ascii.NCAsciiTable
import org.apache.nlpcraft.internal.conversation.*
import org.apache.nlpcraft.internal.dialogflow.NCDialogFlowManager
import org.apache.nlpcraft.internal.impl.*
import org.apache.nlpcraft.internal.intent.matcher.*
import org.apache.nlpcraft.internal.util.*
-import org.apache.nlpcraft.*
import java.util
import java.util.concurrent.*
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticEntityParserImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticEntityParserImpl.scala
index 0f4c08b..3bbdc48 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticEntityParserImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticEntityParserImpl.scala
@@ -21,10 +21,9 @@ import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.makro.NCMacroParser
import org.apache.nlpcraft.internal.util.NCUtils
-import org.apache.nlpcraft.nlp.entity.parser.semantic.*
-import
org.apache.nlpcraft.nlp.entity.parser.impl.semantic.NCSemanticEntityParserImpl.combine
import org.apache.nlpcraft.nlp.entity.parser.impl.semantic.*
-import org.apache.nlpcraft.nlp.entity.parser.semantic.NCSemanticStemmer
+import
org.apache.nlpcraft.nlp.entity.parser.impl.semantic.NCSemanticEntityParserImpl.combine
+import org.apache.nlpcraft.nlp.entity.parser.semantic.*
import java.io.*
import java.util
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSourceReader.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSourceReader.scala
index fc4dcf4..74baf90 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSourceReader.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSourceReader.scala
@@ -21,8 +21,8 @@ import com.fasterxml.jackson.databind.*
import com.fasterxml.jackson.dataformat.yaml.*
import com.fasterxml.jackson.module.scala.DefaultScalaModule
import org.apache.nlpcraft.*
-import
org.apache.nlpcraft.nlp.entity.parser.impl.semantic.NCSemanticSourceType.*
import org.apache.nlpcraft.nlp.entity.parser.impl.semantic.*
+import
org.apache.nlpcraft.nlp.entity.parser.impl.semantic.NCSemanticSourceType.*
import org.apache.nlpcraft.nlp.entity.parser.semantic.*
import java.io.InputStream
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonym.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonym.scala
index 420df4f..a5fe834 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonym.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonym.scala
@@ -17,8 +17,8 @@
package org.apache.nlpcraft.nlp.entity.parser.impl.semantic
import org.apache.nlpcraft.NCToken
-import
org.apache.nlpcraft.nlp.entity.parser.impl.semantic.NCSemanticChunkKind.*
import org.apache.nlpcraft.nlp.entity.parser.impl.semantic.*
+import
org.apache.nlpcraft.nlp.entity.parser.impl.semantic.NCSemanticChunkKind.*
import java.util.regex.Pattern
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonymsProcessor.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonymsProcessor.scala
index 2590ce4..3f8bdc5 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonymsProcessor.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/impl/semantic/NCSemanticSynonymsProcessor.scala
@@ -23,9 +23,9 @@ import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.makro.NCMacroParser
import org.apache.nlpcraft.internal.util.NCUtils
-import org.apache.nlpcraft.nlp.entity.parser.semantic.*
-import
org.apache.nlpcraft.nlp.entity.parser.impl.semantic.NCSemanticChunkKind.*
import org.apache.nlpcraft.nlp.entity.parser.impl.semantic.*
+import
org.apache.nlpcraft.nlp.entity.parser.impl.semantic.NCSemanticChunkKind.*
+import org.apache.nlpcraft.nlp.entity.parser.semantic.*
import java.io.InputStream
import java.util
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManagerSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManagerSpec.scala
index 00e3c07..86ff1b5 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManagerSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManagerSpec.scala
@@ -19,8 +19,8 @@ package org.apache.nlpcraft.internal.impl
import org.apache.nlpcraft.*
import org.apache.nlpcraft.nlp.entity.parser.*
-import org.apache.nlpcraft.nlp.entity.parser.semantic.*
import org.apache.nlpcraft.nlp.entity.parser.impl.NCNLPEntityParserImpl
+import org.apache.nlpcraft.nlp.entity.parser.semantic.*
import org.apache.nlpcraft.nlp.util.*
import org.junit.jupiter.api.*
import org.junit.jupiter.api.function.Executable
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCTestModelJava.java
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCTestModelJava.java
index 11ff772..42dc72f 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCTestModelJava.java
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCTestModelJava.java
@@ -25,7 +25,7 @@ import org.apache.nlpcraft.NCIntentTerm;
import org.apache.nlpcraft.NCModel;
import org.apache.nlpcraft.NCModelAdapter;
import org.apache.nlpcraft.NCResult;
-import org.apache.nlpcraft.nlp.util.*;
+import org.apache.nlpcraft.nlp.util.NCTestConfigJava;
import java.util.List;
import java.util.Optional;
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCTestModelScala.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCTestModelScala.scala
index 4f4cc51..64e9bca 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCTestModelScala.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCTestModelScala.scala
@@ -18,7 +18,6 @@
package org.apache.nlpcraft.internal.impl.scan
import org.apache.nlpcraft.*
-import org.apache.nlpcraft.nlp.util.NCTestModelAdapter
import org.apache.nlpcraft.nlp.util.*
/**
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNLPEntityParserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/NCNLPEntityParserSpec.scala
similarity index 97%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNLPEntityParserSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/NCNLPEntityParserSpec.scala
index e59c34a..4ace4ac 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNLPEntityParserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/NCNLPEntityParserSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.entity.parser.nlp
+package org.apache.nlpcraft.nlp.entity.parser
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.util.NCUtils
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/NCOpenNLPEntityParserSpec.scala
similarity index 97%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParserSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/NCOpenNLPEntityParserSpec.scala
index 0f34c0b..1ab256c 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/NCOpenNLPEntityParserSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.entity.parser.opennlp
+package org.apache.nlpcraft.nlp.entity.parser
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.util.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserLemmaSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserLemmaSpec.scala
index 1ad67ef..d3e15b2 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserLemmaSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserLemmaSpec.scala
@@ -102,7 +102,6 @@ class NCSemanticEntityParserLemmaSpec:
@Test
def test(): Unit =
import NCSemanticTestElement as E
-
// Lemma.
ask(
"my test",
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
index e54a38a..4c97e1f 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
@@ -35,7 +35,6 @@ import scala.jdk.OptionConverters.RichOptional
*/
class NCSemanticEntityParserSpec:
import NCSemanticTestElement as E
-
private val parser =
NCTestUtils.mkENSemanticParser(
Seq(
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticTestElement.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticTestElement.scala
index 9b24be3..470758c 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticTestElement.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticTestElement.scala
@@ -17,8 +17,8 @@
package org.apache.nlpcraft.nlp.entity.parser.semantic
-import org.apache.nlpcraft.nlp.entity.parser.*
import org.apache.nlpcraft.*
+import org.apache.nlpcraft.nlp.entity.parser.*
import java.util
import java.util.{List as JList, Map as JMap, Set as JSet}
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCBracketsTokenEnricherSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCBracketsTokenEnricherSpec.scala
similarity index 94%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCBracketsTokenEnricherSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCBracketsTokenEnricherSpec.scala
index e7cbc3e..e74c656 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCBracketsTokenEnricherSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCBracketsTokenEnricherSpec.scala
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.token.enricher.en
+package org.apache.nlpcraft.nlp.token.enricher
import org.apache.nlpcraft.*
import org.apache.nlpcraft.nlp.token.enricher.*
-import org.apache.nlpcraft.nlp.token.enricher.en.*
import org.apache.nlpcraft.nlp.util.*
import org.junit.jupiter.api.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCDictionaryTokenEnricherSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCDictionaryTokenEnricherSpec.scala
similarity index 92%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCDictionaryTokenEnricherSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCDictionaryTokenEnricherSpec.scala
index 86d1eb3..244690b 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCDictionaryTokenEnricherSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCDictionaryTokenEnricherSpec.scala
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.token.enricher.en
+package org.apache.nlpcraft.nlp.token.enricher
import org.apache.nlpcraft.internal.util.NCResourceReader
-import org.apache.nlpcraft.nlp.token.enricher.en.*
import org.apache.nlpcraft.nlp.token.enricher.*
import org.apache.nlpcraft.nlp.util.*
import org.junit.jupiter.api.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCQuotesTokenEnricherSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCQuotesTokenEnricherSpec.scala
similarity index 94%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCQuotesTokenEnricherSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCQuotesTokenEnricherSpec.scala
index 1aaa7b7..700bfa7 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCQuotesTokenEnricherSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCQuotesTokenEnricherSpec.scala
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.token.enricher.en
+package org.apache.nlpcraft.nlp.token.enricher
import org.apache.nlpcraft.NCToken
import org.apache.nlpcraft.internal.util.NCResourceReader
-import org.apache.nlpcraft.nlp.token.enricher.en.*
import org.apache.nlpcraft.nlp.token.enricher.*
import org.apache.nlpcraft.nlp.util.*
import org.junit.jupiter.api.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCStopWordsEnricherSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCStopWordsEnricherSpec.scala
similarity index 95%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCStopWordsEnricherSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCStopWordsEnricherSpec.scala
index 3ca27cb..517e30a 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCStopWordsEnricherSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCStopWordsEnricherSpec.scala
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.token.enricher.en
+package org.apache.nlpcraft.nlp.token.enricher
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.util.NCResourceReader
import org.apache.nlpcraft.nlp.token.enricher.*
-import org.apache.nlpcraft.nlp.token.enricher.en.*
import org.apache.nlpcraft.nlp.util.*
import org.junit.jupiter.api.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCSwearWordsTokenEnricherSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCSwearWordsTokenEnricherSpec.scala
similarity index 91%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCSwearWordsTokenEnricherSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCSwearWordsTokenEnricherSpec.scala
index 2f1b242..3493dcc 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/NCSwearWordsTokenEnricherSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/NCSwearWordsTokenEnricherSpec.scala
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.token.enricher.en
+package org.apache.nlpcraft.nlp.token.enricher
import org.apache.nlpcraft.internal.util.NCResourceReader
import org.apache.nlpcraft.nlp.token.enricher.NСEnSwearWordsTokenEnricher
-import org.apache.nlpcraft.nlp.token.enricher.en.*
import org.apache.nlpcraft.nlp.util.*
import org.junit.jupiter.api.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImplSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/impl/NCStopWordsImplSpec.scala
similarity index 95%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImplSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/impl/NCStopWordsImplSpec.scala
index e30a6dc..7bdf7c4 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImplSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/impl/NCStopWordsImplSpec.scala
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.token.enricher.en.impl
+package org.apache.nlpcraft.nlp.token.enricher.impl
import org.apache.nlpcraft.*
import
org.apache.nlpcraft.nlp.token.enricher.impl.NCEnStopWordsTokenEnricherImpl
-import org.apache.nlpcraft.nlp.token.enricher.en.*
import org.apache.nlpcraft.nlp.util.*
import org.junit.jupiter.api.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNLPTokenParserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/parser/NCOpenNLPTokenParserSpec.scala
similarity index 97%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNLPTokenParserSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/parser/NCOpenNLPTokenParserSpec.scala
index d558f54..d022350 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNLPTokenParserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/parser/NCOpenNLPTokenParserSpec.scala
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.nlp.token.parser.opennlp
+package org.apache.nlpcraft.nlp.token.parser
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.ascii.NCAsciiTable
import org.apache.nlpcraft.internal.util.NCResourceReader
-import org.apache.nlpcraft.nlp.token.enricher.en.*
import org.apache.nlpcraft.nlp.token.enricher.*
import org.apache.nlpcraft.nlp.util.*
import org.junit.jupiter.api.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfigJava.java
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfigJava.java
index 3ddeed2..c75545d 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfigJava.java
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfigJava.java
@@ -20,7 +20,6 @@ package org.apache.nlpcraft.nlp.util;
import org.apache.nlpcraft.NCModelConfig;
import org.apache.nlpcraft.internal.util.NCResourceReader;
import org.apache.nlpcraft.nlp.token.parser.NCOpenNLPTokenParser;
-import org.apache.nlpcraft.nlp.util.NCTestPipeline;
/**
*
