From b5d8126e48dfd2a6a9f13ae546637fa28aff212e Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 4 Aug 2023 17:18:19 +0200
Subject: [PATCH] Kotlin conversion: AlgorithmSuite

---
 .../pgpainless/algorithm/AlgorithmSuite.java  | 63 -------------------
 .../pgpainless/algorithm/AlgorithmSuite.kt    | 41 ++++++++++++
 2 files changed, 41 insertions(+), 63 deletions(-)
 delete mode 100644 pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java
 create mode 100644 pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.kt

diff --git a/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java b/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java
deleted file mode 100644
index e155e367..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-FileCopyrightText: 2018 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.algorithm;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * The {@link AlgorithmSuite} class is consulted when new OpenPGP keys are being generated to set
- * preferred algorithms on the key.
- */
-public class AlgorithmSuite {
-
-    private static final AlgorithmSuite defaultAlgorithmSuite = new AlgorithmSuite(
-            Arrays.asList(
-                    SymmetricKeyAlgorithm.AES_256,
-                    SymmetricKeyAlgorithm.AES_192,
-                    SymmetricKeyAlgorithm.AES_128),
-            Arrays.asList(
-                    HashAlgorithm.SHA512,
-                    HashAlgorithm.SHA384,
-                    HashAlgorithm.SHA256,
-                    HashAlgorithm.SHA224),
-            Arrays.asList(
-                    CompressionAlgorithm.ZLIB,
-                    CompressionAlgorithm.BZIP2,
-                    CompressionAlgorithm.ZIP,
-                    CompressionAlgorithm.UNCOMPRESSED)
-    );
-
-    private final Set<SymmetricKeyAlgorithm> symmetricKeyAlgorithms;
-    private final Set<HashAlgorithm> hashAlgorithms;
-    private final Set<CompressionAlgorithm> compressionAlgorithms;
-
-    public AlgorithmSuite(List<SymmetricKeyAlgorithm> symmetricKeyAlgorithms,
-                          List<HashAlgorithm> hashAlgorithms,
-                          List<CompressionAlgorithm> compressionAlgorithms) {
-        this.symmetricKeyAlgorithms = Collections.unmodifiableSet(new LinkedHashSet<>(symmetricKeyAlgorithms));
-        this.hashAlgorithms = Collections.unmodifiableSet(new LinkedHashSet<>(hashAlgorithms));
-        this.compressionAlgorithms = Collections.unmodifiableSet(new LinkedHashSet<>(compressionAlgorithms));
-    }
-
-    public Set<SymmetricKeyAlgorithm> getSymmetricKeyAlgorithms() {
-        return new LinkedHashSet<>(symmetricKeyAlgorithms);
-    }
-
-    public Set<HashAlgorithm> getHashAlgorithms() {
-        return new LinkedHashSet<>(hashAlgorithms);
-    }
-
-    public Set<CompressionAlgorithm> getCompressionAlgorithms() {
-        return new LinkedHashSet<>(compressionAlgorithms);
-    }
-
-    public static AlgorithmSuite getDefaultAlgorithmSuite() {
-        return defaultAlgorithmSuite;
-    }
-}
diff --git a/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.kt b/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.kt
new file mode 100644
index 00000000..9bb2182e
--- /dev/null
+++ b/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.kt
@@ -0,0 +1,41 @@
+package org.pgpainless.algorithm
+
+class AlgorithmSuite(
+        symmetricKeyAlgorithms: List<SymmetricKeyAlgorithm>,
+        hashAlgorithms: List<HashAlgorithm>,
+        compressionAlgorithms: List<CompressionAlgorithm>) {
+
+    val symmetricKeyAlgorithms: Set<SymmetricKeyAlgorithm> = symmetricKeyAlgorithms.toSet()
+    val hashAlgorithms: Set<HashAlgorithm> = hashAlgorithms.toSet()
+    val compressionAlgorithms: Set<CompressionAlgorithm> = compressionAlgorithms.toSet()
+
+    companion object {
+
+        @JvmStatic
+        val defaultSymmetricKeyAlgorithms = listOf(
+                SymmetricKeyAlgorithm.AES_256,
+                SymmetricKeyAlgorithm.AES_192,
+                SymmetricKeyAlgorithm.AES_128)
+
+        @JvmStatic
+        val defaultHashAlgorithms = listOf(
+                HashAlgorithm.SHA512,
+                HashAlgorithm.SHA384,
+                HashAlgorithm.SHA256,
+                HashAlgorithm.SHA224)
+
+        @JvmStatic
+        val defaultCompressionAlgorithms = listOf(
+                CompressionAlgorithm.ZLIB,
+                CompressionAlgorithm.BZIP2,
+                CompressionAlgorithm.ZIP,
+                CompressionAlgorithm.UNCOMPRESSED)
+
+        @JvmStatic
+        val defaultAlgorithmSuite = AlgorithmSuite(
+                defaultSymmetricKeyAlgorithms,
+                defaultHashAlgorithms,
+                 defaultCompressionAlgorithms)
+    }
+
+}
\ No newline at end of file