This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit ca388cf186424ec168717b3190565b5e4d98eb5e Author: Aaron Radzinski <[email protected]> AuthorDate: Fri Aug 19 12:37:57 2022 -0700 WIP on refactoring. --- .../org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala | 9 +++++---- .../org/apache/nlpcraft/internal/impl/NCModelClientSpec.scala | 5 +++-- .../org/apache/nlpcraft/internal/impl/NCModelClientSpec2.scala | 7 ++++--- .../org/apache/nlpcraft/internal/impl/NCModelClientSpec3.scala | 7 ++++--- .../org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala | 7 ++++--- .../apache/nlpcraft/internal/impl/NCPipelineManagerSpec.scala | 3 ++- .../internal/impl/scan/NCModelIntentsInvalidArgsSpec.scala | 8 +++++--- .../internal/impl/scan/NCModelIntentsInvalidIntentsSpec.scala | 6 +++--- .../nlpcraft/internal/impl/scan/NCModelIntentsNestedSpec.scala | 7 +++++-- .../nlpcraft/internal/intent/compiler/NCIDLCompilerSpec.scala | 1 + .../internal/intent/compiler/functions/NCIDLFunctions.scala | 7 ++++--- .../internal/intent/compiler/functions/NCIDLFunctionsModel.scala | 6 ++++-- .../scala/org/apache/nlpcraft/nlp/NCEntityEnricherSpec.scala | 7 ++++--- .../test/scala/org/apache/nlpcraft/nlp/NCEntityMapperSpec.scala | 7 ++++--- .../scala/org/apache/nlpcraft/nlp/NCEntityValidatorSpec.scala | 6 ++++-- .../test/scala/org/apache/nlpcraft/nlp/NCTokenEnricherSpec.scala | 9 +++++---- .../nlpcraft/nlp/enrichers/NCDictionaryTokenEnricherSpec.scala | 7 +++++-- .../nlpcraft/nlp/enrichers/NCQuotesTokenEnricherSpec.scala | 9 ++++++--- .../apache/nlpcraft/nlp/enrichers/NCStopWordsEnricherSpec.scala | 4 ++-- .../org/apache/nlpcraft/nlp/parsers/NCNLPEntityParserSpec.scala | 6 +++--- .../apache/nlpcraft/nlp/parsers/NCOpenNLPEntityParserSpec.scala | 6 +++--- .../nlpcraft/nlp/parsers/NCSemanticEntityParserJsonSpec.scala | 4 ++-- .../nlpcraft/nlp/parsers/NCSemanticEntityParserLemmaSpec.scala | 6 +++--- .../apache/nlpcraft/nlp/parsers/NCSemanticEntityParserSpec.scala | 7 ++++--- .../nlpcraft/nlp/parsers/NCSemanticEntityParserYamlSpec.scala | 6 ++++-- 25 files changed, 93 insertions(+), 64 deletions(-) diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala index 25d4c9e2..b5af15f5 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelCallbacksSpec.scala @@ -18,11 +18,12 @@ package org.apache.nlpcraft.internal.impl import org.apache.nlpcraft.* -import org.apache.nlpcraft.NCResultType.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.nlp.parsers.* -import org.junit.jupiter.api.* +import NCResultType.* +import annotations.* +import nlp.parsers.* +import nlp.util.* +import org.junit.jupiter.api.* import scala.jdk.CollectionConverters.* import scala.util.Using diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec.scala index 795f716c..9b2140ef 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec.scala @@ -18,8 +18,9 @@ package org.apache.nlpcraft.internal.impl import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.nlp.parsers.* +import annotations.* +import nlp.parsers.* +import nlp.util.* import org.junit.jupiter.api.Test import scala.jdk.CollectionConverters.* diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec2.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec2.scala index b896447c..ec63bb1f 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec2.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec2.scala @@ -18,10 +18,11 @@ package org.apache.nlpcraft.internal.impl import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.nlp.parsers.* -import org.junit.jupiter.api.Test +import annotations.* +import nlp.parsers.* +import nlp.util.* +import org.junit.jupiter.api.Test import java.util import scala.collection.mutable import scala.jdk.CollectionConverters.* diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec3.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec3.scala index 0e25ca4d..9850b4fe 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec3.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelClientSpec3.scala @@ -18,10 +18,11 @@ package org.apache.nlpcraft.internal.impl import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.nlp.parsers.* -import org.junit.jupiter.api.Test +import annotations.* +import nlp.parsers.* +import nlp.util.* +import org.junit.jupiter.api.Test import java.util import scala.collection.mutable import scala.jdk.CollectionConverters.* diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala index 97c07c50..08bcef58 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala @@ -18,9 +18,10 @@ package org.apache.nlpcraft.internal.impl import org.apache.nlpcraft.* -import org.apache.nlpcraft.NCResultType.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.nlp.parsers.* +import annotations.* +import nlp.parsers.* +import nlp.util.* +import NCResultType.* import org.junit.jupiter.api.* import scala.jdk.CollectionConverters.* diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCPipelineManagerSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCPipelineManagerSpec.scala index 79b32789..3e446da1 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCPipelineManagerSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCPipelineManagerSpec.scala @@ -18,7 +18,8 @@ package org.apache.nlpcraft.internal.impl import org.apache.nlpcraft.* -import org.apache.nlpcraft.nlp.parsers.* +import nlp.parsers.* +import 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/NCModelIntentsInvalidArgsSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsInvalidArgsSpec.scala index de118835..5043c0d1 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsInvalidArgsSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsInvalidArgsSpec.scala @@ -18,10 +18,12 @@ package org.apache.nlpcraft.internal.impl.scan import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.internal.impl.{NCCallbackInput, NCModelScanner} -import org.junit.jupiter.api.Test +import annotations.* +import nlp.enrichers.* +import nlp.util.* +import internal.impl.{NCCallbackInput, NCModelScanner} +import org.junit.jupiter.api.Test import java.util /** diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsInvalidIntentsSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsInvalidIntentsSpec.scala index b384a9df..42a10ca1 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsInvalidIntentsSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsInvalidIntentsSpec.scala @@ -18,10 +18,10 @@ package org.apache.nlpcraft.internal.impl.scan import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.internal.impl.NCModelScanner -import org.junit.jupiter.api.Test +import annotations.* +import internal.impl.NCModelScanner +import org.junit.jupiter.api.Test import java.util /** diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsNestedSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsNestedSpec.scala index cd8773c3..e09d8511 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsNestedSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/scan/NCModelIntentsNestedSpec.scala @@ -18,9 +18,12 @@ package org.apache.nlpcraft.internal.impl.scan import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.internal.impl.NCModelScanner +import annotations.* +import nlp.util.* +import internal.impl.NCModelScanner + import org.junit.jupiter.api.Test + /** * It tests imports and nested objects usage. */ diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/NCIDLCompilerSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/NCIDLCompilerSpec.scala index c5189959..b5d490fc 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/NCIDLCompilerSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/NCIDLCompilerSpec.scala @@ -18,6 +18,7 @@ package org.apache.nlpcraft.internal.intent.compiler import org.apache.nlpcraft.* +import nlp.util.* import org.junit.jupiter.api.Test /** diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala index 6d721299..f9fb7655 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala @@ -18,9 +18,10 @@ package org.apache.nlpcraft.internal.intent.compiler.functions import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.intent.* -import org.apache.nlpcraft.internal.intent.compiler.* -import org.apache.nlpcraft.internal.intent.compiler.functions.* +import internal.intent.* +import internal.intent.compiler.* +import internal.intent.compiler.functions.* +import nlp.util.* import org.junit.jupiter.api.BeforeEach import java.util diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctionsModel.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctionsModel.scala index e61a3498..91576a39 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctionsModel.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctionsModel.scala @@ -17,9 +17,11 @@ package org.apache.nlpcraft.internal.intent.compiler.functions -import org.apache.nlpcraft.internal.intent.compiler.functions.NCIDLFunctions.* -import org.junit.jupiter.api.Test +import org.apache.nlpcraft.* +import nlp.util.* +import internal.intent.compiler.functions.NCIDLFunctions.* +import org.junit.jupiter.api.Test import scala.language.implicitConversions /** diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityEnricherSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityEnricherSpec.scala index ac3e3f9e..1ae0b536 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityEnricherSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityEnricherSpec.scala @@ -18,9 +18,10 @@ package org.apache.nlpcraft.nlp import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.internal.util.NCResourceReader -import org.apache.nlpcraft.nlp.parsers.* +import annotations.* +import nlp.parsers.* +import nlp.util.* +import internal.util.NCResourceReader import org.junit.jupiter.api.Test import scala.util.Using diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityMapperSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityMapperSpec.scala index f3bd6b0a..76db57d5 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityMapperSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityMapperSpec.scala @@ -18,9 +18,10 @@ package org.apache.nlpcraft.nlp import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.internal.util.NCResourceReader -import org.apache.nlpcraft.nlp.parsers.* +import annotations.* +import nlp.parsers.* +import nlp.util.* +import internal.util.NCResourceReader import org.junit.jupiter.api.Test import scala.jdk.CollectionConverters.* diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityValidatorSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityValidatorSpec.scala index ddd9968b..362797e9 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityValidatorSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityValidatorSpec.scala @@ -18,8 +18,10 @@ package org.apache.nlpcraft.nlp import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.util.NCResourceReader -import org.apache.nlpcraft.nlp.parsers.{NCNLPEntityParser, NCOpenNLPTokenParser} +import annotations.* +import nlp.parsers.* +import nlp.util.* +import internal.util.NCResourceReader import org.junit.jupiter.api.Test import scala.util.Using diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCTokenEnricherSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCTokenEnricherSpec.scala index cee161e6..bb80677d 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCTokenEnricherSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCTokenEnricherSpec.scala @@ -18,11 +18,12 @@ package org.apache.nlpcraft.nlp import org.apache.nlpcraft.* -import org.apache.nlpcraft.annotations.* -import org.apache.nlpcraft.internal.util.NCResourceReader -import org.apache.nlpcraft.nlp.parsers.{NCNLPEntityParser, NCOpenNLPTokenParser} -import org.junit.jupiter.api.Test +import annotations.* +import nlp.parsers.* +import nlp.util.* +import internal.util.NCResourceReader +import org.junit.jupiter.api.Test import scala.util.Using /** diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCDictionaryTokenEnricherSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCDictionaryTokenEnricherSpec.scala index 83f530b5..0625f9c2 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCDictionaryTokenEnricherSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCDictionaryTokenEnricherSpec.scala @@ -17,8 +17,11 @@ package org.apache.nlpcraft.nlp.enrichers -import org.apache.nlpcraft.internal.util.NCResourceReader -import org.apache.nlpcraft.nlp.enrichers.NCEnDictionaryTokenEnricher +import org.apache.nlpcraft.* +import annotations.* +import nlp.enrichers.* +import nlp.util.* +import internal.util.NCResourceReader import org.junit.jupiter.api.* import scala.jdk.CollectionConverters.* diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCQuotesTokenEnricherSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCQuotesTokenEnricherSpec.scala index 8325d07a..b2abca05 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCQuotesTokenEnricherSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCQuotesTokenEnricherSpec.scala @@ -17,9 +17,12 @@ package org.apache.nlpcraft.nlp.enrichers -import org.apache.nlpcraft.NCToken -import org.apache.nlpcraft.internal.util.NCResourceReader -import org.apache.nlpcraft.nlp.enrichers.NCEnQuotesTokenEnricher +import org.apache.nlpcraft.* +import annotations.* +import nlp.enrichers.* +import nlp.util.* +import internal.util.NCResourceReader + import org.junit.jupiter.api.* import scala.jdk.CollectionConverters.* diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCStopWordsEnricherSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCStopWordsEnricherSpec.scala index c60657f7..a6a9fc9c 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCStopWordsEnricherSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/enrichers/NCStopWordsEnricherSpec.scala @@ -18,8 +18,8 @@ package org.apache.nlpcraft.nlp.enrichers import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.util.NCResourceReader -import org.apache.nlpcraft.nlp.enrichers.NCEnStopWordsTokenEnricher +import internal.util.NCResourceReader +import nlp.enrichers.NCEnStopWordsTokenEnricher import org.junit.jupiter.api.* import java.util diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCNLPEntityParserSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCNLPEntityParserSpec.scala index c3b7a2a7..f0c3755d 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCNLPEntityParserSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCNLPEntityParserSpec.scala @@ -18,10 +18,10 @@ package org.apache.nlpcraft.nlp.parsers import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.util.NCUtils -import org.apache.nlpcraft.nlp.parsers.NCNLPEntityParser -import org.junit.jupiter.api.* +import nlp.parsers.* +import nlp.util.* +import org.junit.jupiter.api.* import java.util import scala.collection.mutable import scala.concurrent.ExecutionContext diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCOpenNLPEntityParserSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCOpenNLPEntityParserSpec.scala index 882d87a8..a8a34212 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCOpenNLPEntityParserSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCOpenNLPEntityParserSpec.scala @@ -18,10 +18,10 @@ package org.apache.nlpcraft.nlp.parsers import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.util.* -import org.apache.nlpcraft.nlp.parsers.NCOpenNLPEntityParser -import org.junit.jupiter.api.* +import nlp.parsers.* +import nlp.util.* +import org.junit.jupiter.api.* import java.util import scala.collection.mutable import scala.concurrent.ExecutionContext diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserJsonSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserJsonSpec.scala index d1551866..bcab07ba 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserJsonSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserJsonSpec.scala @@ -18,8 +18,8 @@ package org.apache.nlpcraft.nlp.parsers import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.util.NCUtils -import org.apache.nlpcraft.nlp.parsers.NCOpenNLPTokenParser +import nlp.parsers.* +import nlp.util.* import org.junit.jupiter.api.* import java.util diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserLemmaSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserLemmaSpec.scala index 0004cd2a..9c83244d 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserLemmaSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserLemmaSpec.scala @@ -18,9 +18,9 @@ package org.apache.nlpcraft.nlp.parsers import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.impl.* -import org.apache.nlpcraft.internal.util.* -import org.apache.nlpcraft.nlp.parsers.{NCSemanticEntityParser, NCSemanticStemmer} +import annotations.* +import nlp.parsers.* +import nlp.util.* import org.junit.jupiter.api.* import java.util diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserSpec.scala index 27b500a5..512b9dd9 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserSpec.scala @@ -18,10 +18,11 @@ package org.apache.nlpcraft.nlp.parsers import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.util.* -import org.apache.nlpcraft.nlp.parsers.NCSemanticEntityParser -import org.junit.jupiter.api.* +import annotations.* +import nlp.parsers.* +import nlp.util.* +import org.junit.jupiter.api.* import java.util import scala.collection.mutable import scala.concurrent.ExecutionContext diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserYamlSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserYamlSpec.scala index 0c0d948b..807f66ab 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserYamlSpec.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/parsers/NCSemanticEntityParserYamlSpec.scala @@ -18,8 +18,9 @@ package org.apache.nlpcraft.nlp.parsers import org.apache.nlpcraft.* -import org.apache.nlpcraft.internal.util.NCUtils -import org.apache.nlpcraft.nlp.parsers.NCSemanticEntityParser +import annotations.* +import nlp.parsers.* +import nlp.util.* import org.junit.jupiter.api.* import java.util @@ -27,6 +28,7 @@ import scala.collection.mutable import scala.concurrent.ExecutionContext import scala.jdk.CollectionConverters.* import scala.jdk.OptionConverters.RichOptional + /** * */
