Fix code formatting

rabobank · May 19, 2023 · 2d5230e · 2d5230e
1 parent 21a7b2e
commit 2d5230e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/ret-cli/src/test/kotlin/io/rabobank/ret/plugins/PluginLoaderTest.kt b/ret-cli/src/test/kotlin/io/rabobank/ret/plugins/PluginLoaderTest.kt
@@ -2,6 +2,7 @@ package io.rabobank.ret.plugins
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import io.rabobank.ret.config.Environment
 import io.rabobank.ret.context.ExecutionContext
 import io.rabobank.ret.plugin.Plugin
@@ -13,7 +14,7 @@ import picocli.CommandLine.Command
 import java.nio.file.Path
 
 class PluginLoaderTest {
-    private val objectMapper = ObjectMapper().registerModule(KotlinModule.Builder().build())
+    private val objectMapper = jacksonObjectMapper()
     private val commandLine = CommandLine(EmptyCommand())
 
     @Test

diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/plugin/PluginDefinition.kt b/ret-core/src/main/kotlin/io/rabobank/ret/plugin/PluginDefinition.kt
@@ -6,14 +6,14 @@ import java.nio.file.Path
 @RegisterForReflection
 data class Plugin(
     val pluginDefinition: PluginDefinition,
-    val pluginLocation: Path
+    val pluginLocation: Path,
 )
 
 @RegisterForReflection
 data class PluginDefinition(
     val libName: String,
     val commands: List<PluginCommand>,
-    val customZshAutocompletion: String?
+    val customZshAutocompletion: String?,
 )
 
 @RegisterForReflection
@@ -23,7 +23,7 @@ data class PluginCommand(
     val options: List<Option>,
     val subcommands: List<PluginCommand>,
     val description: String? = null,
-    val hidden: Boolean = false
+    val hidden: Boolean = false,
 )
 
 @RegisterForReflection

diff --git a/ret-plugin/src/main/kotlin/io/rabobank/ret/IntrospectionUtil.kt b/ret-plugin/src/main/kotlin/io/rabobank/ret/IntrospectionUtil.kt
@@ -8,13 +8,11 @@ import picocli.CommandLine.Model.CommandSpec
 
 object IntrospectionUtil {
 
-    fun introspect(commandSpec: CommandSpec, pluginName: String): PluginDefinition {
-        return PluginDefinition(
-            pluginName,
-            listOf(generateCommand(commandSpec)),
-            loadCustomZshAutocompletion()
-        )
-    }
+    fun introspect(commandSpec: CommandSpec, pluginName: String) = PluginDefinition(
+        pluginName,
+        listOf(generateCommand(commandSpec)),
+        loadCustomZshAutocompletion()
+    )
 
     private fun loadCustomZshAutocompletion(): String? =
         javaClass.getResourceAsStream("/autocompletion/zsh/completions.zsh")