This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-383
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-383 by this push:
new 655f217 WIP.
655f217 is described below
commit 655f2177721fa2298aa4688aba70cdd3c8ee81be
Author: Sergey Kamov <[email protected]>
AuthorDate: Sat Aug 7 11:03:16 2021 +0300
WIP.
---
.../org/apache/nlpcraft/examples/solarsystem/SolarSystemModel.scala | 5 ++---
.../solarsystem/{tools => api}/SolarSystemOpenApiBodyRequest.scala | 2 +-
.../solarsystem/{tools => api}/SolarSystemOpenApiService.scala | 4 ++--
.../solarsystem/loaders/SolarSystemDiscoversValueLoader.scala | 2 +-
.../examples/solarsystem/loaders/SolarSystemPlanetsValueLoader.scala | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/SolarSystemModel.scala
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/SolarSystemModel.scala
index c93c29e..6bf36ac 100644
---
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/SolarSystemModel.scala
+++
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/SolarSystemModel.scala
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.examples.solarsystem
import com.typesafe.scalalogging.LazyLogging
-import org.apache.nlpcraft.examples.solarsystem.tools.SolarSystemOpenApiService
+import org.apache.nlpcraft.examples.solarsystem.api.SolarSystemOpenApiService
import org.apache.nlpcraft.model.{NCIntent, NCIntentSample, NCIntentTerm,
NCModelFileAdapter, NCResult, NCToken}
import java.time.format.{DateTimeFormatter, DateTimeFormatterBuilder,
DateTimeParseException}
@@ -113,7 +113,7 @@ class SolarSystemModel extends
NCModelFileAdapter("solarsystem_model.yaml") with
res = res.filter(row => {
val dateStr = row("discoveryDate").asInstanceOf[String]
- if (dateStr.nonEmpty) {
+ if (dateStr.nonEmpty)
supportedFmts.flatMap(p =>
try {
val ms = LocalDate.parse(dateStr,
p).atStartOfDay(ZoneOffset.UTC).toInstant.toEpochMilli
@@ -127,7 +127,6 @@ class SolarSystemModel extends
NCModelFileAdapter("solarsystem_model.yaml") with
to(LazyList).
headOption.
getOrElse(throw new AssertionError(s"Template not found
for: $dateStr"))
- }
else
false
})
diff --git
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/tools/SolarSystemOpenApiBodyRequest.scala
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/api/SolarSystemOpenApiBodyRequest.scala
similarity index 95%
rename from
nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/tools/SolarSystemOpenApiBodyRequest.scala
rename to
nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/api/SolarSystemOpenApiBodyRequest.scala
index 66cbf11..aa981a1 100644
---
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/tools/SolarSystemOpenApiBodyRequest.scala
+++
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/api/SolarSystemOpenApiBodyRequest.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.examples.solarsystem.tools
+package org.apache.nlpcraft.examples.solarsystem.api
trait SolarSystemOpenApiBodyRequest {
def withParameters(params: String*): SolarSystemOpenApiBodyRequest
diff --git
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/tools/SolarSystemOpenApiService.scala
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/api/SolarSystemOpenApiService.scala
similarity index 96%
rename from
nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/tools/SolarSystemOpenApiService.scala
rename to
nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/api/SolarSystemOpenApiService.scala
index 5e56920..f859583 100644
---
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/tools/SolarSystemOpenApiService.scala
+++
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/api/SolarSystemOpenApiService.scala
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.examples.solarsystem.tools
+package org.apache.nlpcraft.examples.solarsystem.api
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.scala.DefaultScalaModule
import com.typesafe.scalalogging.LazyLogging
-import
org.apache.nlpcraft.examples.solarsystem.tools.SolarSystemOpenApiService.BodiesBean
+import
org.apache.nlpcraft.examples.solarsystem.api.SolarSystemOpenApiService.BodiesBean
import java.net.{URI, URLEncoder}
import java.net.http.HttpClient.Version
diff --git
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/loaders/SolarSystemDiscoversValueLoader.scala
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/loaders/SolarSystemDiscoversValueLoader.scala
index a7391a1..7598419 100644
---
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/loaders/SolarSystemDiscoversValueLoader.scala
+++
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/loaders/SolarSystemDiscoversValueLoader.scala
@@ -17,7 +17,7 @@
package org.apache.nlpcraft.examples.solarsystem.loaders
-import org.apache.nlpcraft.examples.solarsystem.tools.SolarSystemOpenApiService
+import org.apache.nlpcraft.examples.solarsystem.api.SolarSystemOpenApiService
import org.apache.nlpcraft.model.{NCElement, NCValue, NCValueLoader}
import java.util
diff --git
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/loaders/SolarSystemPlanetsValueLoader.scala
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/loaders/SolarSystemPlanetsValueLoader.scala
index 76dc321..fb90fe3 100644
---
a/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/loaders/SolarSystemPlanetsValueLoader.scala
+++
b/nlpcraft-examples/solarsystem/src/main/java/org/apache/nlpcraft/examples/solarsystem/loaders/SolarSystemPlanetsValueLoader.scala
@@ -17,7 +17,7 @@
package org.apache.nlpcraft.examples.solarsystem.loaders
-import org.apache.nlpcraft.examples.solarsystem.tools.SolarSystemOpenApiService
+import org.apache.nlpcraft.examples.solarsystem.api.SolarSystemOpenApiService
import org.apache.nlpcraft.model.{NCElement, NCValue, NCValueLoader}
import java.util
