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:30 UTC
[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-111
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}