[incubator-nlpcraft] branch master updated: Fix for NLPCRAFT-351.

[ar...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/master by this push:
     new 41b65f6  Fix for NLPCRAFT-351.
41b65f6 is described below

commit 41b65f663841a266523f84e04fd89eedc95fd89a
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Wed Jun 30 16:29:05 2021 -0700

    Fix for NLPCRAFT-351.
---
 .../org/apache/nlpcraft/model/tools/cmdline/NCCli.scala     | 13 ++++++++-----
 .../model/tools/cmdline/NCCliFileNameCompleter.java         |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
index bb41df0..7384379 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
@@ -21,7 +21,7 @@ import java.io._
 import java.lang.ProcessBuilder.Redirect
 import java.nio.charset.StandardCharsets
 import java.text.DateFormat
-import java.{io, util}
+import java.util
 import java.util.Date
 import java.util.regex.Pattern
 import java.util.zip.ZipInputStream
@@ -441,8 +441,10 @@ object NCCli extends NCCliBase {
 
         try {
             logln(s"Server:")
-            logln(s"  ${y("|--")} log: ${c(output.getAbsolutePath)}")
-            logln(s"  ${y("+--")} cmd: \n      ${c(srvArgs.mkString("\n        "))}")
+            logln(s"  ${y("|--")} Log: ${c(output.getAbsolutePath)}")
+            logln(s"  ${y("|--")} Server config: ${if (cfgPath == null) y("<default>") else c(cfgPath)}")
+            logln(s"  ${y("|--")} Ignite config: ${if (igniteCfgPath == null) y("<default>") else c(igniteCfgPath)}")
+            logln(s"  ${y("+--")} Command: \n        ${c(srvArgs.mkString("\n        "))}")
 
             // Start the 'server | bleach > server log output' process pipeline.
             val procs = ProcessBuilder.startPipeline(Seq(srvPb, bleachPb).asJava)
@@ -702,8 +704,9 @@ object NCCli extends NCCliBase {
 
         try {
             logln(s"Probe:")
-            logln(s"  ${y("|--")} log: ${c(output.getAbsolutePath)}")
-            logln(s"  ${y("+--")} cmd: \n      ${c(prbArgs.mkString("\n        "))}")
+            logln(s"  ${y("|--")} Log: ${c(output.getAbsolutePath)}")
+            logln(s"  ${y("|--")} Probe config: ${if (cfgPath == null) y("<default>") else c(cfgPath)}")
+            logln(s"  ${y("+--")} Command: \n        ${c(prbArgs.mkString("\n        "))}")
 
             // Start the 'probe | bleach > probe log output' process pipeline.
             val procs = ProcessBuilder.startPipeline(Seq(prbPb, bleachPb).asJava)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliFileNameCompleter.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliFileNameCompleter.java
index 14785ff..1dd31cc 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliFileNameCompleter.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliFileNameCompleter.java
@@ -40,8 +40,8 @@ class NCCliFileNameCompleter
      * @param reader Line reader for JLine.
      * @param paramName Name of the parameter.
      * @param pathBuf Current path string.
-     * @param prefix
-     * @param suffix
+     * @param prefix Path prefix (like a quote).
+     * @param suffix Path suffix (like a quote).
      * @param candidates List of completion candidates to fill.
      */
     void fillCandidates(