This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch ver-0.8.0
in repository
https://gitbox.apache.org/repos/asf/incubator-nlpcraft-java-client.git
The following commit(s) were added to refs/heads/ver-0.8.0 by this push:
new 1b66bb6 WIP.
1b66bb6 is described below
commit 1b66bb6f49e12a659b284d684a87c824d567611a
Author: Sergey Kamov <[email protected]>
AuthorDate: Tue May 18 12:26:54 2021 +0300
WIP.
---
.../nlpcraft/client/impl/beans/NCAskBean.java | 5 +-
.../nlpcraft/client/impl/beans/NCAskSyncBean.java | 5 +-
.../nlpcraft/client/impl/beans/NCCheckBean.java | 5 +-
.../nlpcraft/client/impl/beans/NCCompanyBean.java | 64 +++++---
.../client/impl/beans/NCCompanyTokenResetBean.java | 5 +-
.../client/impl/beans/NCErrorMessageBean.java | 7 +-
.../client/impl/beans/NCFeedbackAddBean.java | 5 +-
.../client/impl/beans/NCFeedbackAllBean.java | 5 +-
.../nlpcraft/client/impl/beans/NCFeedbackBean.java | 46 ++++--
.../nlpcraft/client/impl/beans/NCModelBean.java | 22 ++-
.../nlpcraft/client/impl/beans/NCProbeBean.java | 172 ++++++++++++++++-----
.../client/impl/beans/NCProbesAllBean.java | 5 +-
.../client/impl/beans/NCRequestStateBean.java | 59 ++++---
.../nlpcraft/client/impl/beans/NCSigninBean.java | 5 +-
.../client/impl/beans/NCStatusResponseBean.java | 3 +-
.../client/impl/beans/NCSuggestionBean.java | 13 +-
.../client/impl/beans/NCSuggestionDataBean.java | 50 ++++--
.../client/impl/beans/NCSuggestionResultBean.java | 5 +-
.../client/impl/beans/NCTokenCreationBean.java | 15 +-
.../nlpcraft/client/impl/beans/NCUserAddBean.java | 5 +-
.../nlpcraft/client/impl/beans/NCUserBean.java | 77 +++++----
.../nlpcraft/client/impl/beans/NCUsersAllBean.java | 5 +-
22 files changed, 405 insertions(+), 178 deletions(-)
diff --git a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java
index b72cfd3..c5b6750 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java
@@ -22,8 +22,9 @@ import com.google.gson.annotations.SerializedName;
/**
* REST bean.
*/
-public class NCAskBean extends NCStatusResponseBean {
- @SerializedName("srvReqId") private String srvReqId;
+public class NCAskBean extends NCStatusResponseBean {
+ @SerializedName("srvReqId")
+ private String srvReqId;
public String getServerRequestId() {
return srvReqId;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java
index aac9c33..0a461ea 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java
@@ -22,8 +22,9 @@ import com.google.gson.annotations.SerializedName;
/**
* REST bean.
*/
-public class NCAskSyncBean extends NCStatusResponseBean {
- @SerializedName("state") private NCRequestStateBean state;
+public class NCAskSyncBean extends NCStatusResponseBean {
+ @SerializedName("state")
+ private NCRequestStateBean state;
public NCRequestStateBean getState() {
return state;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java
index 93a3a99..2df35ba 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java
@@ -24,8 +24,9 @@ import java.util.List;
/**
* REST bean.
*/
-public class NCCheckBean extends NCStatusResponseBean {
- @SerializedName("states") private List<NCRequestStateBean> states;
+public class NCCheckBean extends NCStatusResponseBean {
+ @SerializedName("states")
+ private List<NCRequestStateBean> states;
public List<NCRequestStateBean> getStates() {
return states;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java
index 9fdf5b6..a781bc3 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java
@@ -26,41 +26,67 @@ import java.util.Map;
* REST bean.
*/
public class NCCompanyBean extends NCStatusResponseBean implements NCCompany {
- @SerializedName("id") private long id;
- @SerializedName("name") private String name;
- @SerializedName("website") private String website;
- @SerializedName("country") private String country;
- @SerializedName("region") private String region;
- @SerializedName("city") private String city;
- @SerializedName("address") private String address;
- @SerializedName("postalCode") private String postalCode;
- @SerializedName("properties") private Map<String, Object> properties;
-
- @Override public long getId() {
+ @SerializedName("id")
+ private long id;
+ @SerializedName("name")
+ private String name;
+ @SerializedName("website")
+ private String website;
+ @SerializedName("country")
+ private String country;
+ @SerializedName("region")
+ private String region;
+ @SerializedName("city")
+ private String city;
+ @SerializedName("address")
+ private String address;
+ @SerializedName("postalCode")
+ private String postalCode;
+ @SerializedName("properties")
+ private Map<String, Object> properties;
+
+ @Override
+ public long getId() {
return id;
}
- @Override public String getName() {
+
+ @Override
+ public String getName() {
return name;
}
- @Override public String getWebsite() {
+
+ @Override
+ public String getWebsite() {
return website;
}
- @Override public String getCountry() {
+
+ @Override
+ public String getCountry() {
return country;
}
- @Override public String getRegion() {
+
+ @Override
+ public String getRegion() {
return region;
}
- @Override public String getCity() {
+
+ @Override
+ public String getCity() {
return city;
}
- @Override public String getAddress() {
+
+ @Override
+ public String getAddress() {
return address;
}
- @Override public String getPostalCode() {
+
+ @Override
+ public String getPostalCode() {
return postalCode;
}
- @Override public Map<String, Object> getProperties() {
+
+ @Override
+ public Map<String, Object> getProperties() {
return properties;
}
}
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
index 5fed10d..73bbdb4 100644
---
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
+++
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
@@ -22,8 +22,9 @@ import com.google.gson.annotations.SerializedName;
/**
* REST bean.
*/
-public class NCCompanyTokenResetBean extends NCStatusResponseBean {
- @SerializedName("token") private String token;
+public class NCCompanyTokenResetBean extends NCStatusResponseBean {
+ @SerializedName("token")
+ private String token;
public String getToken() {
return token;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java
index 73c0d79..d01ea94 100644
---
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java
+++
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java
@@ -23,12 +23,15 @@ import com.google.gson.annotations.SerializedName;
* REST bean.
*/
public class NCErrorMessageBean {
- @SerializedName("code") private String code;
- @SerializedName("msg") private String msg;
+ @SerializedName("code")
+ private String code;
+ @SerializedName("msg")
+ private String msg;
public String getCode() {
return code;
}
+
public String getMessage() {
return msg;
}
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
index d94d03b..a4fc1c7 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
@@ -22,8 +22,9 @@ import com.google.gson.annotations.SerializedName;
/**
* REST bean.
*/
-public class NCFeedbackAddBean extends NCStatusResponseBean {
- @SerializedName("id") private Long id;
+public class NCFeedbackAddBean extends NCStatusResponseBean {
+ @SerializedName("id")
+ private Long id;
public Long getId() {
return id;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
index 91f753a..f2be781 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
@@ -24,8 +24,9 @@ import java.util.List;
/**
* REST bean.
*/
-public class NCFeedbackAllBean extends NCStatusResponseBean {
- @SerializedName("feedback") private List<NCFeedbackBean> feedback;
+public class NCFeedbackAllBean extends NCStatusResponseBean {
+ @SerializedName("feedback")
+ private List<NCFeedbackBean> feedback;
public List<NCFeedbackBean> getFeedback() {
return feedback;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java
index 119ab65..aef0172 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java
@@ -30,40 +30,56 @@ public class NCFeedbackBean implements NCFeedback {
private String comment;
private long createTstamp;
- @Override public String getServerRequestId() {
+ @Override
+ public String getServerRequestId() {
return srvReqId;
}
- @Override public long getCreateTimestamp() {
+
+ public void setServerRequestId(String srvReqId) {
+ this.srvReqId = srvReqId;
+ }
+
+ @Override
+ public long getCreateTimestamp() {
return createTstamp;
}
- @Override public long getUserId() {
+
+ @Override
+ public long getUserId() {
return usrId;
}
- @Override public double getScore() {
+
+ @Override
+ public double getScore() {
return score;
}
- @Override public String getComment() {
+
+ public void setScore(double score) {
+ this.score = score;
+ }
+
+ @Override
+ public String getComment() {
return comment;
}
- @Override public long getId() {
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
- public void setServerRequestId(String srvReqId) {
- this.srvReqId = srvReqId;
- }
+
public void setUsrId(long usrId) {
this.usrId = usrId;
}
- public void setScore(double score) {
- this.score = score;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
+
public void setCreateTstamp(long createTstamp) {
this.createTstamp = createTstamp;
}
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java
index 1fcf975..c2c74c5 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java
@@ -24,17 +24,25 @@ import org.apache.nlpcraft.client.NCModel;
* REST bean.
*/
public class NCModelBean implements NCModel {
- @SerializedName("id") private String id;
- @SerializedName("name") private String name;
- @SerializedName("version") private String version;
-
- @Override public String getId() {
+ @SerializedName("id")
+ private String id;
+ @SerializedName("name")
+ private String name;
+ @SerializedName("version")
+ private String version;
+
+ @Override
+ public String getId() {
return id;
}
- @Override public String getName() {
+
+ @Override
+ public String getName() {
return name;
}
- @Override public String getVersion() {
+
+ @Override
+ public String getVersion() {
return version;
}
}
\ No newline at end of file
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java
index 86f9dda..88a191d 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java
@@ -29,43 +29,137 @@ import java.util.Set;
* REST bean.
*/
public class NCProbeBean implements NCProbe {
- @SerializedName("probeId") private String id;
- @SerializedName("probeToken") private String probeToken;
- @SerializedName("probeGuid") private String probeGuid;
- @SerializedName("probeApiVersion") private String probeApiVersion;
- @SerializedName("probeApiDate") private String probeApiDate;
- @SerializedName("osVersion") private String osVersion;
- @SerializedName("osName") private String osName;
- @SerializedName("osArch") private String osArch;
- @SerializedName("startTstamp") private long startTstamp;
- @SerializedName("tmzId") private String tmzId;
- @SerializedName("tmzAbbr") private String tmzAbbr;
- @SerializedName("tmzName") private String tmzName;
- @SerializedName("userName") private String userName;
- @SerializedName("javaVersion") private String javaVersion;
- @SerializedName("javaVendor") private String javaVendor;
- @SerializedName("hostName") private String hostName;
- @SerializedName("hostAddr") private String hostAddr;
- @SerializedName("macAddr") private String macAddr;
- @SerializedName("models") private Set<NCModelBean> models;
-
- @Override public String getProbeToken() { return probeToken; }
- @Override public String getId() { return id; }
- @Override public String getProbeGuid() { return probeGuid; }
- @Override public String getProbeApiVersion() { return probeApiVersion; }
- @Override public String getProbeApiDate() { return probeApiDate; }
- @Override public String getOsVersion() { return osVersion; }
- @Override public String getOsName() { return osName; }
- @Override public String getOsArchitecture() { return osArch; }
- @Override public long getStartTimestamp() { return startTstamp; }
- @Override public String getTimezoneId() { return tmzId; }
- @Override public String getTimezoneAbbreviation() { return tmzAbbr; }
- @Override public String getTimezoneName() { return tmzName; }
- @Override public String getUserName() { return userName; }
- @Override public String getJavaVersion() { return javaVersion; }
- @Override public String getJavaVendor() { return javaVendor; }
- @Override public String getHostName() { return hostName; }
- @Override public String getHostAddress() { return hostAddr; }
- @Override public String getMacAddress() { return macAddr; }
- @Override public Set<NCModel> getModels() { return models != null ? new
HashSet<>(models) : Collections.emptySet(); }
+ @SerializedName("probeId")
+ private String id;
+ @SerializedName("probeToken")
+ private String probeToken;
+ @SerializedName("probeGuid")
+ private String probeGuid;
+ @SerializedName("probeApiVersion")
+ private String probeApiVersion;
+ @SerializedName("probeApiDate")
+ private String probeApiDate;
+ @SerializedName("osVersion")
+ private String osVersion;
+ @SerializedName("osName")
+ private String osName;
+ @SerializedName("osArch")
+ private String osArch;
+ @SerializedName("startTstamp")
+ private long startTstamp;
+ @SerializedName("tmzId")
+ private String tmzId;
+ @SerializedName("tmzAbbr")
+ private String tmzAbbr;
+ @SerializedName("tmzName")
+ private String tmzName;
+ @SerializedName("userName")
+ private String userName;
+ @SerializedName("javaVersion")
+ private String javaVersion;
+ @SerializedName("javaVendor")
+ private String javaVendor;
+ @SerializedName("hostName")
+ private String hostName;
+ @SerializedName("hostAddr")
+ private String hostAddr;
+ @SerializedName("macAddr")
+ private String macAddr;
+ @SerializedName("models")
+ private Set<NCModelBean> models;
+
+ @Override
+ public String getProbeToken() {
+ return probeToken;
+ }
+
+ @Override
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public String getProbeGuid() {
+ return probeGuid;
+ }
+
+ @Override
+ public String getProbeApiVersion() {
+ return probeApiVersion;
+ }
+
+ @Override
+ public String getProbeApiDate() {
+ return probeApiDate;
+ }
+
+ @Override
+ public String getOsVersion() {
+ return osVersion;
+ }
+
+ @Override
+ public String getOsName() {
+ return osName;
+ }
+
+ @Override
+ public String getOsArchitecture() {
+ return osArch;
+ }
+
+ @Override
+ public long getStartTimestamp() {
+ return startTstamp;
+ }
+
+ @Override
+ public String getTimezoneId() {
+ return tmzId;
+ }
+
+ @Override
+ public String getTimezoneAbbreviation() {
+ return tmzAbbr;
+ }
+
+ @Override
+ public String getTimezoneName() {
+ return tmzName;
+ }
+
+ @Override
+ public String getUserName() {
+ return userName;
+ }
+
+ @Override
+ public String getJavaVersion() {
+ return javaVersion;
+ }
+
+ @Override
+ public String getJavaVendor() {
+ return javaVendor;
+ }
+
+ @Override
+ public String getHostName() {
+ return hostName;
+ }
+
+ @Override
+ public String getHostAddress() {
+ return hostAddr;
+ }
+
+ @Override
+ public String getMacAddress() {
+ return macAddr;
+ }
+
+ @Override
+ public Set<NCModel> getModels() {
+ return models != null ? new HashSet<>(models) : Collections.emptySet();
+ }
}
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java
index e9a9f64..622577b 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java
@@ -24,8 +24,9 @@ import java.util.List;
/**
* REST bean.
*/
-public class NCProbesAllBean extends NCStatusResponseBean {
- @SerializedName("probes") private List<NCProbeBean> probes;
+public class NCProbesAllBean extends NCStatusResponseBean {
+ @SerializedName("probes")
+ private List<NCProbeBean> probes;
public List<NCProbeBean> getProbes() {
return probes;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java
index 2891ee1..1adfec6 100644
---
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java
+++
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java
@@ -42,51 +42,86 @@ public class NCRequestStateBean implements NCResult {
public String getServerRequestId() {
return srvReqId;
}
+
@Override
public String getText() {
return txt;
}
+
@Override
public long getUserId() {
return usrId;
}
+
@Override
public String getModelId() {
return mdlId;
}
+
@Override
public String getProbeId() {
return probeId;
}
+
+ public void setProbeId(String probeId) {
+ this.probeId = probeId;
+ }
+
@Override
public String getResultType() {
return resType;
}
+
+ public void setResultType(String resType) {
+ this.resType = resType;
+ }
+
@Override
public String getResultBody() {
return resBody;
}
+
+ public void setResultBody(String resBody) {
+ this.resBody = resBody;
+ }
+
@Override
public boolean isReady() {
return "QRY_READY".equals(status);
}
+
@Override
public Integer getErrorCode() {
return errorCode;
}
+
+ public void setErrorCode(Integer errorCode) {
+ this.errorCode = errorCode;
+ }
+
@Override
public String getErrorMessage() {
return error;
}
+
@Override
public String getLogHolder() {
return logHolder;
}
+
+ public void setLogHolder(String logHolder) {
+ this.logHolder = logHolder;
+ }
+
@Override
public Map<String, Object> getResultMeta() {
return resMeta;
}
+ public void setResultMeta(Map<String, Object> resMeta) {
+ this.resMeta = resMeta;
+ }
+
public void setSrvReqId(String srvReqId) {
this.srvReqId = srvReqId;
}
@@ -103,35 +138,11 @@ public class NCRequestStateBean implements NCResult {
this.mdlId = mdlId;
}
- public void setProbeId(String probeId) {
- this.probeId = probeId;
- }
-
- public void setResultType(String resType) {
- this.resType = resType;
- }
-
- public void setResultBody(String resBody) {
- this.resBody = resBody;
- }
-
public void setStatus(String status) {
this.status = status;
}
- public void setErrorCode(Integer errorCode) {
- this.errorCode = errorCode;
- }
-
public void setError(String error) {
this.error = error;
}
-
- public void setLogHolder(String logHolder) {
- this.logHolder = logHolder;
- }
-
- public void setResultMeta(Map<String, Object> resMeta) {
- this.resMeta = resMeta;
- }
}
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java
index 1051b85..1779deb 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java
@@ -22,8 +22,9 @@ import com.google.gson.annotations.SerializedName;
/**
* REST bean.
*/
-public class NCSigninBean extends NCStatusResponseBean {
- @SerializedName("acsTok") private String acsTok;
+public class NCSigninBean extends NCStatusResponseBean {
+ @SerializedName("acsTok")
+ private String acsTok;
public String getAccessToken() {
return acsTok;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java
index c3ac263..f6c44d1 100644
---
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java
+++
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java
@@ -23,7 +23,8 @@ import com.google.gson.annotations.SerializedName;
* REST bean.
*/
public class NCStatusResponseBean {
- @SerializedName("status") private String status;
+ @SerializedName("status")
+ private String status;
public String getStatus() {
return status;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionBean.java
index 943bfde..2130517 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionBean.java
@@ -24,13 +24,18 @@ import org.apache.nlpcraft.client.NCSuggestion;
* REST bean.
*/
public class NCSuggestionBean implements NCSuggestion {
- @SerializedName("score") private double score;
- @SerializedName("synonym") private String synonym;
+ @SerializedName("score")
+ private double score;
+ @SerializedName("synonym")
+ private String synonym;
- @Override public double getScore() {
+ @Override
+ public double getScore() {
return score;
}
- @Override public String getSynonym() {
+
+ @Override
+ public String getSynonym() {
return synonym;
}
}
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionDataBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionDataBean.java
index 7804d1a..6321dcc 100644
---
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionDataBean.java
+++
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionDataBean.java
@@ -30,26 +30,50 @@ import java.util.stream.Collectors;
* REST bean.
*/
public class NCSuggestionDataBean implements NCSuggestionData {
- @SerializedName("modelId") private String modelId;
- @SerializedName("minScore") private double minScore;
- @SerializedName("durationMs") private long durationMs;
- @SerializedName("timestamp") private long timestamp;
- @SerializedName("error") private String error;
- @SerializedName("suggestions") private List<Map<String,
List<NCSuggestionBean>>> suggestions;
- @SerializedName("warnings") private java.util.List<String> warnings;
+ @SerializedName("modelId")
+ private String modelId;
+ @SerializedName("minScore")
+ private double minScore;
+ @SerializedName("durationMs")
+ private long durationMs;
+ @SerializedName("timestamp")
+ private long timestamp;
+ @SerializedName("error")
+ private String error;
+ @SerializedName("suggestions")
+ private List<Map<String, List<NCSuggestionBean>>> suggestions;
+ @SerializedName("warnings")
+ private java.util.List<String> warnings;
- @Override public List<String> getWarnings() { return warnings; }
- @Override public String getModelId() {
+ @Override
+ public List<String> getWarnings() {
+ return warnings;
+ }
+
+ @Override
+ public String getModelId() {
return modelId;
}
- @Override public double getMinScore() {
+
+ @Override
+ public double getMinScore() {
return minScore;
}
- @Override public long getDurationMs() {
+
+ @Override
+ public long getDurationMs() {
return durationMs;
}
- @Override public long getTimestamp() { return timestamp; }
- @Override public String getError() { return error; }
+
+ @Override
+ public long getTimestamp() {
+ return timestamp;
+ }
+
+ @Override
+ public String getError() {
+ return error;
+ }
@Override
public List<Map<String, List<NCSuggestion>>> getSynonyms() {
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionResultBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionResultBean.java
index 304bb39..67a1fb2 100644
---
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionResultBean.java
+++
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionResultBean.java
@@ -22,8 +22,9 @@ import com.google.gson.annotations.SerializedName;
/**
* REST bean.
*/
-public class NCSuggestionResultBean extends NCStatusResponseBean {
- @SerializedName("result") private NCSuggestionDataBean result;
+public class NCSuggestionResultBean extends NCStatusResponseBean {
+ @SerializedName("result")
+ private NCSuggestionDataBean result;
public NCSuggestionDataBean getResult() {
return result;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java
index fb1dc78..4f2666b 100644
---
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java
+++
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java
@@ -24,13 +24,18 @@ import org.apache.nlpcraft.client.NCNewCompany;
* REST bean.
*/
public class NCTokenCreationBean extends NCStatusResponseBean implements
NCNewCompany {
- @SerializedName("token") private String token;
- @SerializedName("adminId") private long adminId;
-
- @Override public String getToken() {
+ @SerializedName("token")
+ private String token;
+ @SerializedName("adminId")
+ private long adminId;
+
+ @Override
+ public String getToken() {
return token;
}
- @Override public long getAdminUserId() {
+
+ @Override
+ public long getAdminUserId() {
return adminId;
}
}
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java
index e6086e3..a4df0e2 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java
@@ -22,8 +22,9 @@ import com.google.gson.annotations.SerializedName;
/**
* REST bean.
*/
-public class NCUserAddBean extends NCStatusResponseBean {
- @SerializedName("id") private long id;
+public class NCUserAddBean extends NCStatusResponseBean {
+ @SerializedName("id")
+ private long id;
public long getId() {
return id;
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java
index 769353f..31c88c5 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java
@@ -26,37 +26,60 @@ import java.util.Map;
* REST bean.
*/
public class NCUserBean extends NCStatusResponseBean implements NCUser {
- @SerializedName("id") private long id;
- @SerializedName("usrExtId") private String usrExtId;
- @SerializedName("email") private String email;
- @SerializedName("firstName") private String firstName;
- @SerializedName("lastName") private String lastName;
- @SerializedName("avatarUrl") private String avatarUrl;
- @SerializedName("isAdmin") private boolean isAdmin;
- @SerializedName("properties") private Map<String, Object> properties;
-
- @Override public long getId() {
+ @SerializedName("id")
+ private long id;
+ @SerializedName("usrExtId")
+ private String usrExtId;
+ @SerializedName("email")
+ private String email;
+ @SerializedName("firstName")
+ private String firstName;
+ @SerializedName("lastName")
+ private String lastName;
+ @SerializedName("avatarUrl")
+ private String avatarUrl;
+ @SerializedName("isAdmin")
+ private boolean isAdmin;
+ @SerializedName("properties")
+ private Map<String, Object> properties;
+
+ @Override
+ public long getId() {
return id;
}
- @Override public String getEmail() {
+
+ @Override
+ public String getEmail() {
return email;
}
- @Override public String getFirstName() {
- return firstName;
-}
- @Override public String getLastName() {
- return lastName;
-}
- @Override public String getAvatarUrl() {
- return avatarUrl;
-}
- @Override public boolean isAdmin() {
- return isAdmin;
-}
- @Override public String getExternalId() {
- return usrExtId;
-}
- @Override public Map<String, Object> getProperties() {
+
+ @Override
+ public String getFirstName() {
+ return firstName;
+ }
+
+ @Override
+ public String getLastName() {
+ return lastName;
+ }
+
+ @Override
+ public String getAvatarUrl() {
+ return avatarUrl;
+ }
+
+ @Override
+ public boolean isAdmin() {
+ return isAdmin;
+ }
+
+ @Override
+ public String getExternalId() {
+ return usrExtId;
+ }
+
+ @Override
+ public Map<String, Object> getProperties() {
return properties;
}
}
diff --git
a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java
b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java
index 3808dd3..62b525b 100644
--- a/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java
@@ -24,8 +24,9 @@ import java.util.List;
/**
* REST bean.
*/
-public class NCUsersAllBean extends NCStatusResponseBean {
- @SerializedName("users") private List<NCUserBean> users;
+public class NCUsersAllBean extends NCStatusResponseBean {
+ @SerializedName("users")
+ private List<NCUserBean> users;
public List<NCUserBean> getUsers() {
return users;
