You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2021/01/25 08:51:29 UTC
[incubator-nlpcraft] branch NLPCRAFT-111 updated (ede2b5d ->
dbea8e7)
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a change to branch NLPCRAFT-111
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from ede2b5d WIP.
add 3500379 Update NCCli.scala
add 6646199 WIP.
add 853d91a NLPCRAFT-92: Create Groovy-based example for NLPCraft.
add dc9a5bf Merge pull request #11 from paulk-asert/nlpcraft92
add 85b6642 Merge branch 'master' into NLPCRAFT-224
add 1499a8a Update NCToken.java
add 2642a5e WIP.
add a2b33ee WIP.
add 9208f36 WIP.
add 2334aee Update NCCli.scala
add c09b2af Update NCCliCommands.scala
add ee0b160 Update NCCliCommands.scala
new dbea8e7 Merge branch 'master' into NLPCRAFT-111
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/nlpcraft/common/util/NCUtils.scala | 67 +++++++--
...avaModel.java => LightSwitchGroovyModel.groovy} | 25 ++--
.../nlpcraft/examples/sql/db/SqlServer.scala | 11 +-
.../scala/org/apache/nlpcraft/model/NCToken.java | 2 +-
.../model/factories/basic/NCBasicModelFactory.java | 3 +-
.../nlpcraft/model/tools/cmdline/NCCli.scala | 160 ++++++++++++++-------
.../model/tools/cmdline/NCCliCommands.scala | 109 +++++++++-----
.../model/tools/sqlgen/NCSqlModelGenerator.java | 7 +-
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 126 ++++++++--------
.../nlpcraft/server/probe/NCProbeManager.scala | 2 +-
.../apache/nlpcraft/common/util/NCUtilsSpec.scala | 8 +-
.../nlpcraft/model/tools/cmdline/NCCliSpec.scala | 32 -----
pom.xml | 35 +++++
13 files changed, 359 insertions(+), 228 deletions(-)
copy nlpcraft/src/main/scala/org/apache/nlpcraft/examples/lightswitch/{LightSwitchJavaModel.java => LightSwitchGroovyModel.groovy} (80%)
delete mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliSpec.scala
[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-111
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-111
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit dbea8e7c7c122c7753aa7258edee49d06ab742a9
Merge: ede2b5d ee0b160
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Mon Jan 25 11:49:49 2021 +0300
Merge branch 'master' into NLPCRAFT-111
.../org/apache/nlpcraft/common/util/NCUtils.scala | 67 +++++++--
.../lightswitch/LightSwitchGroovyModel.groovy | 75 ++++++++++
.../nlpcraft/examples/sql/db/SqlServer.scala | 11 +-
.../scala/org/apache/nlpcraft/model/NCToken.java | 2 +-
.../model/factories/basic/NCBasicModelFactory.java | 3 +-
.../nlpcraft/model/tools/cmdline/NCCli.scala | 160 ++++++++++++++-------
.../model/tools/cmdline/NCCliCommands.scala | 109 +++++++++-----
.../model/tools/sqlgen/NCSqlModelGenerator.java | 7 +-
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 126 ++++++++--------
.../nlpcraft/server/probe/NCProbeManager.scala | 2 +-
.../apache/nlpcraft/common/util/NCUtilsSpec.scala | 8 +-
.../nlpcraft/model/tools/cmdline/NCCliSpec.scala | 32 -----
pom.xml | 35 +++++
13 files changed, 424 insertions(+), 213 deletions(-)
diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
index d101fa9,824c6be..06d99d4
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
@@@ -55,8 -55,10 +55,9 @@@ import resource.
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
+ import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.collection._
-import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration._
import scala.concurrent.{Await, ExecutionContext, Future}
import scala.io.{BufferedSource, Source}