This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch develop-0.7.5
in repository
https://gitbox.apache.org/repos/asf/incubator-nlpcraft-java-client.git
The following commit(s) were added to refs/heads/develop-0.7.5 by this push:
new 94408c3 WIP.
94408c3 is described below
commit 94408c3f0fe503a8cd7a4e793f126ca11cf47ffc
Author: Sergey Kamov <[email protected]>
AuthorDate: Tue May 11 12:36:21 2021 +0300
WIP.
---
pom.xml | 10 +++++-----
src/main/java/org/apache/nlpcraft/client/NCNewCompany.java | 4 +++-
src/main/java/org/apache/nlpcraft/client/NCResult.java | 4 ++--
src/main/resources/log4j2.xml | 2 +-
src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java | 2 +-
src/test/java/org/apache/nlpcraft/client/NCUserTest.java | 9 +++++++--
src/{main => test}/resources/log4j2.xml | 2 +-
7 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9b886e9..2337b9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,12 +42,13 @@
<apache.rat.plugin.ver>0.13</apache.rat.plugin.ver>
<maven.bazaarvoice.plugin.ver>0.9</maven.bazaarvoice.plugin.ver>
<maven.clean.plugin.ver>3.1.0</maven.clean.plugin.ver>
+ <maven.dependency.plugin.ver>3.0.2</maven.dependency.plugin.ver>
</properties>
<name>NLPCraft - Java Client</name>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>java-client</artifactId>
- <version>0.7.2</version>
+ <version>0.7.5</version>
<url>https://nlpcraft.apache.org</url>
<description>An open source API to convert natural language into
actions.</description>
@@ -84,7 +85,7 @@
<connection>scm:git:ssh://[email protected]/apache/incubator-nlpcraft.git</connection>
<developerConnection>scm:git:ssh://[email protected]/apache/incubator-nlpcraft.git</developerConnection>
<!-- Set actual tag name here -->
- <tag>v0.7.2</tag>
+ <tag>v0.7.5</tag>
</scm>
<dependencies>
@@ -298,7 +299,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.2</version>
+ <version>${maven.dependency.plugin.ver}</version>
<executions>
<execution>
<id>copy-server-dependencies</id>
@@ -335,7 +336,7 @@
<healthcheckUrl>http://localhost:8081/api/v1/health</healthcheckUrl>
<waitAfterLaunch>600</waitAfterLaunch>
<arguments>
- <argument>java</argument>
+ <argument>${java.home}/bin/java</argument>
<argument>-Xmx4G</argument>
<argument>-Xms4G</argument>
<argument>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</argument>
@@ -395,7 +396,6 @@
<!-- Reason: 'contextWordServer' should be
started. -->
<exclude>**/NCModelTest.*</exclude>
</excludes>
-
</configuration>
</execution>
</executions>
diff --git a/src/main/java/org/apache/nlpcraft/client/NCNewCompany.java
b/src/main/java/org/apache/nlpcraft/client/NCNewCompany.java
index cdee41e..0d1d1e5 100644
--- a/src/main/java/org/apache/nlpcraft/client/NCNewCompany.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCNewCompany.java
@@ -17,10 +17,12 @@
package org.apache.nlpcraft.client;
+import java.util.Map;
+
/**
* New company descriptor.
*
- * @see NCClient#addCompany(String, String, String, String, String, String,
String, String, String, String, String, String)
+ * @see NCClient#addCompany(String, String, String, String, String, String,
String, String, String, String, String, String, Map)
*/
public interface NCNewCompany {
/**
diff --git a/src/main/java/org/apache/nlpcraft/client/NCResult.java
b/src/main/java/org/apache/nlpcraft/client/NCResult.java
index 278fd4f..52eb2f3 100644
--- a/src/main/java/org/apache/nlpcraft/client/NCResult.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCResult.java
@@ -22,7 +22,7 @@ import java.util.*;
/**
* Request result descriptor.
*
- * @see NCClient#askSync(String, String, String, boolean, Long, String)
+ * @see NCClient#askSync(String, String, Map, boolean, Long, String)
* @see NCClient#askSync(String, String)
* @see NCClient#check(Set, Integer, Long, String)
*/
@@ -66,7 +66,7 @@ public interface NCResult {
/**
* Gets ready status of the request. Note that results obtained from
{@link NCClient#check(Set, Integer, Long, String)}
* method can be in not-ready state indicating that they are submitted but
still being processed. Results returned
- * from {@link NCClient#askSync(String, String)} or {@link
NCClient#askSync(String, String, String, boolean, Long, String)}
+ * from {@link NCClient#askSync(String, String)} or {@link
NCClient#askSync(String, String, Map, boolean, Long, String)}
* methods are always ready.
*
* @return Ready status of the request.
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 5809b27..0ba3365 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<Configuration status="DEBUG">
+<Configuration status="INFO">
<Appenders>
<Console name="CONSOLE" target="SYSTEM_OUT">
<PatternLayout pattern="%d{MMM-dd HH:mm:ss} [%-5p] %m%n"/>
diff --git a/src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java
b/src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java
index d78205a..b09cc71 100644
--- a/src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java
@@ -74,7 +74,7 @@ abstract class NCTestAdapter {
mdlClass = getModelClass().orElse(null);
if (mdlClass != null)
- NCEmbeddedProbe.start("nlpcraft.conf",
Collections.singleton(mdlClass.getName()));
+ NCEmbeddedProbe.start(null,
Collections.singleton(mdlClass.getName()));
admCli = new NCClientBuilder().build();
diff --git a/src/test/java/org/apache/nlpcraft/client/NCUserTest.java
b/src/test/java/org/apache/nlpcraft/client/NCUserTest.java
index 7b7d994..2fa8981 100644
--- a/src/test/java/org/apache/nlpcraft/client/NCUserTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCUserTest.java
@@ -21,6 +21,7 @@ import org.apache.nlpcraft.client.models.NCCommonSpecModel;
import org.apache.nlpcraft.model.NCModel;
import org.junit.jupiter.api.Test;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -111,17 +112,21 @@ class NCUserTest extends NCTestAdapter {
users = admCli.getAllUsers();
assertFalse(getOpt(users, (u) -> usrId1 == u.getId()).isPresent());
+
+ Map<String, String> props = new HashMap<>();
+
+ props.put("k1", "v1");
long usrId2 =
admCli.addUser(
- "[email protected]", "pswd1", "first1", "last1", "av1", false,
null, null
+ "[email protected]", "pswd1", "first1", "last1", "av1", false,
props, null
);
users = admCli.getAllUsers();
user = get(users, (u) -> usrId2 == u.getId());
- check(user, "[email protected]", "first1", "last1", "av1", false, null,
null);
+ check(user, "[email protected]", "first1", "last1", "av1", false, null,
props);
admCli.deleteUser(usrId2, null);
diff --git a/src/main/resources/log4j2.xml b/src/test/resources/log4j2.xml
similarity index 96%
copy from src/main/resources/log4j2.xml
copy to src/test/resources/log4j2.xml
index 5809b27..0ba3365 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/test/resources/log4j2.xml
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<Configuration status="DEBUG">
+<Configuration status="INFO">
<Appenders>
<Console name="CONSOLE" target="SYSTEM_OUT">
<PatternLayout pattern="%d{MMM-dd HH:mm:ss} [%-5p] %m%n"/>
