RM-3063: fix sonar warnings in unit test

Author: OlesjaAarma

cdoc2-lib/src/main/java/ee/cyber/cdoc2/container/recipients/PBKDF2Recipient.java

@@ -25,8 +25,8 @@ public class PBKDF2Recipient extends Recipient {
 
     private final byte[] encryptionSalt;
     private final byte[] passwordSalt;
-    private final byte kdfAlgorithmIdentifier = KDFAlgorithmIdentifier.PBKDF2WithHmacSHA256;
-    private final int kdfIterations = PBKDF2_ITERATIONS;
+    private final byte kdfAlgorithmIdentifier;
+    private final int kdfIterations;
 
     public PBKDF2Recipient(
         byte[] encSalt,
@@ -37,6 +37,8 @@ public PBKDF2Recipient(
         super(encFmk, recipientLabel);
         this.encryptionSalt = encSalt.clone();
         this.passwordSalt = passwordSalt;
+        this.kdfAlgorithmIdentifier = KDFAlgorithmIdentifier.PBKDF2WithHmacSHA256;
+        this.kdfIterations = PBKDF2_ITERATIONS;
     }
 
     @Override

cdoc2-lib/src/main/java/ee/cyber/cdoc2/container/recipients/Recipient.java

@@ -7,6 +7,7 @@
 import java.util.Arrays;
 import java.util.Objects;
 
+
 /**
  * Java POJO that represents flatbuffers {@link RecipientRecord header.RecipientRecord}
  * Capsule union field(s) will be implemented by subclasses.
@@ -15,11 +16,12 @@ public abstract class Recipient implements KekDerivable, SerializableFBS {
     // header.RecipientRecord specific fields
     protected final byte[] encryptedFmk;
     protected final String recipientKeyLabel;
-    protected final byte fmkEncryptionMethod = FMKEncryptionMethod.XOR;
+    protected final byte fmkEncryptionMethod;
 
     protected Recipient(byte[] encFmk, String recipientLabel) {
         this.recipientKeyLabel = recipientLabel;
         this.encryptedFmk = encFmk.clone();
+        this.fmkEncryptionMethod = FMKEncryptionMethod.XOR;
     }
 
     public String getRecipientKeyLabel() {
@@ -59,4 +61,5 @@ public int hashCode() {
         result = 31 * result + Arrays.hashCode(encryptedFmk);
         return result;
     }
+
 }

cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/EllipticCurve.java

@@ -12,11 +12,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * Curve values from {@link ee.cyber.cdoc2.fbs.recipients.EllipticCurve} defined as enum and mapped to
  * known elliptic curve names and oid's
  */
 public enum EllipticCurve {
+
     UNKNOWN(ee.cyber.cdoc2.fbs.recipients.EllipticCurve.UNKNOWN, null, null),
     SECP384R1(ee.cyber.cdoc2.fbs.recipients.EllipticCurve.secp384r1, ECKeys.SECP_384_R_1, ECKeys.SECP_384_OID);
 
@@ -31,6 +33,7 @@ public enum EllipticCurve {
         this.name = name;
         this.oid = oid;
     }
+
     public byte getValue() {
         return value;
     }
@@ -43,43 +46,34 @@ public String getOid() {
     }
 
     public boolean isValidKey(ECPublicKey key) throws GeneralSecurityException {
-        switch (this) {
-            case SECP384R1:
-                return ECKeys.isValidSecP384R1(key);
-            default:
-                throw new IllegalStateException("isValidKey not implemented for " + this);
+        if (this == EllipticCurve.SECP384R1) {
+            return ECKeys.isValidSecP384R1(key);
         }
+        throw new IllegalStateException("isValidKey not implemented for " + this);
     }
 
     public boolean isValidKeyPair(KeyPair keyPair) throws GeneralSecurityException {
-        switch (this) {
-            case SECP384R1:
-                return ECKeys.isECSecp384r1(keyPair);
-            default:
-                throw new IllegalStateException("isValidKeyPair not implemented for " + this);
+        if (this == EllipticCurve.SECP384R1) {
+            return ECKeys.isECSecp384r1(keyPair);
         }
+        throw new IllegalStateException("isValidKeyPair not implemented for " + this);
     }
 
     /**
      * Key length in bytes. For secp384r1, its 384/8=48
      */
     public int getKeyLength() {
-        switch (this) {
-            case SECP384R1:
-                return ECKeys.SECP_384_R_1_LEN_BYTES;
-            default:
-                throw new IllegalStateException("getKeyLength not implemented for " + this);
+        if (this == EllipticCurve.SECP384R1) {
+            return ECKeys.SECP_384_R_1_LEN_BYTES;
         }
+        throw new IllegalStateException("getKeyLength not implemented for " + this);
     }
 
     public ECPublicKey decodeFromTls(ByteBuffer encoded) throws GeneralSecurityException {
-        switch (this) {
-            case SECP384R1:
-                // calls also isValidSecP384R1
-                return ECKeys.decodeSecP384R1EcPublicKeyFromTls(encoded);
-            default:
-                throw new IllegalStateException("decodeFromTls not implemented for " + this);
+        if (this == EllipticCurve.SECP384R1) { // calls also isValidSecP384R1
+            return ECKeys.decodeSecP384R1EcPublicKeyFromTls(encoded);
         }
+        throw new IllegalStateException("decodeFromTls not implemented for " + this);
     }
 
     public KeyPair generateEcKeyPair() throws GeneralSecurityException {
@@ -101,17 +95,15 @@ public static EllipticCurve forOid(String oid) throws NoSuchAlgorithmException {
     }
 
     public static EllipticCurve forValue(byte value) throws NoSuchAlgorithmException {
-        switch (value) {
-            case ee.cyber.cdoc2.fbs.recipients.EllipticCurve.secp384r1:
-                return SECP384R1;
-            default:
-                throw new NoSuchAlgorithmException("Unknown EC curve value " + value);
+        if (value == ee.cyber.cdoc2.fbs.recipients.EllipticCurve.secp384r1) {
+            return SECP384R1;
         }
+        throw new NoSuchAlgorithmException("Unknown EC curve value " + value);
     }
 
     /**
      * @param publicKey ECPublicKey
-     * @return
+     * @return EllipticCurve
      * @throws NoSuchAlgorithmException      if publicKey EC curve is not supported
      * @throws InvalidParameterSpecException
      * @throws NoSuchProviderException
@@ -120,8 +112,7 @@ public static EllipticCurve forValue(byte value) throws NoSuchAlgorithmException
     public static EllipticCurve forPubKey(PublicKey publicKey) throws NoSuchAlgorithmException,
         InvalidParameterSpecException, NoSuchProviderException, InvalidKeyException {
 
-        if (publicKey instanceof ECPublicKey) {
-            ECPublicKey ecPublicKey = (ECPublicKey) publicKey;
+        if (publicKey instanceof ECPublicKey ecPublicKey) {
             return forOid(ECKeys.getCurveOid(ecPublicKey));
         } else {
             throw new InvalidKeyException("Unsupported key algorithm " + publicKey.getAlgorithm());
@@ -150,4 +141,5 @@ public static boolean isSupported(PublicKey publicKey) {
     public static String[] names() {
         return ee.cyber.cdoc2.fbs.recipients.EllipticCurve.names;
     }
+
 }

cdoc2-lib/src/test/java/ee/cyber/cdoc2/container/TarDeflateTest.java

@@ -196,17 +196,18 @@ void testMaxExtractEntries(@TempDir Path tempDir) {
 
     @Test
     void shouldValidateFileNameWhenCreatingTar(@TempDir Path tempDir) throws IOException {
-        File outputTarFile = tempDir.resolve(TGZ_FILE_NAME).toFile();
+        tempDir.resolve(TGZ_FILE_NAME).toFile();
 
         assertFalse(INVALID_FILE_NAMES.isEmpty());
 
         // should fail
         for (String fileName: INVALID_FILE_NAMES) {
             File file = createAndWriteToFile(tempDir, fileName, PAYLOAD);
             OutputStream os = new ByteArrayOutputStream();
+            List<File> files = List.of(file);
             assertThrows(
                 InvalidPathException.class,
-                () -> Tar.archiveFiles(os, List.of(file)),
+                () -> Tar.archiveFiles(os, files),
                 "File with name '" + file + "' should not be allowed in created tar"
             );
         }
@@ -282,7 +283,7 @@ void findZlibMinSize() throws IOException {
     }
 
     @Test
-    void shouldSupportLongFileName(@TempDir Path tempDir) throws IOException {
+    void shouldSupportLongFileName() throws IOException {
         byte[] data = {0x00};
         ByteArrayOutputStream destTarZ = new ByteArrayOutputStream();
 

cdoc2-lib/src/test/java/ee/cyber/cdoc2/crypto/ECKeysTest.java

@@ -291,7 +291,6 @@ void testLoadKeyPairFromPemShort() throws GeneralSecurityException, IOException
         assertTrue(KeyAlgorithm.isEcKeysAlgorithm(ecPrivKey.getAlgorithm()));
         assertEquals(expectedSecretHex, ecPrivKey.getS().toString(16));
 
-
         if (log.isDebugEnabled()) {
             log.debug("pub: {}", HexFormat.of().formatHex(ECKeys.encodeEcPubKeyForTls(ecPublicKey)));
         }