[incubator-nlpcraft] branch master updated: Fix for NLPCRAFT-107.

[ar...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 509b3f7  Fix for NLPCRAFT-107.
509b3f7 is described below

commit 509b3f79159b0f0864431c71c035c59c1db188c0
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Sat Aug 22 19:43:57 2020 -0700

    Fix for NLPCRAFT-107.
---
 .../main/scala/org/apache/nlpcraft/examples/time/TimeModelApp.java    | 2 +-
 .../nlpcraft/{probe => model/tools}/embedded/NCEmbeddedProbe.java     | 2 +-
 .../nlpcraft/{probe => model/tools}/embedded/NCEmbeddedResult.java    | 2 +-
 .../apache/nlpcraft/{probe => model/tools}/embedded/package-info.java | 2 +-
 .../org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.java     | 4 ++--
 .../nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala | 2 +-
 .../org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 2 +-
 .../scala/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala     | 2 +-
 .../org/apache/nlpcraft/model/conversation/NCConversationSpec.scala   | 2 +-
 .../test/scala/org/apache/nlpcraft/model/intent/dsl/NCDslSpec.scala   | 2 +-
 .../scala/org/apache/nlpcraft/models/stm/NCStmTestModelSpec.scala     | 2 +-
 .../apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeModelApp.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeModelApp.java
index cd8e1ad..cfe1d9f 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeModelApp.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeModelApp.java
@@ -17,7 +17,7 @@
 
 package org.apache.nlpcraft.examples.time;
 
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe;
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe;
 
 /**
  * An app that demo the usage of embedded probe. This is an alternative way to
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/NCEmbeddedProbe.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/NCEmbeddedProbe.java
similarity index 99%
rename from nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/NCEmbeddedProbe.java
rename to nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/NCEmbeddedProbe.java
index 0aec35f..412f850 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/NCEmbeddedProbe.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/NCEmbeddedProbe.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.nlpcraft.probe.embedded;
+package org.apache.nlpcraft.model.tools.embedded;
 
 import org.apache.nlpcraft.common.*;
 import org.apache.nlpcraft.model.*;
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/NCEmbeddedResult.java
similarity index 99%
rename from nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.java
rename to nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/NCEmbeddedResult.java
index 7feb005..510e129 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/NCEmbeddedResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.nlpcraft.probe.embedded;
+package org.apache.nlpcraft.model.tools.embedded;
 
 import org.apache.nlpcraft.model.*;
 import java.util.function.*;
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/package-info.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/package-info.java
similarity index 95%
rename from nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/package-info.java
rename to nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/package-info.java
index d228a43..6099ddf 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/embedded/package-info.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/embedded/package-info.java
@@ -19,4 +19,4 @@
  * Contains embedded probe controller. Embedded probe can be used to start a data probe
  * in the same JVM process to save on REST network trips.
  */
-package org.apache.nlpcraft.probe.embedded;
\ No newline at end of file
+package org.apache.nlpcraft.model.tools.embedded;
\ No newline at end of file
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.java
index c7a3c04..cd3fa5c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.java
@@ -33,8 +33,8 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.jsoup.Jsoup;
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe;
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedResult;
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe;
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
index b71458a..1b2d7a3 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
@@ -23,9 +23,9 @@ import com.typesafe.scalalogging.LazyLogging
 import org.apache.nlpcraft.common.ascii.NCAsciiTable
 import org.apache.nlpcraft.common.util.NCUtils
 import org.apache.nlpcraft.model.intent.impl.NCIntentDslCompiler
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe
 import org.apache.nlpcraft.model.tools.test.NCTestClientBuilder
 import org.apache.nlpcraft.model.{NCIntent, NCIntentRef, NCIntentSample, NCModel}
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe
 
 /**
   * Implementation for `NCTestAutoModelValidator` class.
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
index df32c46..7922e4e 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
@@ -33,7 +33,7 @@ import org.apache.nlpcraft.model._
 import org.apache.nlpcraft.model.impl.{NCModelImpl, NCTokenLogger}
 import org.apache.nlpcraft.model.intent.impl.NCIntentSolverInput
 import org.apache.nlpcraft.model.opencensus.stats.NCOpenCensusModelStats
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedResult
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedResult
 import org.apache.nlpcraft.probe.mgrs.NCProbeMessage
 import org.apache.nlpcraft.probe.mgrs.conn.NCConnectionManager
 import org.apache.nlpcraft.probe.mgrs.conversation.NCConversationManager
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
index 0d00b07..4ed1f2b 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
@@ -25,8 +25,8 @@ import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.jakewharton.fliptables.FlipTable
 import org.apache.nlpcraft.examples.sql.db.SqlServer
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe
 import org.apache.nlpcraft.model.tools.test.{NCTestClient, NCTestClientBuilder}
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe
 import org.junit.jupiter.api.{AfterEach, BeforeEach, Test}
 
 import scala.collection.JavaConverters._
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationSpec.scala
index f727284..198f47c 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationSpec.scala
@@ -21,8 +21,8 @@ import java.io.IOException
 
 import org.apache.nlpcraft.common.NCException
 import org.apache.nlpcraft.examples.weather.WeatherModel
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe
 import org.apache.nlpcraft.model.tools.test.{NCTestClient, NCTestClientBuilder}
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.{AfterEach, BeforeEach, Test}
 
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/NCDslSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/NCDslSpec.scala
index b7c4280..801f7e7 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/NCDslSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/NCDslSpec.scala
@@ -20,8 +20,8 @@ package org.apache.nlpcraft.model.intent.dsl
 import java.io.IOException
 
 import org.apache.nlpcraft.common.NCException
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe
 import org.apache.nlpcraft.model.tools.test.{NCTestClient, NCTestClientBuilder}
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.{AfterEach, BeforeEach, Test}
 
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmTestModelSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmTestModelSpec.scala
index 1070d8e..41b941c 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmTestModelSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmTestModelSpec.scala
@@ -20,8 +20,8 @@ package org.apache.nlpcraft.models.stm
 import java.io.IOException
 
 import org.apache.nlpcraft.common.NCException
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe
 import org.apache.nlpcraft.model.tools.test.{NCTestClient, NCTestClientBuilder}
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe
 import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue}
 import org.junit.jupiter.api.{AfterEach, BeforeEach, Test}
 
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala
index bba8fe5..291b704 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala
@@ -17,8 +17,8 @@
 
 package org.apache.nlpcraft.probe.mgrs.nlp.enrichers
 
+import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe
 import org.apache.nlpcraft.model.tools.test.{NCTestClient, NCTestClientBuilder}
-import org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe
 import org.junit.jupiter.api.Assertions.{assertTrue, fail}
 import org.junit.jupiter.api.{AfterEach, BeforeEach}
 import org.scalatest.Assertions