From 8df4a520bdb6c2e37ea81cf71f0cf7e8b422eb7e Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 31 Oct 2023 14:20:29 +0100
Subject: [PATCH] Kotlin conversion: InlineDetach

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

diff --git a/sop-java/src/main/java/sop/operation/InlineDetach.java b/sop-java/src/main/java/sop/operation/InlineDetach.java
deleted file mode 100644
index aba40b1..0000000
--- a/sop-java/src/main/java/sop/operation/InlineDetach.java
+++ /dev/null
@@ -1,52 +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.ReadyWithResult;
-import sop.Signatures;
-import sop.exception.SOPGPException;
-
-/**
- * Split cleartext signed messages up into data and signatures.
- */
-public interface InlineDetach {
-
-    /**
-     * Do not wrap the signatures in ASCII armor.
-     * @return builder
-     */
-    InlineDetach noArmor();
-
-    /**
-     * Detach the provided signed message from its signatures.
-     *
-     * @param messageInputStream input stream containing the signed message
-     * @return result containing the detached message
-     *
-     * @throws IOException in case of an IO error
-     * @throws sop.exception.SOPGPException.BadData if the input stream does not contain a signed message
-     */
-    ReadyWithResult<Signatures> message(InputStream messageInputStream)
-            throws IOException,
-            SOPGPException.BadData;
-
-    /**
-     * Detach the provided cleartext signed message from its signatures.
-     *
-     * @param message byte array containing the signed message
-     * @return result containing the detached message
-     * @throws IOException in case of an IO error
-     * @throws sop.exception.SOPGPException.BadData if the byte array does not contain a signed message
-     */
-    default ReadyWithResult<Signatures> message(byte[] message)
-            throws IOException,
-            SOPGPException.BadData {
-        return message(new ByteArrayInputStream(message));
-    }
-}
diff --git a/sop-java/src/main/kotlin/sop/operation/InlineDetach.kt b/sop-java/src/main/kotlin/sop/operation/InlineDetach.kt
new file mode 100644
index 0000000..941a9bf
--- /dev/null
+++ b/sop-java/src/main/kotlin/sop/operation/InlineDetach.kt
@@ -0,0 +1,43 @@
+// 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.ReadyWithResult
+import sop.Signatures
+import sop.exception.SOPGPException.BadData
+
+interface InlineDetach {
+
+    /**
+     * Do not wrap the signatures in ASCII armor.
+     *
+     * @return builder
+     */
+    fun noArmor(): InlineDetach
+
+    /**
+     * Detach the provided signed message from its signatures.
+     *
+     * @param messageInputStream input stream containing the signed message
+     * @return result containing the detached message
+     * @throws IOException in case of an IO error
+     * @throws BadData if the input stream does not contain a signed message
+     */
+    @Throws(IOException::class, BadData::class)
+    fun message(messageInputStream: InputStream): ReadyWithResult<Signatures>
+
+    /**
+     * Detach the provided cleartext signed message from its signatures.
+     *
+     * @param message byte array containing the signed message
+     * @return result containing the detached message
+     * @throws IOException in case of an IO error
+     * @throws BadData if the byte array does not contain a signed message
+     */
+    @Throws(IOException::class, BadData::class)
+    fun message(message: ByteArray): ReadyWithResult<Signatures> = message(message.inputStream())
+}