This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-478
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-478 by this push:
new 7e5ac51 WIP.
7e5ac51 is described below
commit 7e5ac5180fa5fb44440a14d03a167f21b047f212
Author: Sergey Kamov <[email protected]>
AuthorDate: Mon Feb 21 22:10:07 2022 +0300
WIP.
---
nlpcraft-examples/echo/pom.xml | 12 ++++++------
.../nlpcraft/examples/echo/NCModelValidationSpec.scala | 3 +--
nlpcraft-examples/helloworld/pom.xml | 12 ++++++------
.../examples/helloworld/NCModelValidationSpec.scala | 4 +---
nlpcraft-examples/lightswitch/pom.xml | 12 ++++++------
.../org/apache/nlpcraft/examples/time/TimeModel.java | 6 +++---
.../keycdn/{beans/GeoDataBean.java => GeoData.java} | 4 ++--
.../nlpcraft/examples/utils/keycdn/GeoManager.java | 16 +++++++---------
.../keycdn/{beans/ResponseBean.java => Response.java} | 10 +++++-----
.../{beans/ResponseDataBean.java => ResponseData.java} | 10 +++++-----
.../apache/nlpcraft/examples/weather/WeatherModel.java | 6 +++---
.../examples/weather/NCModelValidationSpec.scala | 3 +--
12 files changed, 46 insertions(+), 52 deletions(-)
diff --git a/nlpcraft-examples/echo/pom.xml b/nlpcraft-examples/echo/pom.xml
index 4b61c1b..a37ed11 100644
--- a/nlpcraft-examples/echo/pom.xml
+++ b/nlpcraft-examples/echo/pom.xml
@@ -40,16 +40,16 @@
<!-- Test dependencies. -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>nlpcraft</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>nlpcraft</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/examples/echo/NCModelValidationSpec.scala
b/nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/examples/echo/NCModelValidationSpec.scala
index e1e6034..704a3f3 100644
---
a/nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/examples/echo/NCModelValidationSpec.scala
+++
b/nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/examples/echo/NCModelValidationSpec.scala
@@ -27,7 +27,7 @@ import scala.util.Using
/**
* JUnit model validation.
*/
-class NCModelValidationSpec {
+class NCModelValidationSpec:
private val MDL = new EchoModel(
"opennlp/en-token.bin",
"opennlp/en-pos-maxent.bin",
@@ -36,4 +36,3 @@ class NCModelValidationSpec {
@Test
def test(): Unit = Using.resource(new NCModelClient(MDL)) { client =>
client.ask("It is example", null, "userId") }
-}
diff --git a/nlpcraft-examples/helloworld/pom.xml
b/nlpcraft-examples/helloworld/pom.xml
index 7c29140..ec4e122 100644
--- a/nlpcraft-examples/helloworld/pom.xml
+++ b/nlpcraft-examples/helloworld/pom.xml
@@ -40,16 +40,16 @@
<!-- Test dependencies. -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>nlpcraft</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>nlpcraft</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/nlpcraft-examples/helloworld/src/test/java/org/apache/nlpcraft/examples/helloworld/NCModelValidationSpec.scala
b/nlpcraft-examples/helloworld/src/test/java/org/apache/nlpcraft/examples/helloworld/NCModelValidationSpec.scala
index 7486b99..573e8d2 100644
---
a/nlpcraft-examples/helloworld/src/test/java/org/apache/nlpcraft/examples/helloworld/NCModelValidationSpec.scala
+++
b/nlpcraft-examples/helloworld/src/test/java/org/apache/nlpcraft/examples/helloworld/NCModelValidationSpec.scala
@@ -25,7 +25,7 @@ import scala.util.Using
/**
* JUnit model validation.
*/
-class NCModelValidationSpec {
+class NCModelValidationSpec:
private val MDL = new HelloWorldModel(
"opennlp/en-token.bin",
"opennlp/en-pos-maxent.bin",
@@ -34,5 +34,3 @@ class NCModelValidationSpec {
@Test
def test(): Unit = Using.resource(new NCModelClient(MDL)) { client =>
client.ask("It is example", null, "userId") }
-
-}
diff --git a/nlpcraft-examples/lightswitch/pom.xml
b/nlpcraft-examples/lightswitch/pom.xml
index 668e000..aafa04b 100644
--- a/nlpcraft-examples/lightswitch/pom.xml
+++ b/nlpcraft-examples/lightswitch/pom.xml
@@ -57,16 +57,16 @@
<!-- Test dependencies. -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>nlpcraft</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>nlpcraft</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModel.java
b/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModel.java
index 2bce8f4..0b80c29 100644
---
a/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModel.java
+++
b/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModel.java
@@ -26,7 +26,7 @@ import
org.apache.nlpcraft.examples.utils.cities.CitiesDataProvider;
import org.apache.nlpcraft.examples.utils.cities.City;
import org.apache.nlpcraft.examples.utils.cities.CityData;
import org.apache.nlpcraft.examples.utils.keycdn.GeoManager;
-import org.apache.nlpcraft.examples.utils.keycdn.beans.GeoDataBean;
+import org.apache.nlpcraft.examples.utils.keycdn.GeoData;
import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNLPEntityParser;
import org.apache.nlpcraft.nlp.entity.parser.semantic.NCSemanticEntityParser;
import
org.apache.nlpcraft.nlp.entity.parser.semantic.impl.en.NCEnSemanticPorterStemmer;
@@ -168,11 +168,11 @@ public class TimeModel implements NCModel {
// Check for exactly one 'x:time' token **without** looking into the
conversation.
// That's an indication of asking for local time only.
- Optional<GeoDataBean> geoOpt =
geoMrg.get(ctx.getContext().getRequest());
+ Optional<GeoData> geoOpt = geoMrg.get(ctx.getContext().getRequest());
// Get local GEO data from sentence metadata defaulting to
// Silicon Valley location in case we are missing that info.
- GeoDataBean geo = geoOpt.orElseGet(geoMrg::getSiliconValley);
+ GeoData geo = geoOpt.orElseGet(geoMrg::getSiliconValley);
return mkResult(
geo.getCityName(), geo.getCountryName(), geo.getTimezoneName(),
geo.getLatitude(), geo.getLongitude()
diff --git
a/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/GeoDataBean.java
b/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/GeoData.java
similarity index 97%
rename from
nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/GeoDataBean.java
rename to
nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/GeoData.java
index 889a4bd..85c7238 100644
---
a/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/GeoDataBean.java
+++
b/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/GeoData.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.examples.utils.keycdn.beans;
+package org.apache.nlpcraft.examples.utils.keycdn;
import com.google.gson.annotations.SerializedName;
/**
* Service https://tools.keycdn.com/geo response part bean. Geo data holder.
*/
-public class GeoDataBean {
+public class GeoData {
@SerializedName("country_name") private String countryName;
@SerializedName("city") private String cityName;
@SerializedName("latitude") private double latitude;
diff --git
a/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/GeoManager.java
b/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/GeoManager.java
index d3eef00..756fc5a 100644
---
a/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/GeoManager.java
+++
b/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/GeoManager.java
@@ -19,8 +19,6 @@ package org.apache.nlpcraft.examples.utils.keycdn;
import com.google.gson.Gson;
import org.apache.nlpcraft.NCRequest;
-import org.apache.nlpcraft.examples.utils.keycdn.beans.GeoDataBean;
-import org.apache.nlpcraft.examples.utils.keycdn.beans.ResponseBean;
import java.io.BufferedReader;
import java.io.IOException;
@@ -49,7 +47,7 @@ public class GeoManager {
private static final String URL =
"https://tools.keycdn.com/geo.json?host=";;
private static final Gson GSON = new Gson();
- private final Map<String, GeoDataBean> cache = new HashMap<>();
+ private final Map<String, GeoData> cache = new HashMap<>();
private String externalIp = null;
/**
@@ -58,7 +56,7 @@ public class GeoManager {
* @param sen Sentence.
* @return Geo data. Optional.
*/
- public Optional<GeoDataBean> get(NCRequest sen) {
+ public Optional<GeoData> get(NCRequest sen) {
if (externalIp == null) {
try {
externalIp = getExternalIp();
@@ -71,7 +69,7 @@ public class GeoManager {
}
try {
- GeoDataBean geo = cache.get(externalIp);
+ GeoData geo = cache.get(externalIp);
if (geo != null)
return Optional.of(geo);
@@ -86,8 +84,8 @@ public class GeoManager {
InputStream stream = enc != null && enc.equals("gzip") ? new
GZIPInputStream(in) : in;
- ResponseBean resp =
- GSON.fromJson(new BufferedReader(new
InputStreamReader(stream)), ResponseBean.class);
+ Response resp =
+ GSON.fromJson(new BufferedReader(new
InputStreamReader(stream)), Response.class);
if (!resp.getStatus().equals("success"))
throw new IOException(
@@ -137,8 +135,8 @@ public class GeoManager {
*
* @return Silicon Valley location.
*/
- public GeoDataBean getSiliconValley() {
- GeoDataBean geo = new GeoDataBean();
+ public GeoData getSiliconValley() {
+ GeoData geo = new GeoData();
geo.setCityName("");
geo.setCountryName("United States");
diff --git
a/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/ResponseBean.java
b/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/Response.java
similarity index 89%
rename from
nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/ResponseBean.java
rename to
nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/Response.java
index 4840cdf..eca6deb 100644
---
a/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/ResponseBean.java
+++
b/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/Response.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.examples.utils.keycdn.beans;
+package org.apache.nlpcraft.examples.utils.keycdn;
/**
* Service https://tools.keycdn.com/geo response part bean.
*/
-public class ResponseBean {
+class Response {
private String status;
private String description;
- private ResponseDataBean data;
+ private ResponseData data;
/**
* Gets response status.
@@ -48,7 +48,7 @@ public class ResponseBean {
*
* @return Response data.
*/
- public ResponseDataBean getData() {
+ public ResponseData getData() {
return data;
}
@@ -57,7 +57,7 @@ public class ResponseBean {
*
* @param data Response data to set.
*/
- public void setData(ResponseDataBean data) {
+ public void setData(ResponseData data) {
this.data = data;
}
diff --git
a/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/ResponseDataBean.java
b/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/ResponseData.java
similarity index 85%
rename from
nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/ResponseDataBean.java
rename to
nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/ResponseData.java
index 4994867..20a9524 100644
---
a/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/beans/ResponseDataBean.java
+++
b/nlpcraft-examples/utils/src/main/java/org/apache/nlpcraft/examples/utils/keycdn/ResponseData.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.examples.utils.keycdn.beans;
+package org.apache.nlpcraft.examples.utils.keycdn;
/**
* Service https://tools.keycdn.com/geo response bean.
*/
-public class ResponseDataBean {
- private GeoDataBean geo;
+class ResponseData {
+ private GeoData geo;
/**
* Gets geo data holder.
*
* @return Geo data holder.
*/
- public GeoDataBean getGeo() {
+ public GeoData getGeo() {
return geo;
}
@@ -37,7 +37,7 @@ public class ResponseDataBean {
*
* @param geo Geo data holder to set.
*/
- public void setGeo(GeoDataBean geo) {
+ public void setGeo(GeoData geo) {
this.geo = geo;
}
}
diff --git
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
index 20ccb56..1f849f5 100644
---
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
+++
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
@@ -35,7 +35,7 @@ import
org.apache.nlpcraft.examples.utils.cities.CitiesDataProvider;
import org.apache.nlpcraft.examples.utils.cities.City;
import org.apache.nlpcraft.examples.utils.cities.CityData;
import org.apache.nlpcraft.examples.utils.keycdn.GeoManager;
-import org.apache.nlpcraft.examples.utils.keycdn.beans.GeoDataBean;
+import org.apache.nlpcraft.examples.utils.keycdn.GeoData;
import
org.apache.nlpcraft.examples.weather.openweathermap.OpenWeatherMapException;
import
org.apache.nlpcraft.examples.weather.openweathermap.OpenWeatherMapService;
import org.apache.nlpcraft.nlp.entity.parser.semantic.NCSemanticEntityParser;
@@ -115,7 +115,7 @@ public class WeatherModel implements NCModel {
return dataOpt.get().getValue();
}
- Optional<GeoDataBean> geoOpt =
geoMrg.get(ctx.getContext().getRequest());
+ Optional<GeoData> geoOpt = geoMrg.get(ctx.getContext().getRequest());
if (geoOpt.isEmpty())
throw new NCRejection("City cannot be determined.");
@@ -139,7 +139,7 @@ public class WeatherModel implements NCModel {
ctx.getContext().getConversation().clearStm(t ->
t.getId().equals("nlpcraft:city"));
// Try current user location.
- GeoDataBean geo = geoOpt.get();
+ GeoData geo = geoOpt.get();
return new CityData(geo.getTimezoneName(), geo.getLatitude(),
geo.getLongitude());
}
diff --git
a/nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/examples/weather/NCModelValidationSpec.scala
b/nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/examples/weather/NCModelValidationSpec.scala
index 998a0c0..4febb07 100644
---
a/nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/examples/weather/NCModelValidationSpec.scala
+++
b/nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/examples/weather/NCModelValidationSpec.scala
@@ -25,7 +25,7 @@ import scala.util.Using
/**
* JUnit model validation.
*/
-class NCModelValidationSpec {
+class NCModelValidationSpec:
private final val propName = "OWM_API_KEY"
private var mdl: WeatherModel = _
@@ -44,4 +44,3 @@ class NCModelValidationSpec {
@Test
def test(): Unit = Using.resource(new NCModelClient(mdl)) { client =>
client.validateSamples() }
-}
