RM-3669: Fix SonarQube found issues (#4)

RM-3669: Fix SonarQube found issues
open-eid · Sep 2, 2024 · f0a81dc · f0a81dc
1 parent 8ad6d2c
commit f0a81dc
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/get-server/src/main/java/ee/cyber/cdoc2/server/ClientAuthCertRevocationCustomizer.java b/get-server/src/main/java/ee/cyber/cdoc2/server/ClientAuthCertRevocationCustomizer.java
@@ -20,7 +20,7 @@ public class ClientAuthCertRevocationCustomizer implements TomcatConnectorCustom
     private boolean revocationCheckEnabled;
 
     @Override
-    @SuppressWarnings("LineLength")
+    @SuppressWarnings({"LineLength", "java:S125"})
     public void customize(Connector connector) {
         //https://docs.oracle.com/en/java/javase/17/security/java-pki-programmers-guide.html#GUID-650D0D53-B617-4055-AFD3-AF5C2629CBBF
         // run with -Djava.security.debug="certpath" to produce detailed log

diff --git a/get-server/src/test/java/ee/cyber/cdoc2/server/GetKeyCapsuleApiTests.java b/get-server/src/test/java/ee/cyber/cdoc2/server/GetKeyCapsuleApiTests.java
@@ -267,6 +267,7 @@ void testPKCS11Client() throws Exception {
         var protectionParameter = new KeyStore.PasswordProtection(PKCS11_CONF.pin());
 
         //Or ask pin interactively
+        @SuppressWarnings("java:S125")
         //KeyStore.ProtectionParameter protectionParameter = getKeyStoreCallbackProtectionParameter("PIN1");
 
         KeyStore clientKeyStore = null;

diff --git a/server-common/src/main/java/ee/cyber/cdoc2/server/ExpiredCapsuleCleanUpJob.java b/server-common/src/main/java/ee/cyber/cdoc2/server/ExpiredCapsuleCleanUpJob.java
@@ -14,6 +14,7 @@
 import org.springframework.stereotype.Component;
 
 import ee.cyber.cdoc2.server.config.DbConnectionConfigProperties;
+import ee.cyber.cdoc2.server.exeptions.JobFailureException;
 
 
 /**
@@ -50,7 +51,7 @@ public void cleanUpExpiredCapsules() {
         } catch (SQLException e) {
             String errorMsg = "Expired key capsules deletion has failed";
             log.error(errorMsg);
-            throw new RuntimeException(errorMsg, e);
+            throw new JobFailureException(errorMsg, e);
         }
     }
 
@@ -64,7 +65,7 @@ private Connection createDbConnection() {
         } catch (SQLException e) {
             String errorMsg = "Failed to establish database connection";
             log.error(errorMsg);
-            throw new RuntimeException(errorMsg, e);
+            throw new JobFailureException(errorMsg, e);
         }
     }
 

diff --git a/server-common/src/main/java/ee/cyber/cdoc2/server/config/SecurityConfiguration.java b/server-common/src/main/java/ee/cyber/cdoc2/server/config/SecurityConfiguration.java
@@ -23,6 +23,7 @@
 @Configuration
 @EnableWebSecurity
 @RequiredArgsConstructor
+@SuppressWarnings("java:S4502")
 public class SecurityConfiguration {
 
     private final ConfigProperties credentials;

diff --git a/server-common/src/main/java/ee/cyber/cdoc2/server/exeptions/JobFailureException.java b/server-common/src/main/java/ee/cyber/cdoc2/server/exeptions/JobFailureException.java
@@ -0,0 +1,18 @@
+package ee.cyber.cdoc2.server.exeptions;
+
+
+/**
+ * Thrown when scheduled job execution has failed.
+ */
+public class JobFailureException extends RuntimeException {
+
+    /**
+     * Error message constructor
+     * @param message error message text
+     * @param exception thrown exception
+     */
+    public JobFailureException(String message, Throwable exception) {
+        super(message, exception);
+    }
+
+}