This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch master-model
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/master-model by this push:
new 6ea65e8 WIP.
6ea65e8 is described below
commit 6ea65e858548abcaa4f07df496426fa774e43c87
Author: Sergey Kamov <[email protected]>
AuthorDate: Fri Oct 8 10:35:49 2021 +0300
WIP.
---
.../src/main/scala/org/apache/nlpcraft/NCNlpcraftBuilder.java | 1 +
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCContext.java | 5 ++---
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCElement.java | 8 +++++---
.../src/main/scala/org/apache/nlpcraft/model/NCIntentMatch.java | 5 ++---
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCMetadata.java | 1 +
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCToken.java | 8 --------
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCValue.java | 2 +-
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java | 1 +
8 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCNlpcraftBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCNlpcraftBuilder.java
index b5d3255..9d8aaca 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCNlpcraftBuilder.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCNlpcraftBuilder.java
@@ -7,6 +7,7 @@ public class NCNlpcraftBuilder {
return null;
}
+ // TODO: add deserialization component.
public NCNlpcraftBuilder withUrl(String url) {
return null;
}
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCContext.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCContext.java
index a5250b2..17b24af 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCContext.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCContext.java
@@ -17,10 +17,9 @@
package org.apache.nlpcraft.model;
-import java.io.*;
-import java.util.*;
+import java.util.Collection;
-public interface NCContext extends NCMetadata, Serializable {
+public interface NCContext extends NCMetadata {
boolean isOwnerOf(NCToken tok);
Collection<? extends NCVariant> getVariants();
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCElement.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCElement.java
index d21d52a..428ef2e 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCElement.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCElement.java
@@ -17,10 +17,12 @@
package org.apache.nlpcraft.model;
-import java.io.*;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
-public interface NCElement extends NCMetadata, Serializable {
+public interface NCElement extends NCMetadata {
String getId();
default List<String> getGroups() {
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCIntentMatch.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCIntentMatch.java
index 330d884..fcdb700 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCIntentMatch.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCIntentMatch.java
@@ -17,10 +17,9 @@
package org.apache.nlpcraft.model;
-import java.io.*;
-import java.util.*;
+import java.util.List;
-public interface NCIntentMatch extends NCMetadata, Serializable {
+public interface NCIntentMatch extends NCMetadata {
String getIntentId();
NCContext getContext();
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCMetadata.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCMetadata.java
index 91c10f4..5ab5323 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCMetadata.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCMetadata.java
@@ -26,6 +26,7 @@ import java.util.*;
* Read full documentation in <a target=_
href="https://nlpcraft.apache.org/data-model.html";>Data Model</a> section and
review
* <a target=_
href="https://github.com/apache/incubator-nlpcraft/tree/master/nlpcraft-examples";>examples</a>.
*/
+// TODO: Let's drop it and add getMeta where it is necessary.
public interface NCMetadata {
/**
* Factory for creating metadata out of standard map.
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCToken.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCToken.java
index 4b7eb26..463e3a3 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCToken.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCToken.java
@@ -20,10 +20,6 @@ package org.apache.nlpcraft.model;
import java.util.List;
public interface NCToken extends NCMetadata {
- NCModel getModel();
-
- String getServerRequestId();
-
String getId();
String getParentId();
@@ -31,10 +27,6 @@ public interface NCToken extends NCMetadata {
List<String> getGroups();
- default boolean isMemberOf(String grp) {
- return getGroups().contains(grp);
- }
-
int getStartCharIndex();
int getEndCharIndex();
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCValue.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCValue.java
index 227516c..f846c19 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCValue.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCValue.java
@@ -31,7 +31,7 @@ import java.util.List;
*
* @see NCElement#getValues()
*/
-public interface NCValue extends Serializable {
+public interface NCValue {
/**
* Gets value name.
*
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java
index 0e81211..f3ccb47 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java
@@ -20,6 +20,7 @@ package org.apache.nlpcraft.model;
import java.util.*;
import java.util.stream.*;
+// TODO: let's drop the inheritance off List.
public interface NCVariant extends List<NCToken>, NCMetadata {
default List<NCToken> getMatchedTokens() {
return stream().filter(tok -> !tok.isFreeWord() &&
!tok.isStopWord()).collect(Collectors.toList());
