diff --git a/pom.xml b/pom.xml index 8d63f41..e7da6a4 100644 --- a/pom.xml +++ b/pom.xml @@ -41,14 +41,14 @@ UTF-8 UTF-8 official - 2.2.0 + 2.2.10 21 3.14.0 2.0.0 9.0.2 1.2.3 - 1.19.0 + 1.20.0 3.5.0 3.7.1 3.1.4 @@ -57,18 +57,18 @@ 3.3.1 3.3.1 1.7.1 - 3.25.0 + 3.26.2 3.5.3 - 2.18.0 + 2.19.0 - 3.27.3 + 3.27.4 3.18.0 1.23.8 1.4.0 5.1.0 - 3.3.3 + 3.6.0 3.1.0 - 2.15.0 + 2.16.0 diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/autocompletion/zsh/ZshAutocompletionGenerator.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/autocompletion/zsh/ZshAutocompletionGenerator.kt index 36b2ecc..9d16330 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/autocompletion/zsh/ZshAutocompletionGenerator.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/autocompletion/zsh/ZshAutocompletionGenerator.kt @@ -7,7 +7,9 @@ import picocli.CommandLine.Model.CommandSpec private const val SHEBANG = "#!/bin/zsh" @ApplicationScoped -class ZshAutocompletionGenerator(private val template: ZshAutocompletionTemplate) { +class ZshAutocompletionGenerator( + private val template: ZshAutocompletionTemplate, +) { /** * This function generates the full ZSH autocompletion script for the command that's provided and all subcommands */ @@ -23,8 +25,10 @@ class ZshAutocompletionGenerator(private val template: ZshAutocompletionTemplate } private fun loadLinesForResource() = - ZshAutocompletionGenerator::class.java.getResourceAsStream("/autocompletion/zsh/footer.sh") - ?.bufferedReader()?.lines() + ZshAutocompletionGenerator::class.java + .getResourceAsStream("/autocompletion/zsh/footer.sh") + ?.bufferedReader() + ?.lines() ?: error("Cannot find footer.sh for the autocompletion script") /** diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/autocompletion/zsh/ZshAutocompletionTemplate.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/autocompletion/zsh/ZshAutocompletionTemplate.kt index 405f54a..e64a9ed 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/autocompletion/zsh/ZshAutocompletionTemplate.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/autocompletion/zsh/ZshAutocompletionTemplate.kt @@ -56,7 +56,11 @@ function $functionName() { ): List { val overviewValues = subcommands.joinToString(" ") { - val description = it.commandSpec.usageMessage().description().firstOrNull() ?: "" + val description = + it.commandSpec + .usageMessage() + .description() + .firstOrNull() ?: "" "'${it.commandName}[$description]'" } @@ -110,7 +114,11 @@ function $functionName() { private fun generatePositionalParameterSpecActionPairs(positionalParameters: List) = positionalParameters.withIndex().mapNotNull { - val description = it.value.description().joinToString("").ifEmpty { " " } + val description = + it.value + .description() + .joinToString("") + .ifEmpty { " " } val index = it.index + 1 when (val action = generateAutocompleteAction(it.value.completionCandidates())) { @@ -153,12 +161,20 @@ function $functionName() { * This data class holds the spec which will be added to ZSH's _arguments method, * and the action describes what's done when a certain argument spec is matched. */ - data class ArgumentSpecActionPair(val spec: String, val action: String? = null) + data class ArgumentSpecActionPair( + val spec: String, + val action: String? = null, + ) sealed interface AutoCompleteAction + data object NoAction : AutoCompleteAction - data class FunctionCallAction(val functionName: String) : AutoCompleteAction + data class FunctionCallAction( + val functionName: String, + ) : AutoCompleteAction - data class StaticValuesAction(val staticValues: String) : AutoCompleteAction + data class StaticValuesAction( + val staticValues: String, + ) : AutoCompleteAction } diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/config/CommandLineConfiguration.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/config/CommandLineConfiguration.kt index a2a09b9..c13c33d 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/config/CommandLineConfiguration.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/config/CommandLineConfiguration.kt @@ -10,14 +10,17 @@ import picocli.CommandLine.Help.Ansi.AUTO import picocli.CommandLine.Help.ColorScheme @ApplicationScoped -class CommandLineConfiguration(private val pluginLoader: PluginLoader) { +class CommandLineConfiguration( + private val pluginLoader: PluginLoader, +) { @Produces fun customCommandLine( factory: PicocliCommandLineFactory, retConsole: RetConsole, ): CommandLine { val commandLine = - factory.create() + factory + .create() .setExecutionExceptionHandler(ExceptionMessageHandler(retConsole)) .setExecutionStrategy { CommandLine.RunLast().execute(it) } .setColorScheme(ColorScheme.Builder().ansi(AUTO).build()) diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/config/EnvironmentManager.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/config/EnvironmentManager.kt index a672015..1ac8e5e 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/config/EnvironmentManager.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/config/EnvironmentManager.kt @@ -16,11 +16,12 @@ class EnvironmentManager { runCatching { Log.debug("ret.env value is $retEnvironment") valueOf(retEnvironment) - } - .getOrDefault(CLI) + }.getOrDefault(CLI) } -enum class Environment(val recordMetrics: Boolean) { +enum class Environment( + val recordMetrics: Boolean, +) { CLI(true), ZSH_AUTOCOMPLETE(false), ALFRED(true), diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/config/ExceptionMessageHandler.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/config/ExceptionMessageHandler.kt index bf61dcb..db3fd99 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/config/ExceptionMessageHandler.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/config/ExceptionMessageHandler.kt @@ -6,7 +6,9 @@ import picocli.CommandLine import picocli.CommandLine.IExecutionExceptionHandler import picocli.CommandLine.ParseResult -class ExceptionMessageHandler(private val retConsole: RetConsole) : IExecutionExceptionHandler { +class ExceptionMessageHandler( + private val retConsole: RetConsole, +) : IExecutionExceptionHandler { override fun handleExecutionException( ex: Exception, commandLine: CommandLine, diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/context/ExecutionContext.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/context/ExecutionContext.kt index a306b13..09cab3d 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/context/ExecutionContext.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/context/ExecutionContext.kt @@ -4,7 +4,9 @@ import io.rabobank.ret.configuration.version.VersionProperties import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped -class ExecutionContext(private val versionProperties: VersionProperties = VersionProperties()) { +class ExecutionContext( + private val versionProperties: VersionProperties = VersionProperties(), +) { private val gitContext = GitContext.create() fun repositoryName() = gitContext?.repositoryName() diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/context/GitContext.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/context/GitContext.kt index 80e7f30..43764f5 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/context/GitContext.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/context/GitContext.kt @@ -3,7 +3,9 @@ package io.rabobank.ret.context import org.eclipse.jgit.lib.Repository import org.eclipse.jgit.storage.file.FileRepositoryBuilder -internal class GitContext internal constructor(private val repository: Repository) { +internal class GitContext internal constructor( + private val repository: Repository, +) { fun repositoryName(): String? { val remoteOriginURL: String? = repository.config.getString("remote", "origin", "url") return remoteOriginURL?.substringAfterLast("/") diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginCommandEntry.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginCommandEntry.kt index 433a4e1..17d9850 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginCommandEntry.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginCommandEntry.kt @@ -2,4 +2,7 @@ package io.rabobank.ret.plugins import picocli.CommandLine.Model.CommandSpec -data class PluginCommandEntry(val name: String, val commandSpec: CommandSpec) +data class PluginCommandEntry( + val name: String, + val commandSpec: CommandSpec, +) diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginExtensionLoader.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginExtensionLoader.kt index d311c60..15d97ca 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginExtensionLoader.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginExtensionLoader.kt @@ -21,7 +21,8 @@ class PluginExtensionLoader { objectMapper: ObjectMapper, ): List = osUtils.getRetPluginsDirectory().let { pluginPath -> - pluginPath.walk() + pluginPath + .walk() .map(Path::toFile) .filter { it.extension == PLUGIN_EXTENSION } .map { objectMapper.readValue(it.readText()) } diff --git a/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginLoader.kt b/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginLoader.kt index f0c0cad..77186a3 100644 --- a/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginLoader.kt +++ b/ret-cli/src/main/kotlin/io/rabobank/ret/plugins/PluginLoader.kt @@ -50,7 +50,8 @@ class PluginLoader( command.arguments.forEach { commandSpec.addPositional( - PositionalParamSpec.builder() + PositionalParamSpec + .builder() .paramLabel(it.name) .index(it.position) .arity(it.arity) @@ -61,7 +62,8 @@ class PluginLoader( command.options.forEach { commandSpec.addOption( - OptionSpec.builder(it.names.toTypedArray()) + OptionSpec + .builder(it.names.toTypedArray()) .type(asType(it.type)) .completionCandidates(it.completionCandidates) .build(), 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 index 7711fb2..f5ae45e 100644 --- a/ret-cli/src/test/kotlin/io/rabobank/ret/plugins/PluginLoaderTest.kt +++ b/ret-cli/src/test/kotlin/io/rabobank/ret/plugins/PluginLoaderTest.kt @@ -63,7 +63,8 @@ class PluginLoaderTest { private fun loadPlugin(file: String): Plugin { val definition = - this.javaClass.classLoader.getResourceAsStream("testdata/$file")!! + this.javaClass.classLoader + .getResourceAsStream("testdata/$file")!! .bufferedReader() .readText() diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/IntelliSearch.kt b/ret-core/src/main/kotlin/io/rabobank/ret/IntelliSearch.kt index 450b457..a334b39 100644 --- a/ret-core/src/main/kotlin/io/rabobank/ret/IntelliSearch.kt +++ b/ret-core/src/main/kotlin/io/rabobank/ret/IntelliSearch.kt @@ -3,9 +3,16 @@ package io.rabobank.ret import io.quarkus.logging.Log import jakarta.enterprise.context.ApplicationScoped -data class SearchHit(val filterRound: FilterRound, val candidateIndex: Int) - -data class FilterRound(val filter: String, val startIndex: Int, val endIndex: Int) { +data class SearchHit( + val filterRound: FilterRound, + val candidateIndex: Int, +) + +data class FilterRound( + val filter: String, + val startIndex: Int, + val endIndex: Int, +) { val value = filter.substring(startIndex..endIndex) override fun toString() = "filter: $filter part: $startIndex..$endIndex value: $value" diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/RetConsole.kt b/ret-core/src/main/kotlin/io/rabobank/ret/RetConsole.kt index eb12653..1d0ed8e 100644 --- a/ret-core/src/main/kotlin/io/rabobank/ret/RetConsole.kt +++ b/ret-core/src/main/kotlin/io/rabobank/ret/RetConsole.kt @@ -11,9 +11,13 @@ import picocli.CommandLine.ParseResult * This class is used to interact with the user by outputting messages, errors and prompting for responses. */ @ApplicationScoped -class RetConsole(parseResult: ParseResult) { +class RetConsole( + parseResult: ParseResult, +) { private val commandLine = - parseResult.commandSpec().commandLine() + parseResult + .commandSpec() + .commandLine() .setColorScheme(ColorScheme.Builder().ansi(CommandLine.Help.Ansi.AUTO).build()) /** diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/Configurable.kt b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/Configurable.kt index 3d899c0..b43b57d 100644 --- a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/Configurable.kt +++ b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/Configurable.kt @@ -95,7 +95,9 @@ open class Configurable { inline fun convertTo() = objectMapper.convertValue(pluginConfig.config) } -class PluginConfig(val config: MutableMap) { +class PluginConfig( + val config: MutableMap, +) { inline operator fun get(key: String): T? { val value = config[key] return if (value is T?) { @@ -115,7 +117,11 @@ class PluginConfig(val config: MutableMap) { } } -class PluginConfigLoader(pluginName: String, private val objectMapper: ObjectMapper, osUtils: OsUtils) { +class PluginConfigLoader( + pluginName: String, + private val objectMapper: ObjectMapper, + osUtils: OsUtils, +) { private val pluginFile = osUtils.getPluginConfig(pluginName).toFile() fun load() = diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/ConfigurationProperty.kt b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/ConfigurationProperty.kt index bfd891e..4abb1ee 100644 --- a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/ConfigurationProperty.kt +++ b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/ConfigurationProperty.kt @@ -9,4 +9,8 @@ package io.rabobank.ret.configuration * @property prompt the message to the user, specifying what should be provided for this config property. * @property required tells the user this is a mandatory field which cannot be skipped. */ -data class ConfigurationProperty(val key: String, val prompt: String, val required: Boolean = false) +data class ConfigurationProperty( + val key: String, + val prompt: String, + val required: Boolean = false, +) diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/MdcConfig.kt b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/MdcConfig.kt index e306910..03c2cc3 100644 --- a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/MdcConfig.kt +++ b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/MdcConfig.kt @@ -12,7 +12,9 @@ import org.jboss.logging.MDC * This is done automatically, so you don't need to use this class in your plugin. */ @ApplicationScoped -class MdcConfig(private val versionProperties: VersionProperties) { +class MdcConfig( + private val versionProperties: VersionProperties, +) { @Suppress("unused") fun onStart( @Observes ev: StartupEvent, diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/RetVersionProvider.kt b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/RetVersionProvider.kt index ab5a479..d7fd734 100644 --- a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/RetVersionProvider.kt +++ b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/RetVersionProvider.kt @@ -13,8 +13,9 @@ import picocli.CommandLine */ @Unremovable @ApplicationScoped -class RetVersionProvider(private val versionProperties: VersionProperties = VersionProperties()) : - CommandLine.IVersionProvider { +class RetVersionProvider( + private val versionProperties: VersionProperties = VersionProperties(), +) : CommandLine.IVersionProvider { override fun getVersion() = arrayOf( "RET Version: ${versionProperties.getAppVersion()}", diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/VersionProperties.kt b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/VersionProperties.kt index 2c389b1..7366e00 100644 --- a/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/VersionProperties.kt +++ b/ret-core/src/main/kotlin/io/rabobank/ret/configuration/version/VersionProperties.kt @@ -47,7 +47,8 @@ class VersionProperties { } private fun loadGitProperties() { - VersionProperties::class.java.classLoader.getResourceAsStream(GIT_PROPERTIES) + VersionProperties::class.java.classLoader + .getResourceAsStream(GIT_PROPERTIES) ?.run { properties.load(this) } ?: Log.debug("No Git information available: cannot load git.properties file.") } diff --git a/ret-core/src/main/kotlin/io/rabobank/ret/util/IntrospectionUtil.kt b/ret-core/src/main/kotlin/io/rabobank/ret/util/IntrospectionUtil.kt index 64849d4..4020b94 100644 --- a/ret-core/src/main/kotlin/io/rabobank/ret/util/IntrospectionUtil.kt +++ b/ret-core/src/main/kotlin/io/rabobank/ret/util/IntrospectionUtil.kt @@ -17,7 +17,8 @@ object IntrospectionUtil { ) private fun loadCustomZshAutocompletion(): String? = - javaClass.getResourceAsStream("/autocompletion/zsh/completions.zsh") + javaClass + .getResourceAsStream("/autocompletion/zsh/completions.zsh") ?.bufferedReader() ?.readText() @@ -34,7 +35,8 @@ object IntrospectionUtil { ) } val options = - commandSpec.options() + commandSpec + .options() .map { Option( it.names().toList(), @@ -44,7 +46,9 @@ object IntrospectionUtil { } val subcommands = - commandSpec.subcommands().values + commandSpec + .subcommands() + .values .map { generateCommand(it.commandSpec) }