SET-559 codacy findings fixes

partior-3p · Aug 23, 2024 · 781fa5b · 781fa5b
1 parent 6293a2f
commit 781fa5b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/config/src/main/java/com/quorum/tessera/config/HashicorpVaultDbCredentialsConfig.java b/config/src/main/java/com/quorum/tessera/config/HashicorpVaultDbCredentialsConfig.java
@@ -45,7 +45,7 @@ public class HashicorpVaultDbCredentialsConfig extends ConfigItem {
   @Valid @XmlElement private String delayBeforeNextRunFactor;
   @Valid @XmlElement private String maxDurationBeforeTtlExpireInSeconds;
 
-  public HashicorpVaultDbCredentialsConfig(HashicorpVaultDbCredentialsConfig config){
+  public HashicorpVaultDbCredentialsConfig(HashicorpVaultDbCredentialsConfig config) {
     this.url = config.url;
     this.namespace = config.namespace;
     this.approlePath = config.approlePath;
@@ -190,7 +190,8 @@ public DefaultKeyVaultConfig toKeyVaultConfig() {
     config.setProperty("maxRetryDelayInSeconds", this.getMaxRetryDelayInSeconds());
     config.setProperty("minDelayBeforeNextRunInSeconds", this.getMinDelayBeforeNextRunInSeconds());
     config.setProperty("delayBeforeNextRunFactor", this.getDelayBeforeNextRunFactor());
-    config.setProperty("maxDurationBeforeTtlExpireInSeconds", this.getMaxDurationBeforeTtlExpireInSeconds());
+    config.setProperty(
+        "maxDurationBeforeTtlExpireInSeconds", this.getMaxDurationBeforeTtlExpireInSeconds());
 
     Optional.ofNullable(this.getTlsKeyStorePath())
         .map(Objects::toString)

diff --git a/.../main/java/com/quorum/tessera/key/vault/hashicorp/HashicorpDbCredentialsVaultService.java b/.../main/java/com/quorum/tessera/key/vault/hashicorp/HashicorpDbCredentialsVaultService.java
@@ -52,8 +52,8 @@ public HashicorpDbCredentials getDbCredentials() {
           vaultOperations.read(
               String.format("%s/%s/%s", dbSecretEngineName, credentialPath, vaultDbRole));
     } catch (Exception ex) {
-      throw new RuntimeException(
-          "Unexpected error reading db credentials from hashicorp vault", ex);
+      throw new ConfigException(
+          new RuntimeException("Unexpected error reading db credentials from hashicorp vault", ex));
     }
 
     if (response != null) {

diff --git a/...ava/com/quorum/tessera/key/vault/hashicorp/HashicorpDbCredentialsVaultServiceFactory.java b/...ava/com/quorum/tessera/key/vault/hashicorp/HashicorpDbCredentialsVaultServiceFactory.java
@@ -1,6 +1,7 @@
 package com.quorum.tessera.key.vault.hashicorp;
 
 import com.quorum.tessera.config.Config;
+import com.quorum.tessera.config.ConfigException;
 import com.quorum.tessera.config.KeyVaultConfig;
 import com.quorum.tessera.config.KeyVaultType;
 import com.quorum.tessera.config.util.EnvironmentVariableProvider;
@@ -51,10 +52,11 @@ void validateRequiredConfigurationPropertiesArePresent(KeyVaultConfig keyVaultCo
                         || keyVaultConfig.getProperty(propName).isEmpty())
             .toList();
     if (!missingProperties.isEmpty()) {
-      throw new HashicorpVaultException(
-          String.format(
-              "[%s] missing in the configuration. This/these properties should be defined in configuration section: jdbc.hashicorpVaultDbCredentialsConfig",
-              String.join(", ", missingProperties)));
+      throw new ConfigException(
+          new RuntimeException(
+              String.format(
+                  "[%s] missing in the configuration. This/these properties should be defined in configuration section: jdbc.hashicorpVaultDbCredentialsConfig",
+                  String.join(", ", missingProperties))));
     }
   }
 

diff --git a/...ta/src/main/java/com/quorum/tessera/data/internal/DbCredentialsVaultLifecycleManager.java b/...ta/src/main/java/com/quorum/tessera/data/internal/DbCredentialsVaultLifecycleManager.java
@@ -182,14 +182,20 @@ private <R> R validateAndConvertValue(
     return defaultValue;
   }
 
-  private void logStartupConfiguration(){
+  private void logStartupConfiguration() {
     StringBuilder sb = new StringBuilder();
     sb.append("retryDelayInSeconds=").append(this.retryDelayInSeconds).append("; ");
     sb.append("maxRetryDelayInSeconds=").append(this.maxRetryDelayInSeconds).append("; ");
-    sb.append("minDelayBeforeNextRunInSeconds=").append(this.minDelayBeforeNextRunInSeconds).append("; ");
+    sb.append("minDelayBeforeNextRunInSeconds=")
+        .append(this.minDelayBeforeNextRunInSeconds)
+        .append("; ");
     sb.append("delayBeforeNextRunFactor=").append(this.delayBeforeNextRunFactor).append("; ");
-    sb.append("maxDurationBeforeTtlExpireInSeconds=").append(this.maxDurationBeforeTtlExpireInSeconds).append("; ");
-    LOGGER.info("Component for managing life-cycle of db credentials in vault started with configurations: {}", sb.toString());
+    sb.append("maxDurationBeforeTtlExpireInSeconds=")
+        .append(this.maxDurationBeforeTtlExpireInSeconds)
+        .append("; ");
+    LOGGER.info(
+        "Component for managing life-cycle of db credentials in vault started with configurations: {}",
+        sb.toString());
   }
 
   public void start(final long initialDelayInSeconds) {