[incubator-nlpcraft] branch NLPCRAFT-41 updated: WIP.

[sergeykamov]

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

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


The following commit(s) were added to refs/heads/NLPCRAFT-41 by this push:
     new 5e8bd67  WIP.
5e8bd67 is described below

commit 5e8bd674c542471c1714f09004e15e87e4bd1221
Author: Sergey Kamov <sergeyka...@apache.org>
AuthorDate: Sat Sep 12 13:12:01 2020 +0300

    WIP.
---
 .../nlpcraft/probe/mgrs/deploy/NCDeployManager.scala  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index 518e6ae..c8d2889 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@ -118,6 +118,18 @@ object NCDeployManager extends NCService with 
DecorateAsScala {
     /**
       *
       * @param mdl
+      */
+    private def checkMacros(mdl: NCModel): Unit = {
+        val macros = mdl.getMacros.asScala
+        val set = mdl.getElements.asScala.flatMap(_.getSynonyms.asScala) ++ 
macros.values
+
+        for (makro ← macros.keys if !set.exists(_.contains(makro)))
+            logger.warn(s"Unused macro detected [mdlId=${mdl.getId}, 
macro=$makro]")
+    }
+
+    /**
+      *
+      * @param mdl
       * @return
       */
     @throws[NCE]
@@ -132,12 +144,7 @@ object NCDeployManager extends NCService with 
DecorateAsScala {
             if (!elm.getId.matches(ID_REGEX))
                 throw new NCE(s"Model element ID '${elm.getId}' does not match 
'$ID_REGEX' regex in: $mdlId")
 
-        val allSyns = mdl.getElements.asScala.flatMap(_.getSynonyms.asScala)
-
-        mdl.getMacros.asScala.keys.foreach(makro ⇒
-            if (!allSyns.exists(_.contains(makro)))
-                logger.warn(s"Unused macro detected [mdlId=$mdlId, 
macro=$makro]")
-        )
+        checkMacros(mdl)
 
         val parser = new NCMacroParser