This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-91-MODULES
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-91-MODULES by this
push:
new 1b46bb1 WIP.
1b46bb1 is described below
commit 1b46bb17c0c7ad77b6a66a47bcb12396b8b7d190
Author: Sergey Kamov <[email protected]>
AuthorDate: Thu Apr 22 23:01:11 2021 +0300
WIP.
---
.../{utils => examples}/sql/SqlModel.scala | 4 +--
.../{utils => examples}/sql/db/SqlAccess.scala | 2 +-
.../{utils => examples}/sql/db/SqlBeans.scala | 2 +-
.../{utils => examples}/sql/db/SqlBuilder.scala | 4 +--
.../{utils => examples}/sql/db/SqlServer.scala | 2 +-
.../sql/db/SqlValueLoader.scala | 2 +-
.../{utils => examples}/sql/NCSqlExampleSpec.scala | 4 +--
.../sql/NCSqlGeneratorSpec.scala | 4 +--
.../{utils => examples}/sql/NCSqlModelSpec.scala | 6 ++--
.../utils/sql/NCTestExampleModelsSpec.scala | 35 ----------------------
10 files changed, 15 insertions(+), 50 deletions(-)
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/SqlModel.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
similarity index 99%
rename from
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/SqlModel.scala
rename to
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
index 5aa4ff8..c0a29f7 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/SqlModel.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql
+package org.apache.nlpcraft.examples.sql
import com.google.gson.Gson
import com.typesafe.scalalogging.LazyLogging
-import org.apache.nlpcraft.utils.sql.db._
+import org.apache.nlpcraft.examples.sql.db._
import org.apache.nlpcraft.model._
import org.apache.nlpcraft.model.tools.sqlgen._
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlAccess.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
similarity index 99%
rename from
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlAccess.scala
rename to
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
index ddeedec..8ee31d1 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlAccess.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql.db
+package org.apache.nlpcraft.examples.sql.db
import java.sql.{Connection, PreparedStatement, SQLException}
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlBeans.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBeans.scala
similarity index 97%
rename from
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlBeans.scala
rename to
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBeans.scala
index 710b876..07ca44e 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlBeans.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBeans.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql.db
+package org.apache.nlpcraft.examples.sql.db
import org.apache.nlpcraft.model.tools.sqlgen.NCSqlColumn
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlBuilder.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
similarity index 99%
rename from
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlBuilder.scala
rename to
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
index 8a5a7dc..6e10899 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlBuilder.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql.db
+package org.apache.nlpcraft.examples.sql.db
import java.sql.Types
@@ -384,7 +384,7 @@ case class SqlBuilder(schema: NCSqlSchema) extends
LazyLogging {
case Some(col) ⇒
val range = freeDateRangeOpt.getOrElse(throw new
AssertionError("Missed date range"))
- import
org.apache.nlpcraft.utils.sql.db.{SqlSimpleCondition ⇒ C}
+ import
org.apache.nlpcraft.examples.sql.db.{SqlSimpleCondition ⇒ C}
(Seq(C(col, ">=", range.getFrom), C(col, "<=",
range.getTo)), Seq(range.getFrom, range.getTo))
case None ⇒ (Seq.empty, Seq.empty)
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlServer.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlServer.scala
similarity index 98%
rename from
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlServer.scala
rename to
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlServer.scala
index 3c734fa..81e148c 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlServer.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlServer.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql.db
+package org.apache.nlpcraft.examples.sql.db
import java.io.File
import java.sql.SQLException
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlValueLoader.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
similarity index 97%
rename from
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlValueLoader.scala
rename to
nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
index e79f49a..6c6b0a3 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/utils/sql/db/SqlValueLoader.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql.db
+package org.apache.nlpcraft.examples.sql.db
import java.util
import java.util.Collections
diff --git
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlExampleSpec.scala
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
similarity index 99%
rename from
nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlExampleSpec.scala
rename to
nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
index 953154a..a2df2e8 100644
---
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlExampleSpec.scala
+++
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlExampleSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql
+package org.apache.nlpcraft.examples.sql
import com.github.difflib.text.DiffRowGenerator
import com.github.vertical_blank.sqlformatter.SqlFormatter
@@ -23,7 +23,7 @@ import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import org.apache.nlpcraft.{NCTestContext, NCTestEnvironment}
import org.apache.nlpcraft.common.ascii.NCAsciiTable
-import org.apache.nlpcraft.utils.sql.db.SqlServer
+import org.apache.nlpcraft.examples.sql.db.SqlServer
import org.junit.jupiter.api.Test
import java.util
diff --git
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlGeneratorSpec.scala
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlGeneratorSpec.scala
similarity index 95%
rename from
nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlGeneratorSpec.scala
rename to
nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlGeneratorSpec.scala
index f98fcd1..64087ed 100644
---
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlGeneratorSpec.scala
+++
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlGeneratorSpec.scala
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql
+package org.apache.nlpcraft.examples.sql
-import org.apache.nlpcraft.utils.sql.db.SqlServer
+import org.apache.nlpcraft.examples.sql.db.SqlServer
import org.apache.nlpcraft.model.tools.sqlgen.impl.NCSqlModelGeneratorImpl
import org.junit.jupiter.api.{AfterEach, BeforeEach, Test}
diff --git
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlModelSpec.scala
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlModelSpec.scala
similarity index 97%
rename from
nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlModelSpec.scala
rename to
nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlModelSpec.scala
index e0a3472..64aa0bf 100644
---
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCSqlModelSpec.scala
+++
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/examples/sql/NCSqlModelSpec.scala
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.sql
+package org.apache.nlpcraft.examples.sql
import org.apache.nlpcraft.NCTestEnvironment
-import org.apache.nlpcraft.utils.sql.db.SqlServer
+import org.apache.nlpcraft.examples.sql.db.SqlServer
import org.apache.nlpcraft.model.NCElement
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.NCTestSortTokenType._
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.{NCDefaultTestModel,
NCEnricherBaseSpec, NCTestDateToken => dte, NCTestLimitToken ⇒ lim,
NCTestNlpToken ⇒ nlp, NCTestSortToken ⇒ srt, NCTestUserToken ⇒ usr}
+import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.{NCDefaultTestModel,
NCEnricherBaseSpec, NCTestDateToken => dte, NCTestLimitToken => lim,
NCTestNlpToken => nlp, NCTestSortToken => srt, NCTestUserToken => usr}
import org.junit.jupiter.api.Test
import java.util
diff --git
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCTestExampleModelsSpec.scala
b/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCTestExampleModelsSpec.scala
deleted file mode 100644
index 81803a7..0000000
---
a/nlpcraft-examples/sql/src/test/java/org/apache/nlpcraft/utils/sql/NCTestExampleModelsSpec.scala
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.nlpcraft.utils.sql
-
-import org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
-import org.junit.jupiter.api.{Assertions, Test}
-
-/**
- * JUnit example models validation.
- */
-class NCTestExampleModelsSpec {
- @Test
- def test(): Unit = {
- // Instruct auto-validator what models to test.
- System.setProperty("NLPCRAFT_TEST_MODELS",
"org.apache.nlpcraft.examples.sql.SqlModel")
-
- // Start model auto-validator.
- Assertions.assertTrue(NCTestAutoModelValidator.isValid(),"See error
logs above.")
- }
-}
