RM-3063: fix sonar warnings in unit tests, suppress where required

Author: OlesjaAarma

cdoc2-example-app/src/main/java/ee/cyber/cdoc2/converter/ConverterCmd.java

@@ -17,8 +17,8 @@
 import java.util.Arrays;
 import java.util.concurrent.Callable;
 
-@Command( name = "cdoc-convert"
-)
+@Command( name = "cdoc-convert")
+@SuppressWarnings("squid:S106")
 public class ConverterCmd implements Callable<Void> {
 
     private static final Logger log = LoggerFactory.getLogger(ConverterCmd.class);
@@ -48,8 +48,6 @@ public class ConverterCmd implements Callable<Void> {
     @Option(names = { "-h", "--help" }, usageHelp = false, description = "display a help message")
     private boolean helpRequested = false;
 
-
-
     public static void main(String... args) {
 
         if (args.length == 0) {
@@ -61,7 +59,6 @@ public static void main(String... args) {
         System.exit(exitCode);
     }
 
-
     @Override
     public Void call() throws Exception {
 

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

@@ -60,7 +60,9 @@ public static byte[] deriveKekForSymmetricKey(
             secretKey,
             recipient.getSalt(),
             FMKEncryptionMethod.name(recipient.getFmkEncryptionMethod()));
-        log.debug("kek={}", HexFormat.of().formatHex(kek.getEncoded()));
+        if (log.isDebugEnabled()) {
+            log.debug("kek={}", HexFormat.of().formatHex(kek.getEncoded()));
+        }
         return kek.getEncoded();
     }
 

cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/keymaterial/encrypt/EncryptionKeyMaterialCollectionBuilder.java

@@ -94,7 +94,7 @@ public EncryptionKeyMaterialCollectionBuilder fromEId(String[] identificationCod
         List<EncryptionKeyMaterial> keyMaterials = certData.stream()
             .filter(entry -> EllipticCurve.isSupported(entry.getPublicKey()))
             .map(SkLdapUtil::toEncryptionKeyMaterial)
-            .collect(Collectors.toList());
+            .toList();
 
         recipients.addAll(keyMaterials);
         return this;

cdoc2-lib/src/main/java/ee/cyber/cdoc2/util/OperatingSystem.java

@@ -18,7 +18,9 @@ public enum OperatingSystem {
      * @return the operating system
      */
     public static OperatingSystem getOS() {
-        log.debug("os.family: {}, os.name: {}", System.getProperty("os.family"), System.getProperty(OS_NAME));
+        if (log.isDebugEnabled()) {
+            log.debug("os.family: {}, os.name: {}", System.getProperty("os.family"), System.getProperty(OS_NAME));
+        }
         String os = System.getProperty(OS_NAME).toLowerCase();
 
         if (os.contains("win")) {
@@ -31,9 +33,11 @@ public static OperatingSystem getOS() {
             return OperatingSystem.MAC;
         }
 
-        log.error("Unknown operating system: os.family: {}, os.name: {}",
-            System.getProperty("os.family"), System.getProperty(OS_NAME)
-        );
+        if (log.isErrorEnabled()) {
+            log.error("Unknown operating system: os.family: {}, os.name: {}",
+                System.getProperty("os.family"), System.getProperty(OS_NAME)
+            );
+        }
         throw new IllegalStateException("Unknown OS");
     }
 }

cdoc2-lib/src/main/java/ee/cyber/cdoc2/util/SkLdapUtil.java

@@ -59,6 +59,7 @@ private SkLdapUtil() {
     // distinguished name fragment for authentication certificates using e-resident digi-id
     private static final String AUTH_E_RESIDENT_DIGI_ID = AUTH_CERT_PART + E_RESIDENT_DIGI_ID;
 
+    @SuppressWarnings("java:S1149")
     private static DirContext initDirContext() throws NamingException {
         Hashtable<String, Object> env = new Hashtable<>(11);
         env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");

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

@@ -171,16 +171,13 @@ static byte[] createTarWithExtraData() throws IOException {
 
         log.debug("Compressed {} into {}", randomBytes.length, destTarZlib.size());
 
-        // Tar is able to process empty tar without exceptions
-        //assertTrue(Tar.listFiles(new ByteArrayInputStream(destTarZlib.toByteArray())).isEmpty());
         return destTarZlib.toByteArray();
     }
 
     static byte[] createTarWithIllegalFileType() throws IOException {
 
         String validFileName = "validFile";
         byte[] data = new byte[10 * 1024];
-        //new Random().nextBytes(data);
 
         ByteArrayOutputStream dest = new ByteArrayOutputStream();
 

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

@@ -132,13 +132,11 @@ void testArchiveData(@TempDir Path tempDir) throws IOException {
     void testTarGzBomb(@TempDir Path tempDir) throws IOException {
         byte[] zeros = new byte[1024]; //1KB
 
+        // can multiply with 1024 ones more for 1GM size
         long bigFileSize = 1024 //1KB
                 * 1024; //1MB
-                //*1024 //1GB
-                //;
 
         Path bombPath =  tempDir.resolve("bomb.tgz");
-        //bombPath.toFile().deleteOnExit();
 
         try (TarArchiveOutputStream tarOs = new TarArchiveOutputStream(new DeflateCompressorOutputStream(
                 new BufferedOutputStream(Files.newOutputStream(bombPath))))) {
@@ -161,14 +159,14 @@ void testTarGzBomb(@TempDir Path tempDir) throws IOException {
             tarOs.closeArchiveEntry();
         }
 
-
         Path outDir = tempDir.resolve("testTarGzBomb");
         Files.createDirectories(outDir);
 
         log.debug("Extracting {} to {}", bombPath, outDir);
-        Exception exception = assertThrows(IllegalStateException.class, () -> {
 
-            try (TarDeflate tar = new TarDeflate(Files.newInputStream(bombPath))) {
+        InputStream inputStream = Files.newInputStream(bombPath);
+        Exception exception = assertThrows(IllegalStateException.class, () -> {
+            try (TarDeflate tar = new TarDeflate(inputStream)) {
                 tar.extractToDir(outDir);
             }
         });
@@ -243,7 +241,7 @@ void shouldValidateFileNameWhenExtractingTar(@TempDir Path tempDir) throws IOExc
             File file = createTar(tempDir, TGZ_FILE_NAME + '.' + i++, fileName, PAYLOAD);
             var result = new TarDeflate(new FileInputStream(file))
                 .extractFilesToDir(List.of(fileName), tempDir);
-            assertTrue(result.size() == 1);
+            assertEquals(1, result.size());
         }
     }
 

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

@@ -70,12 +70,14 @@ void testEcPubKeyEncodeDecode() throws GeneralSecurityException {
     void testLoadEcPrivKey() throws GeneralSecurityException, IOException {
         @SuppressWarnings("checkstyle:OperatorWrap")
         String privKeyPem =
-                "-----BEGIN EC PRIVATE KEY-----\n" +
-                        "MIGkAgEBBDBh1UAT832Nh2ZXvdc5JbNv3BcEZSYk90esUkSPFmg2XEuoA7avS/kd\n" +
-                        "4HtHGRbRRbagBwYFK4EEACKhZANiAASERl1rD+bm2aoiuGicY8obRkcs+jt8ks4j\n" +
-                        "C1jD/f/EQ8KdFYrJ+KwnM6R8rIXqDnUnLJFiF3OzDpu8TUjVOvdXgzQL+n67QiLd\n" +
-                        "yerTE6f5ujIXoXNkZB8O2kX/3vADuDA=\n" +
-                        "-----END EC PRIVATE KEY-----\n";
+            """
+                -----BEGIN EC PRIVATE KEY-----
+                MIGkAgEBBDBh1UAT832Nh2ZXvdc5JbNv3BcEZSYk90esUkSPFmg2XEuoA7avS/kd
+                4HtHGRbRRbagBwYFK4EEACKhZANiAASERl1rD+bm2aoiuGicY8obRkcs+jt8ks4j
+                C1jD/f/EQ8KdFYrJ+KwnM6R8rIXqDnUnLJFiF3OzDpu8TUjVOvdXgzQL+n67QiLd
+                yerTE6f5ujIXoXNkZB8O2kX/3vADuDA=
+                -----END EC PRIVATE KEY-----
+                """;
 
         //        openssl ec -in key.pem -text -noout
         //        read EC key
@@ -283,12 +285,16 @@ void testLoadKeyPairFromPemShort() throws GeneralSecurityException, IOException
         ECPrivateKey ecPrivKey = (ECPrivateKey) keyPair.getPrivate();
         ECPublicKey ecPublicKey = (ECPublicKey) keyPair.getPublic();
 
-        //log.debug("key: {}", ecPrivKey.getS().toString(16));
+        if (log.isDebugEnabled()) {
+            log.debug("key: {}", ecPrivKey.getS().toString(16));
+        }
         assertTrue(KeyAlgorithm.isEcKeysAlgorithm(ecPrivKey.getAlgorithm()));
         assertEquals(expectedSecretHex, ecPrivKey.getS().toString(16));
 
 
-        //log.debug("pub: {}", HexFormat.of().formatHex(ECKeys.encodeEcPubKeyForTls(ecPublicKey)));
+        if (log.isDebugEnabled()) {
+            log.debug("pub: {}", HexFormat.of().formatHex(ECKeys.encodeEcPubKeyForTls(ecPublicKey)));
+        }
         assertTrue(KeyAlgorithm.isEcKeysAlgorithm(ecPublicKey.getAlgorithm()));
         assertEquals(expectedPubHex, HexFormat.of().formatHex(ECKeys.encodeEcPubKeyForTls(ecPublicKey)));
     }

cdoc2-schema/src/test/java/ee/cyber/cdoc2/fbs/header/FbsHeaderTest.java

@@ -9,18 +9,19 @@
 
 import com.google.flatbuffers.FlatBufferBuilder;
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 import static ee.cyber.cdoc2.fbs.header.Capsule.recipients_KeyServerCapsule;
 
+
 class FbsHeaderTest {
 
     public static final int KEYLEN_BYTES = 256 / 8;
 
     @Test
-    void testFbsHeaderSerialization() throws IOException {
+    @SuppressWarnings("java:S125")
+    void testFbsHeaderSerialization() {
 
         byte payloadEnc = PayloadEncryptionMethod.CHACHA20POLY1305;