Fix wizard name detection and SLF4J issue

mulesoft-labs · Nov 25, 2021 · 12bfc3b · 12bfc3b
1 parent dda436f
commit 12bfc3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/native-cli/build.gradle b/native-cli/build.gradle
@@ -34,7 +34,9 @@ dependencies {
 //        exclude group: 'org.topbraid.shacl'
 //    }
     compile group: 'org.mule.weave', name: 'http-module', version: ioVersion
-    compile group: 'org.mule.weave', name: 'http-netty-module', version: ioVersion
+    compile(group: 'org.mule.weave', name: 'http-netty-module', version: ioVersion) {
+        exclude group: 'org.slf4j'
+    }
     compile group: 'org.mule.weave', name: 'ndjson-module', version: weaveVersion
     testCompile group: 'org.scalatest', name: 'scalatest_2.12', version: scalaTestVersion
 }

diff --git a/native-cli/src/main/scala/org/mule/weave/dwnative/cli/utils/SpellsUtils.scala b/native-cli/src/main/scala/org/mule/weave/dwnative/cli/utils/SpellsUtils.scala
@@ -14,16 +14,17 @@ object SpellsUtils {
 class SpellsUtils(console: Console) {
 
   def grimoireName(user: String): String = {
-    if (user == null)
+    if (user == null) {
       DATA_WEAVE_GRIMOIRE_FOLDER
-    else
+    } else {
       s"${user}-$DATA_WEAVE_GRIMOIRE_FOLDER"
+    }
   }
 
   def wizardName(grimoire: String): String = {
-    if (grimoire == null)
+    if (grimoire == null || DATA_WEAVE_GRIMOIRE_FOLDER.equals(grimoire)) {
       "DW"
-    else {
+    } else {
       val length = grimoire.length - s"-${DATA_WEAVE_GRIMOIRE_FOLDER}".length
       if (length <= 0) {
         console.error("Invalid grimoire name: `" + grimoire + "`")