From fedf7c0cf889ecf950b5c2d6ca40a5f07aa282bf Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 13 Sep 2021 19:39:42 +0200 Subject: [PATCH] Make AlgorithmSuite members final and remove setters --- .../pgpainless/algorithm/AlgorithmSuite.java | 46 +----------- .../algorithm/AlgorithmSuiteTest.java | 73 ------------------- 2 files changed, 3 insertions(+), 116 deletions(-) delete mode 100644 pgpainless-core/src/test/java/org/pgpainless/algorithm/AlgorithmSuiteTest.java diff --git a/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java b/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java index 17445df5..487ffad4 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java +++ b/pgpainless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java @@ -15,7 +15,6 @@ */ package org.pgpainless.algorithm; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashSet; @@ -45,9 +44,9 @@ public class AlgorithmSuite { CompressionAlgorithm.UNCOMPRESSED) ); - private Set symmetricKeyAlgorithms; - private Set hashAlgorithms; - private Set compressionAlgorithms; + private final Set symmetricKeyAlgorithms; + private final Set hashAlgorithms; + private final Set compressionAlgorithms; public AlgorithmSuite(List symmetricKeyAlgorithms, List hashAlgorithms, @@ -57,57 +56,18 @@ public class AlgorithmSuite { this.compressionAlgorithms = Collections.unmodifiableSet(new LinkedHashSet<>(compressionAlgorithms)); } - public void setSymmetricKeyAlgorithms(List symmetricKeyAlgorithms) { - this.symmetricKeyAlgorithms = Collections.unmodifiableSet(new LinkedHashSet<>(symmetricKeyAlgorithms)); - } - public Set getSymmetricKeyAlgorithms() { return new LinkedHashSet<>(symmetricKeyAlgorithms); } - public int[] getSymmetricKeyAlgorithmIds() { - int[] array = new int[symmetricKeyAlgorithms.size()]; - List list = new ArrayList<>(getSymmetricKeyAlgorithms()); - for (int i = 0; i < array.length; i++) { - array[i] = list.get(i).getAlgorithmId(); - } - return array; - } - - public void setHashAlgorithms(List hashAlgorithms) { - this.hashAlgorithms = Collections.unmodifiableSet(new LinkedHashSet<>(hashAlgorithms)); - } - public Set getHashAlgorithms() { return new LinkedHashSet<>(hashAlgorithms); } - public int[] getHashAlgorithmIds() { - int[] array = new int[hashAlgorithms.size()]; - List list = new ArrayList<>(getHashAlgorithms()); - for (int i = 0; i < array.length; i++) { - array[i] = list.get(i).getAlgorithmId(); - } - return array; - } - - public void setCompressionAlgorithms(List compressionAlgorithms) { - this.compressionAlgorithms = Collections.unmodifiableSet(new LinkedHashSet<>(compressionAlgorithms)); - } - public Set getCompressionAlgorithms() { return new LinkedHashSet<>(compressionAlgorithms); } - public int[] getCompressionAlgorithmIds() { - int[] array = new int[compressionAlgorithms.size()]; - List list = new ArrayList<>(getCompressionAlgorithms()); - for (int i = 0; i < array.length; i++) { - array[i] = list.get(i).getAlgorithmId(); - } - return array; - } - public static AlgorithmSuite getDefaultAlgorithmSuite() { return defaultAlgorithmSuite; } diff --git a/pgpainless-core/src/test/java/org/pgpainless/algorithm/AlgorithmSuiteTest.java b/pgpainless-core/src/test/java/org/pgpainless/algorithm/AlgorithmSuiteTest.java deleted file mode 100644 index 89ac5a2a..00000000 --- a/pgpainless-core/src/test/java/org/pgpainless/algorithm/AlgorithmSuiteTest.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2021 Paul Schaub. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.pgpainless.algorithm; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -public class AlgorithmSuiteTest { - - private AlgorithmSuite suite; - - @BeforeEach - public void resetEmptyAlgorithmSuite() { - suite = new AlgorithmSuite( - Collections.emptyList(), - Collections.emptyList(), - Collections.emptyList() - ); - } - - @Test - public void setSymmetricAlgorithmsTest() { - List algorithmList = Arrays.asList( - SymmetricKeyAlgorithm.AES_128, SymmetricKeyAlgorithm.AES_192, SymmetricKeyAlgorithm.AES_256 - ); - - suite.setSymmetricKeyAlgorithms(algorithmList); - - assertEquals(algorithmList, new ArrayList<>(suite.getSymmetricKeyAlgorithms())); - } - - @Test - public void setHashAlgorithmsTest() { - List algorithmList = Arrays.asList( - HashAlgorithm.SHA256, HashAlgorithm.SHA384, HashAlgorithm.SHA512 - ); - - suite.setHashAlgorithms(algorithmList); - - assertEquals(algorithmList, new ArrayList<>(suite.getHashAlgorithms())); - } - - @Test - public void setCompressionAlgorithmsTest() { - List algorithmList = Arrays.asList( - CompressionAlgorithm.ZLIB, CompressionAlgorithm.ZIP, CompressionAlgorithm.BZIP2 - ); - - suite.setCompressionAlgorithms(algorithmList); - - assertEquals(algorithmList, new ArrayList<>(suite.getCompressionAlgorithms())); - } -}