From 5e1915c3ceb4e10e9a469a4638c627b4879d4046 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 18 Sep 2024 16:01:58 +0200
Subject: [PATCH] Checkstyle and exception handling improvements

---
 .../sop/cli/picocli/commands/MergeCertsCmd.kt     | 10 ++++------
 .../sop/cli/picocli/commands/UpdateKeyCmd.kt      | 15 +++++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/MergeCertsCmd.kt b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/MergeCertsCmd.kt
index 15b33f8..16d56e3 100644
--- a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/MergeCertsCmd.kt
+++ b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/MergeCertsCmd.kt
@@ -4,11 +4,11 @@
 
 package sop.cli.picocli.commands
 
+import java.io.IOException
 import picocli.CommandLine
 import picocli.CommandLine.Command
 import sop.cli.picocli.SopCLI
 import sop.exception.SOPGPException
-import java.io.IOException
 
 @Command(
     name = "merge-certs",
@@ -16,11 +16,9 @@ import java.io.IOException
     exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 class MergeCertsCmd : AbstractSopCmd() {
 
-    @CommandLine.Option(names = ["--no-armor"], negatable = true)
-    var armor = false
+    @CommandLine.Option(names = ["--no-armor"], negatable = true) var armor = false
 
-    @CommandLine.Parameters(paramLabel = "CERTS")
-    var updates: List<String> = listOf()
+    @CommandLine.Parameters(paramLabel = "CERTS") var updates: List<String> = listOf()
 
     override fun run() {
         val mergeCerts = throwIfUnsupportedSubcommand(SopCLI.getSop().mergeCerts(), "merge-certs")
@@ -45,4 +43,4 @@ class MergeCertsCmd : AbstractSopCmd() {
             throw RuntimeException(e)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/UpdateKeyCmd.kt b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/UpdateKeyCmd.kt
index 2afa015..08f9297 100644
--- a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/UpdateKeyCmd.kt
+++ b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/UpdateKeyCmd.kt
@@ -4,11 +4,11 @@
 
 package sop.cli.picocli.commands
 
+import java.io.IOException
 import picocli.CommandLine.Command
 import picocli.CommandLine.Option
 import sop.cli.picocli.SopCLI
 import sop.exception.SOPGPException.*
-import java.io.IOException
 
 @Command(
     name = "update-key",
@@ -25,8 +25,7 @@ class UpdateKeyCmd : AbstractSopCmd() {
     @Option(names = ["--with-key-password"], paramLabel = "PASSWORD")
     var withKeyPassword: List<String> = listOf()
 
-    @Option(names = ["--merge-certs"], paramLabel = "CERTS")
-    var mergeCerts: List<String> = listOf()
+    @Option(names = ["--merge-certs"], paramLabel = "CERTS") var mergeCerts: List<String> = listOf()
 
     override fun run() {
         val updateKey = throwIfUnsupportedSubcommand(SopCLI.getSop().updateKey(), "update-key")
@@ -48,7 +47,8 @@ class UpdateKeyCmd : AbstractSopCmd() {
                 val password = stringFromInputStream(getInput(passwordFileName))
                 updateKey.withKeyPassword(password)
             } catch (unsupportedOption: UnsupportedOption) {
-                val errorMsg = getMsg("sop.error.feature_support.option_not_supported", "--with-key-password")
+                val errorMsg =
+                    getMsg("sop.error.feature_support.option_not_supported", "--with-key-password")
                 throw UnsupportedOption(errorMsg, unsupportedOption)
             } catch (e: IOException) {
                 throw RuntimeException(e)
@@ -57,7 +57,7 @@ class UpdateKeyCmd : AbstractSopCmd() {
 
         for (certInput in mergeCerts) {
             try {
-                getInput(certInput).use { certIn -> updateKey.mergeCerts(certIn) }
+                getInput(certInput).use { updateKey.mergeCerts(it) }
             } catch (e: IOException) {
                 throw RuntimeException(e)
             } catch (badData: BadData) {
@@ -71,6 +71,9 @@ class UpdateKeyCmd : AbstractSopCmd() {
             ready.writeTo(System.out)
         } catch (e: IOException) {
             throw RuntimeException(e)
+        } catch (badData: BadData) {
+            val errorMsg = getMsg("sop.error.input.not_a_private_key", "STDIN")
+            throw BadData(errorMsg, badData)
         }
     }
-}
\ No newline at end of file
+}