add option for loglevel

Author: jenschude

tools/cli-application/src/main/kotlin/io/vrap/rmf/codegen/cli/CodegeneratorApp.kt

@@ -2,7 +2,10 @@
 
 package io.vrap.rmf.codegen.cli
 
+import ch.qos.logback.classic.Level
 import io.vrap.rmf.codegen.cli.info.BuildInfo
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import picocli.AutoComplete
 import picocli.CommandLine
 import picocli.CommandLine.Command
@@ -34,9 +37,21 @@ class RMFCommand : Callable<Int> {
     @Option(names = ["-h", "--help"], usageHelp = true, description = ["display this help message"])
     var usageHelpRequested = false
 
+    @Option(names = ["--loglevel"], description = ["log level"], required = false)
+    var logLevel: LogLevel = LogLevel.INFO
+
     override fun call(): Int {
         InternalLogger.error("Please invoke a subcommand");
         CommandLine(this).usage(System.out);
         return 0
     }
+
+    fun loglevel(): Level {
+        return when(logLevel) {
+            LogLevel.INFO -> Level.INFO
+            LogLevel.WARN -> Level.WARN
+            LogLevel.ERROR -> Level.ERROR
+            LogLevel.DEBUG -> Level.DEBUG
+        }
+    }
 }

tools/cli-application/src/main/kotlin/io/vrap/rmf/codegen/cli/DiffSubcommand.kt

@@ -1,5 +1,6 @@
 package io.vrap.rmf.codegen.cli
 
+import ch.qos.logback.classic.Level
 import com.commercetools.rmf.diff.*
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.vrap.codegen.languages.extensions.getMethodName
@@ -11,7 +12,10 @@ import io.vrap.rmf.raml.model.modules.Api
 import io.vrap.rmf.raml.model.resources.Method
 import io.vrap.rmf.raml.model.resources.Resource
 import org.eclipse.emf.common.util.URI
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import picocli.CommandLine
+import picocli.CommandLine.ParentCommand
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Path
@@ -42,7 +46,13 @@ class DiffSubcommand : Callable<Int> {
     @CommandLine.Option(names = ["-s", "--severity"], description = ["Check severity", "Valid values: ${CheckSeverity.VALID_VALUES}"])
     var checkSeverity: CheckSeverity = CheckSeverity.FATAL
 
+    @ParentCommand
+    lateinit var codegen: RMFCommand
+
     override fun call(): Int {
+        val logger: ch.qos.logback.classic.Logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as ch.qos.logback.classic.Logger
+        logger.level = codegen.loglevel()
+
         return diff()
     }
 

tools/cli-application/src/main/kotlin/io/vrap/rmf/codegen/cli/GenerateSubcommand.kt

@@ -1,5 +1,6 @@
 package io.vrap.rmf.codegen.cli
 
+import ch.qos.logback.classic.Level
 import io.methvin.watcher.DirectoryChangeEvent
 import io.methvin.watcher.DirectoryWatcher
 import io.reactivex.rxjava3.core.Observable
@@ -47,7 +48,10 @@ import io.vrap.rmf.codegen.io.FileDataSink
 import io.vrap.rmf.codegen.toSeconds
 import io.vrap.rmf.codegen.types.VrapObjectType
 import io.vrap.rmf.codegen.types.VrapType
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import picocli.CommandLine
+import picocli.CommandLine.ParentCommand
 import java.io.FileInputStream
 import java.lang.IllegalArgumentException
 import java.nio.file.Files
@@ -130,6 +134,9 @@ class GenerateSubcommand : Callable<Int> {
     @CommandLine.Option(names = ["--dry-run"], description = ["Don't write to files"], required = false )
     var dryRun: Boolean? = false
 
+    @ParentCommand
+    lateinit var codegen: RMFCommand
+
     @CommandLine.Parameters(index = "0",description = ["Api file location"])
     lateinit var ramlFileLocation: Path
 
@@ -152,6 +159,9 @@ class GenerateSubcommand : Callable<Int> {
     }
 
     override fun call(): Int {
+        val logger: ch.qos.logback.classic.Logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as ch.qos.logback.classic.Logger
+        logger.level = if (verbose) Level.DEBUG else codegen.loglevel()
+
         RxJavaPlugins.setErrorHandler { e: Throwable -> InternalLogger.warn(e)}
         if(verbose){
             InternalLogger.logLevel = LogLevel.DEBUG

tools/cli-application/src/main/kotlin/io/vrap/rmf/codegen/cli/ValidateSubcommand.kt

@@ -20,7 +20,10 @@ import io.vrap.rmf.raml.validation.Violation
 import org.eclipse.emf.common.util.Diagnostic
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.util.EcoreUtil
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import picocli.CommandLine
+import picocli.CommandLine.ParentCommand
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Path
@@ -82,6 +85,9 @@ class ValidateSubcommand : Callable<Int> {
     @CommandLine.Option(names = ["-v", "--verbose"], description = ["Verbose"])
     var verbose: Boolean = false;
 
+    @ParentCommand
+    lateinit var codegen: RMFCommand
+
     lateinit var modelBuilder: RamlModelBuilder
 
     private fun linkURI(): java.net.URI {
@@ -97,6 +103,9 @@ class ValidateSubcommand : Callable<Int> {
     }
 
     override fun call(): Int {
+        val logger: ch.qos.logback.classic.Logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as ch.qos.logback.classic.Logger
+        logger.level = codegen.loglevel()
+
         if (listRules) {
             println("Available validators:")
             println(ValidatorSetup.allValidatorRules().joinToString("\n"));

tools/cli-application/src/main/kotlin/io/vrap/rmf/codegen/cli/VerifySubcommand.kt

@@ -6,7 +6,10 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import io.vrap.rmf.raml.model.RamlModelBuilder
 import org.eclipse.emf.common.util.URI
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import picocli.CommandLine
+import picocli.CommandLine.ParentCommand
 import java.nio.file.Path
 import java.util.*
 import java.util.concurrent.Callable
@@ -26,7 +29,13 @@ class VerifySubcommand : Callable<Int> {
     @CommandLine.Option(names = ["-w", "--watch"], description = ["Watches the files for changes"], required = false)
     var watch: Boolean = false
 
+    @ParentCommand
+    lateinit var codegen: RMFCommand
+
     override fun call(): Int {
+        val logger: ch.qos.logback.classic.Logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as ch.qos.logback.classic.Logger
+        logger.level = codegen.loglevel()
+
         val res = safeRun { verify()}
         if (watch) {
             val watchDir = ramlFileLocation.toRealPath().toAbsolutePath().parent

tools/cli-application/src/main/resources/logback.xml

@@ -4,8 +4,7 @@
             <pattern>%msg%n</pattern>
         </encoder>
     </appender>
-    <variable name="LOGLEVEL" value="${LOGLEVEL:-INFO}" />
-    <root level="${LOGLEVEL}">
+    <root level="info">
         <appender-ref ref="STDOUT" />
     </root>
 </configuration>