From 4a123a198078f81c80640716d51c574a956dccda Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 31 Oct 2023 13:54:24 +0100
Subject: [PATCH] Kotlin conversion: Armor

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

diff --git a/sop-java/src/main/java/sop/operation/Armor.java b/sop-java/src/main/java/sop/operation/Armor.java
deleted file mode 100644
index a625808..0000000
--- a/sop-java/src/main/java/sop/operation/Armor.java
+++ /dev/null
@@ -1,53 +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.enums.ArmorLabel;
-import sop.exception.SOPGPException;
-
-public interface Armor {
-
-    /**
-     * Overrides automatic detection of label.
-     *
-     * @param label armor label
-     * @return builder instance
-     */
-    Armor label(ArmorLabel label)
-            throws SOPGPException.UnsupportedOption;
-
-    /**
-     * Armor the provided data.
-     *
-     * @param data input stream of unarmored OpenPGP data
-     * @return armored data
-     *
-     * @throws sop.exception.SOPGPException.BadData if the data appears to be OpenPGP packets, but those are broken
-     * @throws IOException in case of an IO error
-     */
-    Ready data(InputStream data)
-            throws SOPGPException.BadData,
-            IOException;
-
-    /**
-     * Armor the provided data.
-     *
-     * @param data unarmored OpenPGP data
-     * @return armored data
-     *
-     * @throws sop.exception.SOPGPException.BadData if the data appears to be OpenPGP packets, but those are broken
-     * @throws IOException in case of an IO error
-     */
-    default Ready data(byte[] data)
-            throws SOPGPException.BadData,
-            IOException {
-        return data(new ByteArrayInputStream(data));
-    }
-}
diff --git a/sop-java/src/main/kotlin/sop/operation/Armor.kt b/sop-java/src/main/kotlin/sop/operation/Armor.kt
new file mode 100644
index 0000000..e89708b
--- /dev/null
+++ b/sop-java/src/main/kotlin/sop/operation/Armor.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.enums.ArmorLabel
+import sop.exception.SOPGPException.BadData
+import sop.exception.SOPGPException.UnsupportedOption
+
+interface Armor {
+
+    /**
+     * Overrides automatic detection of label.
+     *
+     * @param label armor label
+     * @return builder instance
+     */
+    @Deprecated("Use of armor labels is deprecated and will be removed in a future release.")
+    @Throws(UnsupportedOption::class)
+    fun label(label: ArmorLabel): Armor
+
+    /**
+     * Armor the provided data.
+     *
+     * @param data input stream of unarmored OpenPGP data
+     * @return armored data
+     * @throws BadData if the data appears to be OpenPGP packets, but those are broken
+     * @throws IOException in case of an IO error
+     */
+    @Throws(BadData::class, IOException::class) fun data(data: InputStream): Ready
+
+    /**
+     * Armor the provided data.
+     *
+     * @param data unarmored OpenPGP data
+     * @return armored data
+     * @throws BadData if the data appears to be OpenPGP packets, but those are broken
+     * @throws IOException in case of an IO error
+     */
+    @Throws(BadData::class, IOException::class)
+    fun data(data: ByteArray): Ready = data(data.inputStream())
+}