From 832a455c4ccb885d68ebb97e6b855d0e80faa24d Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 15 Nov 2023 18:11:24 +0100
Subject: [PATCH] Kotlin conversion: RevokeKeyExternal

---
 .../external/operation/RevokeKeyExternal.java | 52 -------------------
 .../external/operation/RevokeKeyExternal.kt   | 31 +++++++++++
 2 files changed, 31 insertions(+), 52 deletions(-)
 delete mode 100644 external-sop/src/main/java/sop/external/operation/RevokeKeyExternal.java
 create mode 100644 external-sop/src/main/kotlin/sop/external/operation/RevokeKeyExternal.kt

diff --git a/external-sop/src/main/java/sop/external/operation/RevokeKeyExternal.java b/external-sop/src/main/java/sop/external/operation/RevokeKeyExternal.java
deleted file mode 100644
index 72ed549..0000000
--- a/external-sop/src/main/java/sop/external/operation/RevokeKeyExternal.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package sop.external.operation;
-
-import sop.Ready;
-import sop.exception.SOPGPException;
-import sop.external.ExternalSOP;
-import sop.operation.RevokeKey;
-
-import javax.annotation.Nonnull;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-public class RevokeKeyExternal implements RevokeKey {
-
-    private final List<String> commandList = new ArrayList<>();
-    private final List<String> envList;
-
-    private int withKeyPasswordCounter = 0;
-
-    public RevokeKeyExternal(String binary, Properties environment) {
-        this.commandList.add(binary);
-        this.commandList.add("revoke-key");
-        this.envList = ExternalSOP.propertiesToEnv(environment);
-    }
-
-    @Override
-    @Nonnull
-    public RevokeKey noArmor() {
-        this.commandList.add("--no-armor");
-        return this;
-    }
-
-    @Override
-    @Nonnull
-    public RevokeKey withKeyPassword(@Nonnull byte[] password) throws SOPGPException.UnsupportedOption, SOPGPException.PasswordNotHumanReadable {
-        String envVar = "KEY_PASSWORD_" + withKeyPasswordCounter++;
-        commandList.add("--with-key-password=@ENV:" + envVar);
-        envList.add(envVar + "=" + new String(password));
-        return this;
-    }
-
-    @Override
-    @Nonnull
-    public Ready keys(@Nonnull InputStream keys) {
-        return ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, keys);
-    }
-}
diff --git a/external-sop/src/main/kotlin/sop/external/operation/RevokeKeyExternal.kt b/external-sop/src/main/kotlin/sop/external/operation/RevokeKeyExternal.kt
new file mode 100644
index 0000000..43795e6
--- /dev/null
+++ b/external-sop/src/main/kotlin/sop/external/operation/RevokeKeyExternal.kt
@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package sop.external.operation
+
+import java.io.InputStream
+import java.util.Properties
+import sop.Ready
+import sop.external.ExternalSOP
+import sop.operation.RevokeKey
+
+/** Implementation of the [RevokeKey] operation using an external SOP binary. */
+class RevokeKeyExternal(binary: String, environment: Properties) : RevokeKey {
+
+    private val commandList = mutableListOf(binary, "revoke-key")
+    private val envList = ExternalSOP.propertiesToEnv(environment).toMutableList()
+
+    private var argCount = 0
+
+    override fun noArmor(): RevokeKey = apply { commandList.add("--no-armor") }
+
+    override fun withKeyPassword(password: ByteArray): RevokeKey = apply {
+        commandList.add("--with-key-password=@ENV:KEY_PASSWORD_$argCount")
+        envList.add("KEY_PASSWORD_$argCount=${String(password)}")
+        argCount += 1
+    }
+
+    override fun keys(keys: InputStream): Ready =
+        ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, keys)
+}