Sonar lint fixes

backends/credhub/src/test/java/org/cloudfoundry/credhub/handlers/DefaultCertificatesHandlerTest.java

@@ -321,7 +321,7 @@ public void handleGetAllRequest_whenUserLacksPermission_returnsEmptyList() {
       .thenReturn(emptySet());
 
     CertificateCredentialsView certificateCredentialsView = subjectWithAcls.handleGetAllRequest();
-    assertEquals(certificateCredentialsView.getCertificates().size(), 0);
+    assertEquals(0, certificateCredentialsView.getCertificates().size());
 
   }
 
@@ -723,10 +723,10 @@ public void handleRegenerate_passesOnTransitionalFlagWhenRegeneratingCertificate
     when(certificate.getName()).thenReturn("test");
     when(permissionCheckingService.hasPermission(USER, "test", PermissionOperation.WRITE))
       .thenReturn(true);
-    when(certificateService.findByCredentialUuid(eq(UUID_STRING))).thenReturn(certificate);
-    when(generationRequestGenerator.createGenerateRequest(eq(certificate)))
+    when(certificateService.findByCredentialUuid(UUID_STRING)).thenReturn(certificate);
+    when(generationRequestGenerator.createGenerateRequest(certificate))
       .thenReturn(generateRequest);
-    when(universalCredentialGenerator.generate(eq(generateRequest))).thenReturn(newValue);
+    when(universalCredentialGenerator.generate(generateRequest)).thenReturn(newValue);
     when(certificateService.save(eq(certificate), any(), any()))
       .thenReturn(mock(CertificateCredentialVersion.class));
 
@@ -764,10 +764,10 @@ public void handleRegenerate_whenAclsDisabled_doesNotCheckPermissions_andPassesO
 
     when(certificate.getName()).thenReturn("test");
 
-    when(certificateService.findByCredentialUuid(eq(UUID_STRING))).thenReturn(certificate);
-    when(generationRequestGenerator.createGenerateRequest(eq(certificate)))
+    when(certificateService.findByCredentialUuid(UUID_STRING)).thenReturn(certificate);
+    when(generationRequestGenerator.createGenerateRequest(certificate))
       .thenReturn(generateRequest);
-    when(universalCredentialGenerator.generate(eq(generateRequest))).thenReturn(newValue);
+    when(universalCredentialGenerator.generate(generateRequest)).thenReturn(newValue);
     when(certificateService.save(eq(certificate), any(), any()))
       .thenReturn(mock(CertificateCredentialVersion.class));
 
@@ -790,10 +790,10 @@ public void handleRegenerate_whenConcatenateCasisDisabled_doesNotConcatenateCas(
     when(credentialVersion.getCa()).thenReturn(TEST_CA);
     when(credentialVersion.getTrustedCa()).thenReturn(TEST_TRUSTED_CA);
 
-    when(certificateService.findByCredentialUuid(eq(UUID_STRING))).thenReturn(certificate);
-    when(generationRequestGenerator.createGenerateRequest(eq(certificate)))
+    when(certificateService.findByCredentialUuid(UUID_STRING)).thenReturn(certificate);
+    when(generationRequestGenerator.createGenerateRequest(certificate))
       .thenReturn(generateRequest);
-    when(universalCredentialGenerator.generate(eq(generateRequest))).thenReturn(newValue);
+    when(universalCredentialGenerator.generate(generateRequest)).thenReturn(newValue);
     when(certificateService.save(eq(certificate), any(), any()))
       .thenReturn(credentialVersion);
 
@@ -816,10 +816,10 @@ public void handleRegenerate_whenConcatenateCasisEnabled_ConcatenateCas() {
     when(credentialVersion.getCa()).thenReturn(TEST_CA);
     when(credentialVersion.getTrustedCa()).thenReturn(TEST_TRUSTED_CA);
 
-    when(certificateService.findByCredentialUuid(eq(UUID_STRING))).thenReturn(certificate);
-    when(generationRequestGenerator.createGenerateRequest(eq(certificate)))
+    when(certificateService.findByCredentialUuid(UUID_STRING)).thenReturn(certificate);
+    when(generationRequestGenerator.createGenerateRequest(certificate))
       .thenReturn(generateRequest);
-    when(universalCredentialGenerator.generate(eq(generateRequest))).thenReturn(newValue);
+    when(universalCredentialGenerator.generate(generateRequest)).thenReturn(newValue);
     when(certificateService.save(eq(certificate), any(), any()))
       .thenReturn(credentialVersion);
 
@@ -845,10 +845,10 @@ public void handleRegenerate_whenAllowTransitionalParentToSignIsTrue_passesValue
     when(credentialVersion.getCa()).thenReturn(TEST_CA);
     when(credentialVersion.getTrustedCa()).thenReturn(TEST_TRUSTED_CA);
 
-    when(certificateService.findByCredentialUuid(eq(UUID_STRING))).thenReturn(certificate);
-    when(generationRequestGenerator.createGenerateRequest(eq(certificate)))
+    when(certificateService.findByCredentialUuid(UUID_STRING)).thenReturn(certificate);
+    when(generationRequestGenerator.createGenerateRequest(certificate))
             .thenReturn(generateRequest);
-    when(universalCredentialGenerator.generate(eq(generateRequest))).thenReturn(newValue);
+    when(universalCredentialGenerator.generate(generateRequest)).thenReturn(newValue);
     when(certificateService.save(eq(certificate), any(), any()))
             .then(
                     invocation -> {

backends/credhub/src/test/java/org/cloudfoundry/credhub/handlers/DefaultCredentialsHandlerTest.java

@@ -166,20 +166,20 @@ public void beforeEach() {
 
   @Test
   public void deleteCredential_whenTheDeletionSucceeds_deletesTheCredential() {
-    when(credentialService.delete(eq(CREDENTIAL_NAME))).thenReturn(true);
+    when(credentialService.delete(CREDENTIAL_NAME)).thenReturn(true);
     when(permissionCheckingService.hasPermission(USER, CREDENTIAL_NAME, PermissionOperation.DELETE))
       .thenReturn(true);
 
     subjectWithAcls.deleteCredential(CREDENTIAL_NAME);
 
-    verify(credentialService, times(1)).delete(eq(CREDENTIAL_NAME));
+    verify(credentialService, times(1)).delete(CREDENTIAL_NAME);
   }
 
   @Test
   public void deleteCredential_whenTheCredentialIsNotDeleted_throwsAnException() {
     when(permissionCheckingService.hasPermission(USER, CREDENTIAL_NAME, PermissionOperation.DELETE))
       .thenReturn(true);
-    when(credentialService.delete(eq(CREDENTIAL_NAME))).thenReturn(false);
+    when(credentialService.delete(CREDENTIAL_NAME)).thenReturn(false);
 
     try {
       subjectWithAcls.deleteCredential(CREDENTIAL_NAME);
@@ -207,18 +207,18 @@ public void deleteCredential_whenTheUserLacksPermission_throwsException() {
 
   @Test
   public void deleteCredential_whenAclsDisabled_doesNotCheckPermission_andDeletesTheCredential() {
-    when(credentialService.delete(eq(CREDENTIAL_NAME))).thenReturn(true);
+    when(credentialService.delete(CREDENTIAL_NAME)).thenReturn(true);
 
     subjectWithoutAcls.deleteCredential(CREDENTIAL_NAME);
 
-    verify(credentialService, times(1)).delete(eq(CREDENTIAL_NAME));
+    verify(credentialService, times(1)).delete(CREDENTIAL_NAME);
     verify(permissionCheckingService, times(0)).hasPermission(any(), anyString(), any());
   }
 
   @Test
   public void getAllCredentialVersions_whenTheCredentialExists_returnsADataResponse() {
     final List<CredentialVersion> credentials = newArrayList(version1, version2);
-    when(credentialService.findAllByName(eq(CREDENTIAL_NAME)))
+    when(credentialService.findAllByName(CREDENTIAL_NAME))
       .thenReturn(credentials);
     when(permissionCheckingService.hasPermission(USER, CREDENTIAL_NAME, PermissionOperation.READ))
       .thenReturn(true);
@@ -235,7 +235,7 @@ public void getAllCredentialVersions_whenTheCredentialExists_returnsADataRespons
 
   @Test
   public void getAllCredentialVersions_whenTheCredentialDoesNotExist_throwsException() {
-    when(credentialService.findAllByName(eq(CREDENTIAL_NAME)))
+    when(credentialService.findAllByName(CREDENTIAL_NAME))
       .thenReturn(emptyList());
     when(permissionCheckingService.hasPermission(USER, CREDENTIAL_NAME, PermissionOperation.READ))
       .thenReturn(true);
@@ -266,7 +266,7 @@ public void getAllCredentialVersion_whenTheUserLacksPermission_throwsException()
   @Test
   public void getAllCredentialVersions_whenAclsDisabled_doesNotCheckPermission_andReturnsADataResponse() {
     final List<CredentialVersion> credentials = newArrayList(version1, version2);
-    when(credentialService.findAllByName(eq(CREDENTIAL_NAME)))
+    when(credentialService.findAllByName(CREDENTIAL_NAME))
       .thenReturn(credentials);
 
     final DataResponse credentialVersions = subjectWithoutAcls.getAllCredentialVersions(CREDENTIAL_NAME);
@@ -282,7 +282,7 @@ public void getAllCredentialVersions_whenAclsDisabled_doesNotCheckPermission_and
 
   @Test
   public void getCurrentCredentialVersion_whenTheCredentialExists_returnsDataResponse() {
-    when(credentialService.findActiveByName(eq(CREDENTIAL_NAME)))
+    when(credentialService.findActiveByName(CREDENTIAL_NAME))
       .thenReturn(Collections.singletonList(version1));
     when(permissionCheckingService.hasPermission(USER, CREDENTIAL_NAME, PermissionOperation.READ))
       .thenReturn(true);
@@ -322,7 +322,7 @@ public void getCurrentCredentialVersion_whenTheUserLacksPermission_throwsExcepti
 
   @Test
   public void getCurrentCredentialVersion_whenAclsDisabled_andWhenTheCredentialExists_doesNotCheckPermission_returnsDataResponse() {
-    when(credentialService.findActiveByName(eq(CREDENTIAL_NAME)))
+    when(credentialService.findActiveByName(CREDENTIAL_NAME))
       .thenReturn(Collections.singletonList(version1));
 
 
@@ -338,7 +338,7 @@ public void getCurrentCredentialVersion_whenAclsDisabled_andWhenTheCredentialExi
 
   @Test
   public void getCurrentCredentialVersions_whenTheCredentialExists_addsToAuditRecord() {
-    when(credentialService.findActiveByName(eq(CREDENTIAL_NAME)))
+    when(credentialService.findActiveByName(CREDENTIAL_NAME))
       .thenReturn(Collections.singletonList(version1));
 
     subjectWithoutAcls.getCurrentCredentialVersions(CREDENTIAL_NAME);

components/credentials/build.gradle

@@ -43,8 +43,8 @@ dependencies {
     implementation('org.springframework.boot:spring-boot-starter-security')
     implementation('org.springframework.boot:spring-boot-starter-validation')
     testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("junit:junit")
-
+    testImplementation('org.junit.jupiter:junit-jupiter')
+    testRuntimeOnly('org.junit.platform:junit-platform-launcher')
     implementation('com.fasterxml.jackson.module:jackson-module-kotlin')
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
@@ -93,6 +93,10 @@ test {
         exceptionFormat "full"
     }
 
+    test {
+        useJUnitPlatform {}
+    }
+
     systemProperties = System.properties
     systemProperties["spring.profiles.active"] = System.getProperty("spring.profiles.active", "unit-test-h2")
     systemProperties["java.security.egd"] = System.getProperty("java.security.egd", "file:/dev/urandom")

components/credentials/src/main/java/org/cloudfoundry/credhub/generators/CharacterRuleProvider.java

@@ -7,7 +7,7 @@
 import org.passay.CharacterRule;
 import org.passay.EnglishCharacterData;
 
-final public class CharacterRuleProvider {
+public final class CharacterRuleProvider {
 
   private CharacterRuleProvider() {
     super();

components/credentials/src/main/java/org/cloudfoundry/credhub/utils/CertificateFormatter.java

@@ -11,7 +11,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-final public class CertificateFormatter {
+public final class CertificateFormatter {
   public static final String SSH_RSA = "ssh-rsa";
 
   private CertificateFormatter() {

components/credentials/src/main/java/org/cloudfoundry/credhub/utils/UuidUtil.java

@@ -3,7 +3,7 @@
 import java.nio.ByteBuffer;
 import java.util.UUID;
 
-final public class UuidUtil {
+public final class UuidUtil {
 
   private UuidUtil() {
     super();

components/credentials/src/main/kotlin/org/cloudfoundry/credhub/requests/CertificateGenerationRequestParameters.kt

@@ -7,7 +7,13 @@ import com.google.common.net.InetAddresses
 import com.google.common.net.InternetDomainName
 import org.apache.commons.lang3.StringUtils.isEmpty
 import org.cloudfoundry.credhub.ErrorMessages
+import org.cloudfoundry.credhub.exceptions.InvalidAlternateNameCertificateException
+import org.cloudfoundry.credhub.exceptions.InvalidDurationCertificateException
+import org.cloudfoundry.credhub.exceptions.InvalidKeyLengthCertificateException
+import org.cloudfoundry.credhub.exceptions.MissingSigningCACertificateException
+import org.cloudfoundry.credhub.exceptions.NoSubjectCertificateException
 import org.cloudfoundry.credhub.exceptions.ParameterizedValidationException
+import org.cloudfoundry.credhub.exceptions.SelfSignedCACertificateException
 import java.util.Arrays
 import java.util.regex.Pattern
 
@@ -86,21 +92,25 @@ class CertificateGenerationRequestParameters {
             isEmpty(commonName) &&
             isEmpty(country)
         ) {
-            throw ParameterizedValidationException(ErrorMessages.MISSING_CERTIFICATE_PARAMETERS)
-        } else if (isEmpty(caName) && !selfSigned && !isCa) {
-            throw ParameterizedValidationException(ErrorMessages.MISSING_SIGNING_CA)
-        } else if (!isEmpty(caName) && selfSigned) {
-            throw ParameterizedValidationException(ErrorMessages.CA_AND_SELF_SIGN)
+            throw NoSubjectCertificateException()
+        }
+
+        if (isEmpty(caName) && !selfSigned && !isCa) {
+            throw MissingSigningCACertificateException()
+        }
+
+        if (!isEmpty(caName) && selfSigned) {
+            throw SelfSignedCACertificateException()
         }
 
         if (!validKeyLengths.contains(keyLength)) {
-            throw ParameterizedValidationException(ErrorMessages.INVALID_KEY_LENGTH)
+            throw InvalidKeyLengthCertificateException()
         }
 
         if (alternativeNames != null) {
             for (name in alternativeNames!!) {
                 if (!InetAddresses.isInetAddress(name) && !(InternetDomainName.isValid(name) || DNS_WILDCARD_PATTERN.matcher(name).matches())) {
-                    throw ParameterizedValidationException(ErrorMessages.INVALID_ALTERNATE_NAME)
+                    throw InvalidAlternateNameCertificateException()
                 }
             }
         }
@@ -128,7 +138,7 @@ class CertificateGenerationRequestParameters {
         }
 
         if (duration < ONE_DAY || duration > TEN_YEARS) {
-            throw ParameterizedValidationException(ErrorMessages.INVALID_DURATION)
+            throw InvalidDurationCertificateException()
         }
 
         validateParameterLength(commonName, "common name", 64)

components/credentials/src/test/java/org/cloudfoundry/credhub/credential/UserCredentialValueTest.java

@@ -1,14 +1,11 @@
 package org.cloudfoundry.credhub.credential;
 
 import org.cloudfoundry.credhub.CryptSaltFactory;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 
-@RunWith(JUnit4.class)
 public class UserCredentialValueTest {
   @Test
   public void getSalt_returnsAConsistentSalt() {

components/credentials/src/test/java/org/cloudfoundry/credhub/domain/CertificateCredentialVersionTest.java

@@ -5,10 +5,8 @@
 import org.cloudfoundry.credhub.TestHelper;
 import org.cloudfoundry.credhub.entities.EncryptedValue;
 import org.cloudfoundry.credhub.entity.CertificateCredentialVersionData;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.cloudfoundry.credhub.utils.CertificateStringConstants.PRIVATE_KEY;
@@ -20,7 +18,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(JUnit4.class)
 public class CertificateCredentialVersionTest {
 
   private CertificateCredentialVersion subject;
@@ -32,7 +29,7 @@ public class CertificateCredentialVersionTest {
   private byte[] encryptedValue;
   private byte[] nonce;
 
-  @Before
+  @BeforeEach
   public void setup() {
     TestHelper.getBouncyCastleFipsProvider();
     encryptor = mock(Encryptor.class);

components/credentials/src/test/java/org/cloudfoundry/credhub/domain/CertificateGenerationParametersTest.java

@@ -1,14 +1,11 @@
 package org.cloudfoundry.credhub.domain;
 
 import org.cloudfoundry.credhub.requests.CertificateGenerationRequestParameters;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 
-@RunWith(JUnit4.class)
 public class CertificateGenerationParametersTest {
 
   @Test

components/credentials/src/test/java/org/cloudfoundry/credhub/domain/CredentialFactoryTest.java

@@ -19,11 +19,9 @@
 import org.cloudfoundry.credhub.utils.BouncyCastleFipsConfigurer;
 import org.cloudfoundry.credhub.utils.JsonObjectMapper;
 import org.hamcrest.MatcherAssert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.cloudfoundry.credhub.utils.CertificateStringConstants.SELF_SIGNED_CA_CERT;
@@ -34,7 +32,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(JUnit4.class)
 public class CredentialFactoryTest {
 
   private static final String CREDENTIAL_NAME = "/test";
@@ -56,12 +53,12 @@ public class CredentialFactoryTest {
   private JsonObjectMapper objectMapper;
   private StringGenerationParameters generationParameters;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpAll() {
     BouncyCastleFipsConfigurer.configure();
   }
 
-  @Before
+  @BeforeEach
   public void setup() throws JsonProcessingException {
 
     if (Security.getProvider(BouncyCastleFipsProvider.PROVIDER_NAME) == null) {