From da2b299f4d6bea493585e7640faa0d1616fd4edc Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 15 Nov 2023 16:45:32 +0100
Subject: [PATCH] Kotlin conversion: DearmorExternal

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

diff --git a/external-sop/src/main/java/sop/external/operation/DearmorExternal.java b/external-sop/src/main/java/sop/external/operation/DearmorExternal.java
deleted file mode 100644
index cd3da6f..0000000
--- a/external-sop/src/main/java/sop/external/operation/DearmorExternal.java
+++ /dev/null
@@ -1,37 +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.Dearmor;
-
-import javax.annotation.Nonnull;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Implementation of the {@link Dearmor} operation using an external SOP binary.
- */
-public class DearmorExternal implements Dearmor {
-
-    private final List<String> commandList = new ArrayList<>();
-    private final List<String> envList;
-
-    public DearmorExternal(String binary, Properties environment) {
-        commandList.add(binary);
-        commandList.add("dearmor");
-        envList = ExternalSOP.propertiesToEnv(environment);
-    }
-
-    @Override
-    @Nonnull
-    public Ready data(@Nonnull InputStream data) throws SOPGPException.BadData {
-        return ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, data);
-    }
-}
diff --git a/external-sop/src/main/kotlin/sop/external/operation/DearmorExternal.kt b/external-sop/src/main/kotlin/sop/external/operation/DearmorExternal.kt
new file mode 100644
index 0000000..928d9b4
--- /dev/null
+++ b/external-sop/src/main/kotlin/sop/external/operation/DearmorExternal.kt
@@ -0,0 +1,20 @@
+// 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.Dearmor
+
+/** Implementation of the [Dearmor] operation using an external SOP binary. */
+class DearmorExternal(binary: String, environment: Properties) : Dearmor {
+    private val commandList = listOf(binary, "dearmor")
+    private val envList = ExternalSOP.propertiesToEnv(environment)
+
+    override fun data(data: InputStream): Ready =
+        ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, data)
+}