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/09/03 05:06:18 UTC
[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-41
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-41
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 9403b9be3b39cc6aca264f4e1a88986f98b4a1e2
Merge: 26d57f1 6236a13
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Wed Sep 2 22:03:18 2020 -0700
Merge branch 'master' into NLPCRAFT-41
.github/workflows/build.yml | 2 +-
bin/nlpcraft.cmd | 17 +-
bin/nlpcraft.sh | 16 +-
javadoc/stylesheet.css | 570 ++++++++++++++++-----
nlpcraft/pom.xml | 33 +-
.../NCVariantImpl.java => common/NCException.java} | 29 +-
.../nlpcraft/common/ascii/NCAsciiTable.scala | 77 ++-
.../nlpcraft/common/config/NCConfigurable.scala | 12 +-
.../nlpcraft/common/config/NCConfigurableJava.java | 167 ++++++
.../apache/nlpcraft/common/debug/NCLogHolder.scala | 2 +-
.../scala/org/apache/nlpcraft/common/package.scala | 2 +-
.../apache/nlpcraft/common/util/NCIdGenerator.java | 56 +-
.../org/apache/nlpcraft/common/util/NCUtils.scala | 217 +++-----
.../apache/nlpcraft/examples/alarm/AlarmModel.java | 2 +-
.../examples/helloworld/HelloWorldModel.java | 2 +-
.../examples/lightswitch/LightSwitchModel.scala | 2 +-
.../examples/misc/darksky/DarkSkyService.java | 31 +-
.../misc/geo/cities/CitiesDataProvider.java | 2 +-
.../apache/nlpcraft/examples/phone/PhoneModel.java | 2 +-
.../nlpcraft/examples/sql/db/SqlAccess.scala | 13 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 2 +-
.../nlpcraft/examples/time/TimeModelApp.java | 1 +
.../nlpcraft/examples/weather/WeatherModel.java | 2 +-
.../org/apache/nlpcraft/model/NCConversation.java | 4 +-
.../org/apache/nlpcraft/model/NCCustomParser.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentMatch.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCResult.java | 7 +-
.../scala/org/apache/nlpcraft/model/NCVariant.java | 2 +-
.../apache/nlpcraft/model/impl/NCCompanyImpl.java | 47 +-
.../org/apache/nlpcraft/model/impl/NCUserImpl.java | 18 +-
.../apache/nlpcraft/model/impl/NCVariantImpl.java | 2 +-
.../nlpcraft/model/impl/json/NCElementJson.java | 79 ---
.../nlpcraft/model/impl/json/NCMacroJson.java | 25 -
.../nlpcraft/model/impl/json/NCModelJson.java | 307 +----------
.../nlpcraft/model/impl/json/NCValueJson.java | 29 --
.../model/opencensus/NCPrometheusExporter.java | 9 +-
.../model/tools/cmdline/NCCommandLine.scala | 101 +++-
.../model/tools/embedded/NCEmbeddedProbe.java | 2 +-
.../model/tools/embedded/NCEmbeddedResult.java | 15 +-
.../model/tools/sqlgen/NCSqlModelGenerator.java | 2 +-
.../nlpcraft/model/tools/sqlgen/NCSqlSchema.java | 2 +-
.../tools/sqlgen/impl/__javadoc_fix.java} | 22 +-
.../tools/test/impl/__javadoc_fix.java} | 11 +-
.../__javadoc_fix.java} | 13 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 3 +
.../mgrs/nlp/__javadoc_fix.java} | 11 +-
.../mgrs/nlp/impl/__javadoc_fix.java} | 12 +-
.../nlpcraft/server/mdo/impl/NCMdoEntity.java | 4 +
.../nlpcraft/server/mdo/impl/NCMdoField.java | 14 +-
.../nlpcraft/common/ascii/NCAsciiTableSpec.scala | 8 +-
.../nlpcraft/examples/sql/NCSqlExampleSpec.scala | 17 +-
pom.xml | 8 +-
52 files changed, 1083 insertions(+), 954 deletions(-)
diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
index d8de0bc,224a548..7d36ed5
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
@@@ -83,8 -83,10 +83,10 @@@ object NCProbeEnrichmentManager extend
override def start(parent: Span = null): NCService = startScopedSpan("start", parent) { _ ⇒
embeddedCbs = mutable.HashSet.empty[EMBEDDED_CB]
+
pool = Executors.newFixedThreadPool(8 * Runtime.getRuntime.availableProcessors())
+
- execCtxExecutor = ExecutionContext.fromExecutor(pool)
+ executor = ExecutionContext.fromExecutor(pool)
super.start()
}
@@@ -96,7 -98,8 +98,8 @@@
}
U.shutdownPools(pool)
+
- execCtxExecutor = null
+ executor = null
super.stop()
}