This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-472 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit fb0552feda1970211b1bc1c1933099e9171559b2 Merge: c267dff 750858c Author: Aaron Radzinski <[email protected]> AuthorDate: Thu Jan 6 08:48:45 2022 -0800 Merge branch 'NLPCRAFT-472' of https://github.com/apache/incubator-nlpcraft into NLPCRAFT-472 .../stanford/impl/NCStanfordEntityParserImpl.scala | 13 +-- .../parser/stanford/NCStanfordTokenParser.java | 20 +--- .../parser/stanford/impl/NCStanfordNlpImpl.scala | 41 +++++--- .../stanford/NCStanfordEntityParserSpec.scala | 14 +-- .../stanford/NCStanfordTokenParserSpec.scala | 30 ++---- .../nlpcraft/nlp/utils/NCStanfordTestConfig.scala | 17 ++- .../scala/org/apache/nlpcraft/NCModelConfig.java | 2 + .../org/apache/nlpcraft/NCModelConfigBuilder.java | 27 ++++- ...enNlpTokenParserStemmer.java => NCStemmer.java} | 18 +++- .../main/scala/org/apache/nlpcraft/NCToken.java | 12 +++ .../scala/org/apache/nlpcraft/NCTokenParser.java | 24 +---- .../nlpcraft/internal/NCModelClientImpl.scala | 115 +++++++++------------ .../apache/nlpcraft/internal/util/NCUtils.scala | 13 +-- ...kenParserStemmer.java => NCDefaultStemmer.java} | 16 ++- .../apache/nlpcraft/nlp/en/NCEnPorterStemmer.java | 22 ++-- .../nlp/entity/parser/nlp/NCNlpEntityParser.java | 17 +-- .../parser/nlp/impl/NCNlpEntityParserImpl.scala | 4 +- .../parser/opennlp/NCOpenNlpEntityParser.java | 23 +++-- .../opennlp/impl/NCOpenNlpEntityParserImpl.scala | 1 + .../semantic/impl/NCSemanticDataReader.scala | 15 +-- .../semantic/impl/NCSemanticEntityParserImpl.scala | 7 +- .../impl/NCSemanticSynonymsProcessor.scala | 10 +- .../enricher/en/NCStopWordsTokenEnricher.java | 2 +- .../token/enricher/en/impl/NCDictionaryImpl.scala | 1 + .../enricher/en/impl/NCLanguageWordsImpl.scala | 1 + .../nlp/token/enricher/en/impl/NCQuotesImpl.scala | 2 +- .../token/enricher/en/impl/NCStopWordsImpl.scala | 18 ++-- .../token/enricher/en/impl/NCSwearWordsImpl.scala | 6 +- .../token/parser/opennlp/NCOpenNlpTokenParser.java | 38 ++----- .../token/parser/opennlp/impl/NCOpenNlpImpl.scala | 40 +++---- .../impl/en/NCOpenNlpTokenParserStemmerImpl.java | 13 --- .../opennlp/NCEnOpenNlpTokenParserBenchmark.java | 4 +- .../parser/opennlp/NCOpenNlpEntityParserSpec.scala | 4 +- .../semantic/NCSemanticEntityParserJsonSpec.scala | 4 +- .../semantic/NCSemanticEntityParserSpec.scala | 4 +- .../semantic/NCSemanticEntityParserYamlSpec.scala | 3 +- .../enricher/en/NCBracketsTokenEnricherSpec.scala | 4 +- .../en/NCDictionaryTokenEnricherSpec.scala | 2 +- .../enricher/en/NCQuotesTokenEnricherSpec.scala | 4 +- .../parser/opennlp/NCOpenNlpTokenParserSpec.scala | 4 +- .../apache/nlpcraft/nlp/util/NCTestConfig.scala | 61 ----------- .../nlpcraft/nlp/util/NCTestDefaultConfig.scala | 75 ++++++++++++++ .../apache/nlpcraft/nlp/util/NCTestRequest.scala | 2 +- .../org/apache/nlpcraft/nlp/util/NCTestToken.scala | 8 +- .../org/apache/nlpcraft/nlp/util/NCTestUtils.scala | 20 +--- 45 files changed, 393 insertions(+), 388 deletions(-) diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelConfigBuilder.java index e9f4761,2873fdd..61b95a7 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelConfigBuilder.java +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelConfigBuilder.java @@@ -40,11 -42,12 +42,12 @@@ public class NCModelConfigBuilder private String origin; private NCTokenParser tokParser; + private NCStemmer stemmer = new NCDefaultStemmer(); public NCModelConfigBuilder(String id, String name, String version) { - Objects.requireNonNull(id, "Id cannot be null."); + Objects.requireNonNull(id, "ID cannot be null."); Objects.requireNonNull(name, "Name cannot be null."); - Objects.requireNonNull(version, "Version cannot be null"); + Objects.requireNonNull(version, "Version cannot be null."); this.id = id; this.name = name;
