You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/06/01 23:06:21 UTC

[incubator-nlpcraft] branch master updated: Ignite to 2.8.1 + Javadoc fixes in examples.

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 616a06f  Ignite to 2.8.1 + Javadoc fixes in examples.
616a06f is described below

commit 616a06f9e313e99b0879e84383d8bcf932e359d3
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Mon Jun 1 16:06:07 2020 -0700

    Ignite to 2.8.1 + Javadoc fixes in examples.
---
 pom.xml                                            |  2 +-
 .../examples/misc/geo/keycdn/GeoManager.java       |  2 +-
 .../misc/geo/keycdn/beans/GeoDataBean.java         | 70 ++++++++++++++++++----
 .../misc/geo/keycdn/beans/ResponseBean.java        | 42 +++++++++++--
 .../misc/geo/keycdn/beans/ResponseDataBean.java    | 14 ++++-
 .../nlpcraft/examples/weather/WeatherModel.java    |  2 +-
 6 files changed, 111 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index a4833ca..1815846 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
         <scala.base>2.12</scala.base>
 
         <!-- Versions. -->
-        <ignite.ver>2.7.5</ignite.ver>
+        <ignite.ver>2.8.1</ignite.ver>
         <scala.plugin.ver>4.3.1</scala.plugin.ver>
         <log4j.ver>2.12.0</log4j.ver>
         <scala.ver>${scala.base}.11</scala.ver>
diff --git a/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/GeoManager.java b/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/GeoManager.java
index a390a82..e254c04 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/GeoManager.java
+++ b/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/GeoManager.java
@@ -119,7 +119,7 @@ public class GeoManager {
         catch (Exception e) {
             System.err.println(
                 MessageFormat.format(
-                    "Unable to answer due to IP Location Finder (keycdn) error for host: {0}",
+                    "Unable to answer due to IP location finder (keycdn) error for host: {0}",
                     host
                 )
             );
diff --git a/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/GeoDataBean.java b/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/GeoDataBean.java
index fb05eef..e6754fa 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/GeoDataBean.java
+++ b/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/GeoDataBean.java
@@ -28,43 +28,93 @@ public class GeoDataBean {
     @SerializedName("latitude") private double latitude;
     @SerializedName("longitude") private double longitude;
     @SerializedName("timezone") private String timezoneName;
-    
+
+    /**
+     * Gets country name.
+     *
+     * @return Country name.
+     */
     public String getCountryName() {
         return countryName;
     }
-    
+
+    /**
+     * Sets country name.
+     *
+     * @param countryName Country name to set.
+     */
     public void setCountryName(String countryName) {
         this.countryName = countryName;
     }
-    
+
+    /**
+     * Gets city name.
+     *
+     * @return City name.
+     */
     public String getCityName() {
         return cityName;
     }
-    
+
+    /**
+     * Set city name.
+     *
+     * @param cityName City name to set.
+     */
     public void setCityName(String cityName) {
         this.cityName = cityName;
     }
-    
+
+    /**
+     * Gets latitude.
+     *
+     * @return Latitude.
+     */
     public double getLatitude() {
         return latitude;
     }
-    
+
+    /**
+     * Sets latitude.
+     *
+     * @param latitude Latitude to set.
+     */
     public void setLatitude(double latitude) {
         this.latitude = latitude;
     }
-    
+
+    /**
+     * Gets longitude.
+     *
+     * @return Longitude.
+     */
     public double getLongitude() {
         return longitude;
     }
-    
+
+    /**
+     * Sets longitude.
+     *
+     * @param longitude Longitude to set.
+     */
     public void setLongitude(double longitude) {
         this.longitude = longitude;
     }
-    
+
+    /**
+     * Get timezone name.
+     *
+     * @return Timezone name.
+     */
     public String getTimezoneName() {
         return timezoneName;
     }
-    
+
+    /**
+     * Sets timezone name.
+     *
+     * @param timezoneName Timezone name to set.
+     */
     public void setTimezoneName(String timezoneName) {
         this.timezoneName = timezoneName;
     }
diff --git a/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/ResponseBean.java b/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/ResponseBean.java
index 80ffaab..1f6dcbd 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/ResponseBean.java
+++ b/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/ResponseBean.java
@@ -24,27 +24,57 @@ public class ResponseBean {
     private String status;
     private String description;
     private ResponseDataBean data;
-    
+
+    /**
+     * Gets response status.
+     *
+     * @return Response status.
+     */
     public String getStatus() {
         return status;
     }
-    
+
+    /**
+     * Sets response status.
+     *
+     * @param status Response status to set.
+     */
     public void setStatus(String status) {
         this.status = status;
     }
-    
+
+    /**
+     * Gets response data.
+     *
+     * @return Response data.
+     */
     public ResponseDataBean getData() {
         return data;
     }
-    
+
+    /**
+     * Sets response data.
+     *
+     * @param data Response data to set.
+     */
     public void setData(ResponseDataBean data) {
         this.data = data;
     }
-    
+
+    /**
+     * Gets response description.
+     *
+     * @return Response description.
+     */
     public String getDescription() {
         return description;
     }
-    
+
+    /**
+     * Sets response description.
+     *
+     * @param description Response description to set.
+     */
     public void setDescription(String description) {
         this.description = description;
     }
diff --git a/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/ResponseDataBean.java b/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/ResponseDataBean.java
index 2f6596f..d86bb16 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/ResponseDataBean.java
+++ b/src/main/scala/org/apache/nlpcraft/examples/misc/geo/keycdn/beans/ResponseDataBean.java
@@ -22,11 +22,21 @@ package org.apache.nlpcraft.examples.misc.geo.keycdn.beans;
  */
 public class ResponseDataBean {
     private GeoDataBean geo;
-    
+
+    /**
+     * Gets geo data holder.
+     *
+     * @return Geo data holder.
+     */
     public GeoDataBean getGeo() {
         return geo;
     }
-    
+
+    /**
+     * Sets get data holder.
+     *
+     * @param geo Geo data holder to set.
+     */
     public void setGeo(GeoDataBean geo) {
         this.geo = geo;
     }
diff --git a/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java b/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
index 2b7d683..c3bf06c 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
+++ b/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
@@ -167,7 +167,7 @@ public class WeatherModel extends NCModelFileAdapter {
      * @param ctx Solver context.
      */
     private void checkMatch(NCIntentMatch ctx) {
-        // Reject if intent match is not exact ("dangling" tokens remain).
+        // Reject if intent match is not exact (at least one "dangling" token remain).
         if (ctx.isAmbiguous())
             throw new NCRejection("Please clarify your request.");
     }