From 18865feaff9192ac63d6f6a44b1ec6f3648621ce Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sat, 4 Nov 2023 17:26:38 +0100
Subject: [PATCH] Kotlin conversion: RevokeKeyCmd

---
 .../cli/picocli/commands/RevokeKeyCmd.java    | 62 -------------------
 .../sop/cli/picocli/commands/RevokeKeyCmd.kt  | 58 +++++++++++++++++
 2 files changed, 58 insertions(+), 62 deletions(-)
 delete mode 100644 sop-java-picocli/src/main/java/sop/cli/picocli/commands/RevokeKeyCmd.java
 create mode 100644 sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/RevokeKeyCmd.kt

diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/RevokeKeyCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/RevokeKeyCmd.java
deleted file mode 100644
index 45f22fa..0000000
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/RevokeKeyCmd.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package sop.cli.picocli.commands;
-
-import picocli.CommandLine;
-import sop.Ready;
-import sop.cli.picocli.SopCLI;
-import sop.exception.SOPGPException;
-import sop.operation.RevokeKey;
-
-import java.io.IOException;
-
-@CommandLine.Command(name = "revoke-key",
-        resourceBundle = "msg_revoke-key",
-        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
-public class RevokeKeyCmd extends AbstractSopCmd {
-
-    @CommandLine.Option(names = "--no-armor",
-            negatable = true)
-    boolean armor = true;
-
-    @CommandLine.Option(names = "--with-key-password",
-            paramLabel = "PASSWORD")
-    String withKeyPassword;
-
-    @Override
-    public void run() {
-        RevokeKey revokeKey = throwIfUnsupportedSubcommand(
-                SopCLI.getSop().revokeKey(), "revoke-key");
-
-        if (!armor) {
-            revokeKey.noArmor();
-        }
-
-        if (withKeyPassword != null) {
-            try {
-                String password = stringFromInputStream(getInput(withKeyPassword));
-                revokeKey.withKeyPassword(password);
-            } catch (SOPGPException.UnsupportedOption e) {
-                String errorMsg = getMsg("sop.error.feature_support.option_not_supported", "--with-key-password");
-                throw new SOPGPException.UnsupportedOption(errorMsg, e);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        Ready ready;
-        try {
-            ready = revokeKey.keys(System.in);
-        } catch (SOPGPException.KeyIsProtected e) {
-            String errorMsg = getMsg("sop.error.runtime.cannot_unlock_key", "STANDARD_IN");
-            throw new SOPGPException.KeyIsProtected(errorMsg, e);
-        }
-        try {
-            ready.writeTo(System.out);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/RevokeKeyCmd.kt b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/RevokeKeyCmd.kt
new file mode 100644
index 0000000..0b93ac5
--- /dev/null
+++ b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/RevokeKeyCmd.kt
@@ -0,0 +1,58 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+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 sop.exception.SOPGPException.KeyIsProtected
+
+@Command(
+    name = "revoke-key",
+    resourceBundle = "msg_revoke-key",
+    exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
+class RevokeKeyCmd : AbstractSopCmd() {
+
+    @Option(names = ["--no-armor"], negatable = true) var armor = true
+
+    @Option(names = ["--with-key-password"], paramLabel = "PASSWORD")
+    var withKeyPassword: String? = null
+
+    override fun run() {
+        val revokeKey = throwIfUnsupportedSubcommand(SopCLI.getSop().revokeKey(), "revoke-key")
+
+        if (!armor) {
+            revokeKey.noArmor()
+        }
+
+        withKeyPassword?.let {
+            try {
+                val password = stringFromInputStream(getInput(it))
+                revokeKey.withKeyPassword(password)
+            } catch (e: SOPGPException.UnsupportedOption) {
+                val errorMsg =
+                    getMsg("sop.error.feature_support.option_not_supported", "--with-key-password")
+                throw SOPGPException.UnsupportedOption(errorMsg, e)
+            } catch (e: IOException) {
+                throw RuntimeException(e)
+            }
+        }
+
+        val ready =
+            try {
+                revokeKey.keys(System.`in`)
+            } catch (e: KeyIsProtected) {
+                val errorMsg = getMsg("sop.error.runtime.cannot_unlock_key", "STANDARD_IN")
+                throw KeyIsProtected(errorMsg, e)
+            }
+        try {
+            ready.writeTo(System.out)
+        } catch (e: IOException) {
+            throw RuntimeException(e)
+        }
+    }
+}