SET-544 minor refactor based on codacy findings

partior-3p · Jul 30, 2024 · 8472c7f · 8472c7f
1 parent 5cacb59
commit 8472c7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/...main/java/com/quorum/tessera/key/vault/hashicorp/HashicorpTransitSecretEngineService.java b/...main/java/com/quorum/tessera/key/vault/hashicorp/HashicorpTransitSecretEngineService.java
@@ -47,15 +47,12 @@ private boolean validateIfValueIsTobeDecryptedByTse(
 
   private boolean validateIfValueNeedsToBeEncryptedByTse(
       String transitSecretEngineName, String transitKeyName, String value) {
-    if (transitSecretEngineName != null
+    return transitSecretEngineName != null
         && !transitSecretEngineName.isEmpty()
         && transitKeyName != null
         && !transitKeyName.isEmpty()
         && value != null
-        && !value.isEmpty()) {
-      return true;
-    }
-    return false;
+        && !value.isEmpty();
   }
 
   String decryptValueIfTseRequired(Map<String, String> hashicorpGetSecretData, String value) {

diff --git a/...lt/src/test/java/com/quorum/tessera/key/vault/hashicorp/HashicorpKeyVaultServiceTest.java b/...lt/src/test/java/com/quorum/tessera/key/vault/hashicorp/HashicorpKeyVaultServiceTest.java
@@ -217,7 +217,7 @@ public void setSecretIfNullPointerExceptionThenHashicorpExceptionThrown() {
 
   @Test
   public void
-      givenTransitSecretEngineConfigurationAreAvailable_andKVDataWasEncryptedByTSE_thenKVDataAreDecryptedByTSEFirstBeforeReturningIt() {
+      givenTransitSecretEngineConfigurationAreAvailableAndKVDataWasEncryptedByTseThenKVDataAreDecryptedByTseFirstBeforeReturningIt() {
     String encryptedKeyValue = "vault:v1:encrypted value";
     String decryptedKeyValue = "decrypted data";
 
@@ -270,7 +270,7 @@ public void setSecretIfNullPointerExceptionThenHashicorpExceptionThrown() {
 
   @Test
   public void
-      givenKVDataWasEncryptedByTSE_butTransitSecretEngineConfigurationAreMissing_thenShouldThrowHashicorpVaultException() {
+      givenKVDataWasEncryptedByTseButTransitSecretEngineConfigurationAreMissingThenShouldThrowHashicorpVaultException() {
     String encryptedKeyValue = "vault:v1:encrypted value";
     String decryptedKeyValue = "decrypted data";
 
@@ -325,7 +325,7 @@ public void setSecretIfNullPointerExceptionThenHashicorpExceptionThrown() {
 
   @Test
   public void
-      givenTransitSecretEngineConfigurationAreAvailable_thenPrivateAndPublicKeyShouldBeTSEEncryptedBeforeStoredInKV() {
+      givenTransitSecretEngineConfigurationAreAvailableThenPrivateAndPublicKeyShouldBeTseEncryptedBeforeStoredInKV() {
     String plainTextPublicKey = "plain text public key";
     String plainTextPrivateKey = "plain text private key";
     String encryptedPublicKey = "encrypted public key";
@@ -397,7 +397,7 @@ public void setSecretIfNullPointerExceptionThenHashicorpExceptionThrown() {
 
   @Test
   public void
-      givenTransitSecretEngineConfigurationAreMissing_thenPrivateAndPublicKeyShouldBeStoredInKVWithoutTSEEncyption() {
+      givenTransitSecretEngineConfigurationAreMissingThenPrivateAndPublicKeyShouldBeStoredInKvWithoutTseEncyption() {
     String plainTextPublicKey = "plain text public key";
     String plainTextPrivateKey = "plain text private key";
     String encryptedPublicKey = "encrypted public key";