From 39c222dfc893d780d8daaee8fd47854ecb17d143 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 31 Oct 2023 14:03:18 +0100
Subject: [PATCH] Kotlin conversion: Dearmor

---
 .../src/main/java/sop/operation/Dearmor.java  | 59 -------------------
 .../src/main/kotlin/sop/operation/Dearmor.kt  | 46 +++++++++++++++
 2 files changed, 46 insertions(+), 59 deletions(-)
 delete mode 100644 sop-java/src/main/java/sop/operation/Dearmor.java
 create mode 100644 sop-java/src/main/kotlin/sop/operation/Dearmor.kt

diff --git a/sop-java/src/main/java/sop/operation/Dearmor.java b/sop-java/src/main/java/sop/operation/Dearmor.java
deleted file mode 100644
index 524dc8c..0000000
--- a/sop-java/src/main/java/sop/operation/Dearmor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package sop.operation;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import sop.Ready;
-import sop.exception.SOPGPException;
-import sop.util.UTF8Util;
-
-public interface Dearmor {
-
-    /**
-     * Dearmor armored OpenPGP data.
-     *
-     * @param data armored OpenPGP data
-     * @return input stream of unarmored data
-     *
-     * @throws SOPGPException.BadData in case of non-OpenPGP data
-     * @throws IOException in case of an IO error
-     */
-    Ready data(InputStream data)
-            throws SOPGPException.BadData,
-            IOException;
-
-    /**
-     * Dearmor armored OpenPGP data.
-     *
-     * @param data armored OpenPGP data
-     * @return input stream of unarmored data
-     *
-     * @throws SOPGPException.BadData in case of non-OpenPGP data
-     * @throws IOException in case of an IO error
-     */
-    default Ready data(byte[] data)
-            throws SOPGPException.BadData,
-            IOException {
-        return data(new ByteArrayInputStream(data));
-    }
-
-    /**
-     * Dearmor amored OpenPGP data.
-     *
-     * @param data armored OpenPGP data
-     * @return input stream of unarmored data
-     *
-     * @throws SOPGPException.BadData in case of non-OpenPGP data
-     * @throws IOException in case of an IO error
-     */
-    default Ready data(String data)
-            throws SOPGPException.BadData,
-            IOException {
-        return data(data.getBytes(UTF8Util.UTF8));
-    }
-}
diff --git a/sop-java/src/main/kotlin/sop/operation/Dearmor.kt b/sop-java/src/main/kotlin/sop/operation/Dearmor.kt
new file mode 100644
index 0000000..cc5e98d
--- /dev/null
+++ b/sop-java/src/main/kotlin/sop/operation/Dearmor.kt
@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package sop.operation
+
+import java.io.IOException
+import java.io.InputStream
+import sop.Ready
+import sop.exception.SOPGPException.BadData
+import sop.util.UTF8Util
+
+interface Dearmor {
+
+    /**
+     * Dearmor armored OpenPGP data.
+     *
+     * @param data armored OpenPGP data
+     * @return input stream of unarmored data
+     * @throws BadData in case of non-OpenPGP data
+     * @throws IOException in case of an IO error
+     */
+    @Throws(BadData::class, IOException::class) fun data(data: InputStream): Ready
+
+    /**
+     * Dearmor armored OpenPGP data.
+     *
+     * @param data armored OpenPGP data
+     * @return input stream of unarmored data
+     * @throws BadData in case of non-OpenPGP data
+     * @throws IOException in case of an IO error
+     */
+    @Throws(BadData::class, IOException::class)
+    fun data(data: ByteArray): Ready = data(data.inputStream())
+
+    /**
+     * Dearmor amored OpenPGP data.
+     *
+     * @param data armored OpenPGP data
+     * @return input stream of unarmored data
+     * @throws BadData in case of non-OpenPGP data
+     * @throws IOException in case of an IO error
+     */
+    @Throws(BadData::class, IOException::class)
+    fun data(data: String): Ready = data(data.toByteArray(UTF8Util.UTF8))
+}