This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-474
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-474 by this push:
new eca266f WIP
eca266f is described below
commit eca266fc3cff63bc24b0a701d196bb98f5f0d1e7
Author: Aaron Radzinski <[email protected]>
AuthorDate: Wed Jan 19 12:05:16 2022 -0800
WIP
---
...ntityParser.java => NCStanfordNLPEntityParser.java} | 18 +++++++-----------
...rImpl.scala => NCStanfordNLPEntityParserImpl.scala} | 4 ++--
...dTokenParser.java => NCStanfordNLPTokenParser.java} | 14 ++++++--------
...lpImpl.scala => NCStanfordNLPTokenParserImpl.scala} | 4 ++--
.../parser/stanford/NCStanfordEntityParserSpec.scala | 4 +---
.../nlpcraft/nlp/util/stanford/NCTestConfig.scala | 4 ++--
.../{NCNlpEntityParser.java => NCNLPEntityParser.java} | 6 +++---
...ityParserImpl.scala => NCNLPEntityParserImpl.scala} | 6 +++---
...NlpEntityParser.java => NCOpenNLPEntityParser.java} | 15 +++++++--------
...arserImpl.scala => NCOpenNLPEntityParserImpl.scala} | 2 +-
...enNlpTokenParser.java => NCOpenNLPTokenParser.java} | 10 +++++-----
...ParserImpl.scala => NCOpenNLPTokenParserImpl.scala} | 2 +-
.../internal/NCModelPipelineProcessorSpec.scala | 2 +-
.../opennlp/NCEnOpenNlpTokenParserBenchmark.java | 6 +++---
.../nlp/entity/parser/nlp/NCNlpEntityParserSpec.scala | 4 ++--
...arserSpec.scala => NCOpenNLPEntityParserSpec.scala} | 5 ++---
.../semantic/NCSemanticEntityParserJsonSpec.scala | 4 ++--
.../parser/semantic/NCSemanticEntityParserSpec.scala | 2 +-
.../semantic/NCSemanticEntityParserYamlSpec.scala | 2 +-
.../org/apache/nlpcraft/nlp/util/NCTestPipeline.scala | 2 +-
.../nlpcraft/nlp/util/opennlp/NCTestConfig.scala | 4 ++--
21 files changed, 55 insertions(+), 65 deletions(-)
diff --git
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordEntityParser.java
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordNLPEntityParser.java
similarity index 81%
rename from
nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordEntityParser.java
rename to
nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordNLPEntityParser.java
index cdc5be2..2b858aa 100644
---
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordEntityParser.java
+++
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordNLPEntityParser.java
@@ -23,7 +23,7 @@ import org.apache.nlpcraft.NCEntityParser;
import org.apache.nlpcraft.NCModelConfig;
import org.apache.nlpcraft.NCRequest;
import org.apache.nlpcraft.NCToken;
-import
org.apache.nlpcraft.nlp.entity.parser.stanford.impl.NCStanfordEntityParserImpl;
+import
org.apache.nlpcraft.nlp.entity.parser.stanford.impl.NCStanfordNLPEntityParserImpl;
import java.util.Collections;
import java.util.List;
@@ -31,18 +31,16 @@ import java.util.Objects;
import java.util.Set;
/**
- * TODO: add javadoc based on comments below.
*
* Generates entities with
* - ID `stanford:{name}` where 'name' is element name from configured
StanfordCoreNLP instance, from supported set
* - property `stanford:{name}:confidence`, where confidence is double value
between 0 and 1. Optional.
* - property `stanford:{name}:nne`, where nne is normalized value. Optional.
*/
-public class NCStanfordEntityParser implements NCEntityParser {
- private final NCStanfordEntityParserImpl impl;
+public class NCStanfordNLPEntityParser implements NCEntityParser {
+ private final NCStanfordNLPEntityParserImpl impl;
/**
- * TODO: add javadoc based on comments below.
*
* Requires configured StanfordCoreNLP instance.
* Example:
@@ -53,12 +51,11 @@ public class NCStanfordEntityParser implements
NCEntityParser {
* @param stanford
* @param supported
*/
- public NCStanfordEntityParser(StanfordCoreNLP stanford, Set<String>
supported) {
- // TODO: error texts.
+ public NCStanfordNLPEntityParser(StanfordCoreNLP stanford, Set<String>
supported) {
Objects.requireNonNull(stanford, "Stanford instance cannot be null.");
Objects.requireNonNull(supported, "Supported elements set cannot be
null.");
- this.impl = new NCStanfordEntityParserImpl(stanford, supported);
+ this.impl = new NCStanfordNLPEntityParserImpl(stanford, supported);
}
/**
@@ -66,12 +63,11 @@ public class NCStanfordEntityParser implements
NCEntityParser {
* @param stanford
* @param supported
*/
- public NCStanfordEntityParser(StanfordCoreNLP stanford, String supported) {
- // TODO: error texts.
+ public NCStanfordNLPEntityParser(StanfordCoreNLP stanford, String
supported) {
Objects.requireNonNull(stanford, "Stanford instance cannot be null.");
Objects.requireNonNull(supported, "Supported element cannot be null.");
- this.impl = new NCStanfordEntityParserImpl(stanford,
Collections.singleton(supported));
+ this.impl = new NCStanfordNLPEntityParserImpl(stanford,
Collections.singleton(supported));
}
@Override
diff --git
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/impl/NCStanfordEntityParserImpl.scala
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/impl/NCStanfordNLPEntityParserImpl.scala
similarity index 94%
rename from
nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/impl/NCStanfordEntityParserImpl.scala
rename to
nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/impl/NCStanfordNLPEntityParserImpl.scala
index bbcbfc3..d308a74 100644
---
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/impl/NCStanfordEntityParserImpl.scala
+++
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/entity/parser/stanford/impl/NCStanfordNLPEntityParserImpl.scala
@@ -32,7 +32,7 @@ import scala.jdk.CollectionConverters.*
* @param stanford
* @param supported
*/
-class NCStanfordEntityParserImpl(stanford: StanfordCoreNLP, supported:
JSet[String]) extends NCEntityParser:
+class NCStanfordNLPEntityParserImpl(stanford: StanfordCoreNLP, supported:
JSet[String]) extends NCEntityParser:
require(stanford != null)
require(supported != null)
@@ -57,7 +57,7 @@ class NCStanfordEntityParserImpl(stanford: StanfordCoreNLP,
supported: JSet[Stri
val nne =
e.coreMap().get(classOf[NormalizedNamedEntityTagAnnotation])
if nne != null then props += "nne" -> nne
- // Key ignored because it can be category with higher
level (`location` for type `country`)
+ // Key ignored because it can be category with higher
level (`location` for type `country`).
val conf = e.entityTypeConfidences()
if conf != null && conf.size() == 1 then props +=
"confidence" -> conf.asScala.head._2
diff --git
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/NCStanfordTokenParser.java
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/NCStanfordNLPTokenParser.java
similarity index 84%
rename from
nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/NCStanfordTokenParser.java
rename to
nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/NCStanfordNLPTokenParser.java
index 9e331b5..747ac3e 100644
---
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/NCStanfordTokenParser.java
+++
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/NCStanfordNLPTokenParser.java
@@ -20,19 +20,18 @@ package org.apache.nlpcraft.nlp.token.parser.stanford;
import edu.stanford.nlp.pipeline.StanfordCoreNLP;
import org.apache.nlpcraft.NCToken;
import org.apache.nlpcraft.NCTokenParser;
-import org.apache.nlpcraft.nlp.token.parser.stanford.impl.NCStanfordNlpImpl;
+import
org.apache.nlpcraft.nlp.token.parser.stanford.impl.NCStanfordNLPTokenParserImpl;
import java.util.List;
import java.util.Objects;
/**
- * TODO:
+ *
*/
-public class NCStanfordTokenParser implements NCTokenParser {
- private final NCStanfordNlpImpl impl;
+public class NCStanfordNLPTokenParser implements NCTokenParser {
+ private final NCStanfordNLPTokenParserImpl impl;
/**
- * TODO: add javadoc based on comments below.
*
* Requires configured StanfordCoreNLP instance.
* Example:
@@ -43,11 +42,10 @@ public class NCStanfordTokenParser implements NCTokenParser
{
*
* @param stanford
*/
- public NCStanfordTokenParser(StanfordCoreNLP stanford) {
- // TODO: error texts.
+ public NCStanfordNLPTokenParser(StanfordCoreNLP stanford) {
Objects.requireNonNull(stanford, "Stanford instance cannot be null.");
- impl = new NCStanfordNlpImpl(stanford);
+ impl = new NCStanfordNLPTokenParserImpl(stanford);
}
@Override
diff --git
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNlpImpl.scala
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNLPTokenParserImpl.scala
similarity index 92%
rename from
nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNlpImpl.scala
rename to
nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNLPTokenParserImpl.scala
index fd29513..ba24664 100644
---
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNlpImpl.scala
+++
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNLPTokenParserImpl.scala
@@ -34,14 +34,14 @@ import scala.jdk.CollectionConverters.*
*
* @param stanford
*/
-class NCStanfordNlpImpl(stanford: StanfordCoreNLP) extends NCTokenParser:
+class NCStanfordNLPTokenParserImpl(stanford: StanfordCoreNLP) extends
NCTokenParser:
require(stanford != null)
override def tokenize(text: String): JList[NCToken] =
val doc = new CoreDocument(text)
stanford.annotate(doc)
val ann = doc.annotation().get(classOf[SentencesAnnotation])
- if ann == null then E("Sentence annotation not found.") // TODO: error
text.
+ if ann == null then E("Sentence annotation not found.")
val toks =
ann.asScala.flatMap(_.asInstanceOf[ArrayCoreMap].get(classOf[TokensAnnotation]).asScala).
zipWithIndex.map { (t, idx) =>
diff --git
a/nlpcraft-stanford/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordEntityParserSpec.scala
b/nlpcraft-stanford/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordEntityParserSpec.scala
index 3ef5b3b..667bc89 100644
---
a/nlpcraft-stanford/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordEntityParserSpec.scala
+++
b/nlpcraft-stanford/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordEntityParserSpec.scala
@@ -17,8 +17,6 @@
package org.apache.nlpcraft.nlp.entity.parser.stanford
-import org.apache.nlpcraft.nlp.entity.parser.stanford.NCStanfordEntityParser
-import org.apache.nlpcraft.nlp.token.parser.stanford.NCStanfordTokenParser
import org.apache.nlpcraft.nlp.util.*
import org.apache.nlpcraft.nlp.util.stanford.*
import org.junit.jupiter.api.Test
@@ -29,7 +27,7 @@ import scala.jdk.CollectionConverters.*
*
*/
class NCStanfordEntityParserSpec:
- private val parser = NCStanfordEntityParser(STANFORD, Set("city", "date",
"number", "email").asJava)
+ private val parser = NCStanfordNLPEntityParser(STANFORD, Set("city",
"date", "number", "email").asJava)
@Test
def test(): Unit =
diff --git
a/nlpcraft-stanford/src/test/scala/org/apache/nlpcraft/nlp/util/stanford/NCTestConfig.scala
b/nlpcraft-stanford/src/test/scala/org/apache/nlpcraft/nlp/util/stanford/NCTestConfig.scala
index 323341e..3fd5caa 100644
---
a/nlpcraft-stanford/src/test/scala/org/apache/nlpcraft/nlp/util/stanford/NCTestConfig.scala
+++
b/nlpcraft-stanford/src/test/scala/org/apache/nlpcraft/nlp/util/stanford/NCTestConfig.scala
@@ -2,7 +2,7 @@ package org.apache.nlpcraft.nlp.util.stanford
import edu.stanford.nlp.pipeline.StanfordCoreNLP
import org.apache.nlpcraft.NCModelConfig
-import org.apache.nlpcraft.nlp.token.parser.stanford.NCStanfordTokenParser
+import org.apache.nlpcraft.nlp.token.parser.stanford.NCStanfordNLPTokenParser
import org.apache.nlpcraft.nlp.util.NCTestPipeline
import java.util.Properties
@@ -22,4 +22,4 @@ final val STANFORD =
/**
*
*/
-final val EN_STANFORD_PIPELINE = NCTestPipeline(new
NCStanfordTokenParser(STANFORD))
+final val EN_STANFORD_PIPELINE = NCTestPipeline(new
NCStanfordNLPTokenParser(STANFORD))
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNlpEntityParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNLPEntityParser.java
similarity index 89%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNlpEntityParser.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNLPEntityParser.java
index 28aefe3..d36951d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNlpEntityParser.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNLPEntityParser.java
@@ -22,7 +22,7 @@ import org.apache.nlpcraft.NCEntityParser;
import org.apache.nlpcraft.NCModelConfig;
import org.apache.nlpcraft.NCRequest;
import org.apache.nlpcraft.NCToken;
-import org.apache.nlpcraft.nlp.entity.parser.nlp.impl.NCNlpEntityParserImpl;
+import org.apache.nlpcraft.nlp.entity.parser.nlp.impl.NCNLPEntityParserImpl;
import java.util.List;
@@ -31,8 +31,8 @@ import java.util.List;
*
* Component is language independent.
*/
-public class NCNlpEntityParser implements NCEntityParser {
- private final NCNlpEntityParserImpl impl = new NCNlpEntityParserImpl();
+public class NCNLPEntityParser implements NCEntityParser {
+ private final NCNLPEntityParserImpl impl = new NCNLPEntityParserImpl();
@Override
public List<NCEntity> parse(NCRequest req, NCModelConfig cfg,
List<NCToken> toks) {
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/impl/NCNlpEntityParserImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/impl/NCNLPEntityParserImpl.scala
similarity index 92%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/impl/NCNlpEntityParserImpl.scala
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/impl/NCNLPEntityParserImpl.scala
index 5cb1f97..5c55f69 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/impl/NCNlpEntityParserImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/impl/NCNLPEntityParserImpl.scala
@@ -26,15 +26,15 @@ import java.util.stream.Collectors
/**
*
*/
-object NCNlpEntityParserImpl:
+object NCNLPEntityParserImpl:
private def id = "nlp:token"
-import org.apache.nlpcraft.nlp.entity.parser.nlp.impl.NCNlpEntityParserImpl.*
+import org.apache.nlpcraft.nlp.entity.parser.nlp.impl.NCNLPEntityParserImpl.*
/**
*
*/
-class NCNlpEntityParserImpl extends NCEntityParser:
+class NCNLPEntityParserImpl extends NCEntityParser:
override def parse(req: NCRequest, cfg: NCModelConfig, toks:
JList[NCToken]): JList[NCEntity] =
toks.stream().map(t =>
new NCPropertyMapAdapter with NCEntity:
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNlpEntityParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParser.java
similarity index 83%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNlpEntityParser.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParser.java
index b6db3ed..ab97c30 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNlpEntityParser.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParser.java
@@ -18,13 +18,12 @@
package org.apache.nlpcraft.nlp.entity.parser.opennlp;
import org.apache.nlpcraft.*;
-import
org.apache.nlpcraft.nlp.entity.parser.opennlp.impl.NCOpenNlpEntityParserImpl;
+import
org.apache.nlpcraft.nlp.entity.parser.opennlp.impl.NCOpenNLPEntityParserImpl;
import java.util.List;
import java.util.Objects;
/**
- * TODO: make javadoc based on comments below.
*
* Generates entities with
* - ID `opennlp:{name}` where 'name' is element model name (from trained
file or resource) and
@@ -36,26 +35,26 @@ import java.util.Objects;
* Component is language independent.
* <p>
*/
-public class NCOpenNlpEntityParser implements NCEntityParser {
- private final NCOpenNlpEntityParserImpl impl;
+public class NCOpenNLPEntityParser implements NCEntityParser {
+ private final NCOpenNLPEntityParserImpl impl;
/**
* @param mdlSrc
*/
- public NCOpenNlpEntityParser(String mdlSrc) {
+ public NCOpenNLPEntityParser(String mdlSrc) {
Objects.requireNonNull(mdlSrc, "Model source cannot be null.");
- this.impl = new
NCOpenNlpEntityParserImpl(java.util.Collections.singletonList(mdlSrc));
+ this.impl = new
NCOpenNLPEntityParserImpl(java.util.Collections.singletonList(mdlSrc));
}
/**
* @param mdlSrcs
*/
- public NCOpenNlpEntityParser(List<String> mdlSrcs) {
+ public NCOpenNLPEntityParser(List<String> mdlSrcs) {
Objects.requireNonNull(mdlSrcs, "Model sources cannot be null.");
if (mdlSrcs.size() == 0) throw new NCException("Model sources cannot
be empty.");
- this.impl = new NCOpenNlpEntityParserImpl(mdlSrcs);
+ this.impl = new NCOpenNLPEntityParserImpl(mdlSrcs);
}
@Override
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/impl/NCOpenNlpEntityParserImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/impl/NCOpenNLPEntityParserImpl.scala
similarity index 97%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/impl/NCOpenNlpEntityParserImpl.scala
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/impl/NCOpenNLPEntityParserImpl.scala
index 1e44850..de458fb 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/impl/NCOpenNlpEntityParserImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/impl/NCOpenNLPEntityParserImpl.scala
@@ -36,7 +36,7 @@ import scala.util.Using
*
* @param srcs
*/
-class NCOpenNlpEntityParserImpl(srcs: JList[String]) extends NCEntityParser
with LazyLogging :
+class NCOpenNLPEntityParserImpl(srcs: JList[String]) extends NCEntityParser
with LazyLogging :
require(srcs != null)
private var finders: Seq[NameFinderME] = _
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNlpTokenParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNLPTokenParser.java
similarity index 89%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNlpTokenParser.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNLPTokenParser.java
index 7181756..a9cdbf2 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNlpTokenParser.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/NCOpenNLPTokenParser.java
@@ -20,7 +20,7 @@ package org.apache.nlpcraft.nlp.token.parser.opennlp;
import org.apache.nlpcraft.NCException;
import org.apache.nlpcraft.NCToken;
import org.apache.nlpcraft.NCTokenParser;
-import
org.apache.nlpcraft.nlp.token.parser.opennlp.impl.NCOpenNlpTokenParserImpl;
+import
org.apache.nlpcraft.nlp.token.parser.opennlp.impl.NCOpenNLPTokenParserImpl;
import java.util.List;
import java.util.Objects;
@@ -32,8 +32,8 @@ import java.util.Objects;
* - tagger: http://opennlp.sourceforge.net/models-1.5/en-pos-maxent.bin
* - lemmatizer:
https://raw.githubusercontent.com/richardwilly98/elasticsearch-opennlp-auto-tagging/master/src/main/resources/models/en-lemmatizer.dict
*/
-public class NCOpenNlpTokenParser implements NCTokenParser {
- private final NCOpenNlpTokenParserImpl impl;
+public class NCOpenNLPTokenParser implements NCTokenParser {
+ private final NCOpenNLPTokenParserImpl impl;
/**
*
@@ -43,12 +43,12 @@ public class NCOpenNlpTokenParser implements NCTokenParser {
* @param lemmaDicSrc Local filesystem path, resources file path or URL
for OpenNLP lemmatizer dictionary.
* @throws NCException
*/
- public NCOpenNlpTokenParser(String tokMdlSrc, String posMdlSrc, String
lemmaDicSrc) {
+ public NCOpenNLPTokenParser(String tokMdlSrc, String posMdlSrc, String
lemmaDicSrc) {
Objects.requireNonNull(tokMdlSrc, "Tokenizer model path cannot be
null.");
Objects.requireNonNull(posMdlSrc, "POS model path cannot be null.");
Objects.requireNonNull(lemmaDicSrc, "Lemmatizer model path cannot be
null.");
- impl = new NCOpenNlpTokenParserImpl(tokMdlSrc, posMdlSrc, lemmaDicSrc);
+ impl = new NCOpenNLPTokenParserImpl(tokMdlSrc, posMdlSrc, lemmaDicSrc);
}
@Override
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/impl/NCOpenNlpTokenParserImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/impl/NCOpenNLPTokenParserImpl.scala
similarity index 98%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/impl/NCOpenNlpTokenParserImpl.scala
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/impl/NCOpenNLPTokenParserImpl.scala
index 78fc7a9..44adafd 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/impl/NCOpenNlpTokenParserImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/parser/opennlp/impl/NCOpenNLPTokenParserImpl.scala
@@ -38,7 +38,7 @@ import scala.jdk.CollectionConverters.*
* @param posMdlSrc
* @param lemmaDicSrc
*/
-class NCOpenNlpTokenParserImpl(tokMdl: String, posMdlSrc: String,
lemmaDicSrc: String) extends NCTokenParser with LazyLogging:
+class NCOpenNLPTokenParserImpl(tokMdl: String, posMdlSrc: String,
lemmaDicSrc: String) extends NCTokenParser with LazyLogging:
require(tokMdl != null)
require(posMdlSrc != null)
require(lemmaDicSrc != null)
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/NCModelPipelineProcessorSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/NCModelPipelineProcessorSpec.scala
index f486d03..9a63b4b 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/NCModelPipelineProcessorSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/NCModelPipelineProcessorSpec.scala
@@ -19,7 +19,7 @@ package org.apache.nlpcraft.internal
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.impl.NCModelPipelineProcessor
-import org.apache.nlpcraft.nlp.entity.parser.nlp.impl.NCNlpEntityParserImpl
+import org.apache.nlpcraft.nlp.entity.parser.nlp.impl.NCNLPEntityParserImpl
import org.apache.nlpcraft.nlp.entity.parser.semantic.*
import
org.apache.nlpcraft.nlp.entity.parser.semantic.impl.en.NCEnSemanticPorterStemmer
import org.apache.nlpcraft.nlp.util.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/benchmark/token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/benchmark/token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java
index 727c568..99ccbc2 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/benchmark/token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/benchmark/token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.nlp.benchmark.token.parser.opennlp;
import org.apache.nlpcraft.NCRequest;
-import org.apache.nlpcraft.nlp.token.parser.opennlp.NCOpenNlpTokenParser;
+import org.apache.nlpcraft.nlp.token.parser.opennlp.NCOpenNLPTokenParser;
import org.apache.nlpcraft.nlp.util.NCTestRequest;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -54,11 +54,11 @@ public class NCEnOpenNlpTokenParserBenchmark {
);
}
- private NCOpenNlpTokenParser parser;
+ private NCOpenNLPTokenParser parser;
@Setup
public void setUp() {
- parser = new NCOpenNlpTokenParser(
+ parser = new NCOpenNLPTokenParser(
"opennlp/en-token.bin",
"opennlp/en-pos-maxent.bin",
"opennlp/en-lemmatizer.dict"
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNlpEntityParserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNlpEntityParserSpec.scala
index 1d648f8..96c4a6d 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNlpEntityParserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/nlp/NCNlpEntityParserSpec.scala
@@ -19,7 +19,7 @@ package org.apache.nlpcraft.nlp.entity.parser.nlp
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.util.NCUtils
-import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNlpEntityParser
+import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNLPEntityParser
import org.apache.nlpcraft.nlp.util.*
import org.apache.nlpcraft.nlp.util.opennlp.*
import org.junit.jupiter.api.*
@@ -34,7 +34,7 @@ import scala.jdk.OptionConverters.RichOptional
*
*/
class NCNlpEntityParserSpec:
- private val parser = new NCNlpEntityParser()
+ private val parser = new NCNLPEntityParser()
/**
*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNlpEntityParserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParserSpec.scala
similarity index 93%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNlpEntityParserSpec.scala
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParserSpec.scala
index da30d94..40df08a 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNlpEntityParserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/opennlp/NCOpenNLPEntityParserSpec.scala
@@ -19,7 +19,6 @@ package org.apache.nlpcraft.nlp.entity.parser.opennlp
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.util.NCUtils
-import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNlpEntityParser
import org.apache.nlpcraft.nlp.util.*
import org.apache.nlpcraft.nlp.util.opennlp.*
import org.junit.jupiter.api.*
@@ -33,8 +32,8 @@ import scala.jdk.OptionConverters.RichOptional
/**
*
*/
-class NCOpenNlpEntityParserSpec:
- private val parser = new NCOpenNlpEntityParser(
+class NCOpenNLPEntityParserSpec:
+ private val parser = new NCOpenNLPEntityParser(
Seq(
"opennlp/en-ner-location.bin",
"opennlp/en-ner-money.bin",
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserJsonSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserJsonSpec.scala
index 30b1779..9fc1b0b 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserJsonSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserJsonSpec.scala
@@ -19,9 +19,9 @@ package org.apache.nlpcraft.nlp.entity.parser.semantic
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.util.NCUtils
-import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNlpEntityParser
+import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNLPEntityParser
import
org.apache.nlpcraft.nlp.entity.parser.semantic.impl.en.NCEnSemanticPorterStemmer
-import org.apache.nlpcraft.nlp.token.parser.opennlp.NCOpenNlpTokenParser
+import org.apache.nlpcraft.nlp.token.parser.opennlp.NCOpenNLPTokenParser
import org.apache.nlpcraft.nlp.util.*
import org.apache.nlpcraft.nlp.util.opennlp.*
import org.junit.jupiter.api.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
index d5743dd..aced085 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
@@ -19,7 +19,7 @@ package org.apache.nlpcraft.nlp.entity.parser.semantic
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.util.NCUtils
-import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNlpEntityParser
+import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNLPEntityParser
import
org.apache.nlpcraft.nlp.entity.parser.semantic.impl.en.NCEnSemanticPorterStemmer
import org.apache.nlpcraft.nlp.token.enricher.en.NCStopWordsTokenEnricher
import org.apache.nlpcraft.nlp.util.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserYamlSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserYamlSpec.scala
index 85a05e4..797c3db 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserYamlSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserYamlSpec.scala
@@ -19,7 +19,7 @@ package org.apache.nlpcraft.nlp.entity.parser.semantic
import org.apache.nlpcraft.*
import org.apache.nlpcraft.internal.util.NCUtils
-import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNlpEntityParser
+import org.apache.nlpcraft.nlp.entity.parser.opennlp.NCOpenNLPEntityParser
import
org.apache.nlpcraft.nlp.entity.parser.semantic.impl.en.NCEnSemanticPorterStemmer
import org.apache.nlpcraft.nlp.util.*
import org.apache.nlpcraft.nlp.util.opennlp.*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala
index 410ff98..395dc47 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala
@@ -17,9 +17,9 @@
package org.apache.nlpcraft.nlp.util
-import org.apache.nlpcraft.nlp.token.parser.opennlp.NCOpenNlpTokenParser
import org.apache.nlpcraft.nlp.util.NCTestPipeline.*
import org.apache.nlpcraft.*
+import org.apache.nlpcraft.nlp.token.parser.opennlp.NCOpenNLPTokenParser
import java.util.{Optional, ArrayList as JList}
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/opennlp/NCTestConfig.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/opennlp/NCTestConfig.scala
index 56eccd0..db50e89 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/opennlp/NCTestConfig.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/opennlp/NCTestConfig.scala
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.nlp.util.opennlp
import org.apache.nlpcraft.NCModelConfig
-import org.apache.nlpcraft.nlp.token.parser.opennlp.NCOpenNlpTokenParser
+import org.apache.nlpcraft.nlp.token.parser.opennlp.NCOpenNLPTokenParser
import org.apache.nlpcraft.nlp.util.*
/**
@@ -30,7 +30,7 @@ final val CFG = new NCModelConfig("testId", "test", "1.0")
*
*/
final val EN_PIPELINE = NCTestPipeline(
- new NCOpenNlpTokenParser(
+ new NCOpenNLPTokenParser(
"opennlp/en-token.bin",
"opennlp/en-pos-maxent.bin",
"opennlp/en-lemmatizer.dict"
