This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-495
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-495 by this push:
new 6b3e2580 API refactored.
6b3e2580 is described below
commit 6b3e25804fc05852e02ba4ae8e1c2167e2216f5f
Author: Sergey Kamov <[email protected]>
AuthorDate: Tue Jul 5 13:48:40 2022 +0300
API refactored.
---
nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelConfig.scala | 7 ++++---
.../nlpcraft/internal/conversation/NCConversationManagerSpec.scala | 4 ++--
.../nlpcraft/internal/dialogflow/NCDialogFlowManagerSpec.scala | 2 +-
.../src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfig.scala | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelConfig.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelConfig.scala
index c1926e74..a39aae62 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelConfig.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCModelConfig.scala
@@ -28,7 +28,8 @@ object NCModelConfig:
val DFLT_CONV_DEPTH = 3
def apply(id: String, name: String, version: String) = new
NCModelConfig(id, name, version)
- def apply(id: String, name: String, version: String, description: String,
origin: String) = new NCModelConfig(id, name, version, description, origin)
+ def apply(id: String, name: String, version: String, description: String,
origin: String) =
+ new NCModelConfig(id, name, version, Some(description), Some(origin))
import org.apache.nlpcraft.NCModelConfig.*
/**
@@ -45,8 +46,8 @@ case class NCModelConfig(
id: String,
name: String,
version: String,
- description: String = null,
- origin: String = null,
+ description: Option[String] = None,
+ origin: Option[String] = None,
conversationTimeout: Long = DFLT_CONV_TIMEOUT,
conversationDepth: Int = DFLT_CONV_DEPTH
) extends NCPropertyMapAdapter
\ No newline at end of file
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/conversation/NCConversationManagerSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/conversation/NCConversationManagerSpec.scala
index 7af4559f..4889f2b9 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/conversation/NCConversationManagerSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/conversation/NCConversationManagerSpec.scala
@@ -31,8 +31,8 @@ class NCConversationManagerSpec:
"testId",
"test",
"1.0",
- "Test description",
- "Test origin",
+ Some("Test description"),
+ Some("Test origin"),
NCModelConfig.DFLT_CONV_TIMEOUT,
NCModelConfig.DFLT_CONV_DEPTH
):
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManagerSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManagerSpec.scala
index 2c2b7bba..57a1be15 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManagerSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManagerSpec.scala
@@ -44,7 +44,7 @@ class NCDialogFlowManagerSpec:
override def getVariants: List[NCVariant] = null
override def getTokens: List[NCToken] = null
- class ModelConfigMock(timeout: Long = Long.MaxValue) extends
NCModelConfig("testId", "test", "1.0", "Test description", "Test origin",
NCModelConfig.DFLT_CONV_TIMEOUT, NCModelConfig.DFLT_CONV_DEPTH):
+ class ModelConfigMock(timeout: Long = Long.MaxValue) extends
NCModelConfig("testId", "test", "1.0", Some("Test description"), Some("Test
origin"), NCModelConfig.DFLT_CONV_TIMEOUT, NCModelConfig.DFLT_CONV_DEPTH):
override val conversationTimeout: Long = timeout
private var mgr: NCDialogFlowManager = _
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfig.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfig.scala
index 7a628923..c5fc8591 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfig.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestConfig.scala
@@ -23,7 +23,7 @@ import org.apache.nlpcraft.nlp.token.enricher.*
import org.apache.nlpcraft.nlp.token.parser.NCOpenNLPTokenParser
import org.apache.nlpcraft.nlp.util.*
-final val CFG = new NCModelConfig("testId", "test", "1.0", description = "Test
description", origin = "Test origin")
+final val CFG = new NCModelConfig("testId", "test", "1.0", description =
Some("Test description"), origin = Some("Test origin"))
final val EN_TOK_PARSER = new
NCOpenNLPTokenParser(R.getPath("opennlp/en-token.bin"))
final val EN_TOK_STOP_ENRICHER = new NCEnStopWordsTokenEnricher
final val EN_TOK_LEMMA_POS_ENRICHER =
