4 files changed, 53 insertions, 49 deletions

diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java
index 10a7ba46..1c021b43 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java
@@ -54,13 +54,13 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldNotThrowExceptionWhenServerConfigurationIsValid() {
+    void shouldNotThrowExceptionWhenServerConfigurationIsValid() {
         // Then
         assertDoesNotThrow(() -> validator.validate(server));
     }
 
     @Test
-    public void shouldThrowExceptionWhenWrongProtocolInURL() {
+    void shouldThrowExceptionWhenWrongProtocolInUrl() {
         // Given
         server.setUrl("https://test.test.test:60000/");
 
@@ -69,7 +69,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenWrongPortInURL() {
+    void shouldThrowExceptionWhenWrongPortInUrl() {
         // Given
         server.setUrl("http://test.test.test:70000/");
 
@@ -78,7 +78,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenWrongCANameLength() {
+    void shouldThrowExceptionWhenWrongCaNameLength() {
         // Given
         server.setCaName(EMPTY_STRING);
 
@@ -87,7 +87,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenWrongRVLength() {
+    void shouldThrowExceptionWhenWrongRvLength() {
         // Given
         authentication.setRv(EMPTY_STRING);
 
@@ -97,7 +97,7 @@ class Cmpv2ServerConfigurationValidatorTest {
 
 
     @Test
-    public void shouldThrowExceptionWhenWrongIAKLength() {
+    void shouldThrowExceptionWhenWrongIakLength() {
         // Given
         authentication.setIak(EMPTY_STRING);
 
@@ -106,7 +106,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenCaNameIsNull() {
+    void shouldThrowExceptionWhenCaNameIsNull() {
         // Given
         server.setCaName(null);
 
@@ -115,7 +115,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenIssuerDnIsNull() {
+    void shouldThrowExceptionWhenIssuerDnIsNull() {
         // Given
         server.setIssuerDN(null);
 
@@ -124,7 +124,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenCaModeIsNull() {
+    void shouldThrowExceptionWhenCaModeIsNull() {
         // Given
         server.setCaMode(null);
 
@@ -133,7 +133,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenUrlIsNull() {
+    void shouldThrowExceptionWhenUrlIsNull() {
         // Given
         server.setUrl(null);
 
@@ -142,7 +142,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenAuthenticationIsNull() {
+    void shouldThrowExceptionWhenAuthenticationIsNull() {
         // Given
         server.setAuthentication(null);
 
@@ -151,7 +151,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenIakIsNull() {
+    void shouldThrowExceptionWhenIakIsNull() {
         // Given
         authentication.setIak(null);
 
@@ -160,7 +160,7 @@ class Cmpv2ServerConfigurationValidatorTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenRvIsNull() {
+    void shouldThrowExceptionWhenRvIsNull() {
         // Given
         authentication.setRv(null);
 
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2URLValidatorTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java
index 78368d8a..7082626f 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2URLValidatorTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java
@@ -23,33 +23,35 @@ package org.onap.aaf.certservice.certification.configuration.validation.constrai
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-class Cmpv2URLValidatorTest {
 
-    private final Cmpv2URLValidator validator = new Cmpv2URLValidator();
+class Cmpv2UrlValidatorTest {
+
+    private final Cmpv2UrlValidator validator = new Cmpv2UrlValidator();
 
     @Test
-    public void givenCorrectURLWhenValidatingShouldReturnTrue() {
+    void givenCorrectUrlWhenValidatingShouldReturnTrue() {
         //given
-        String URL = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
+        String url = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
 
         //when
-        boolean result = validator.isValid(URL, null);
+        boolean result = validator.isValid(url, null);
 
         //then
         assertTrue(result);
     }
 
     @Test
-    public void givenIncorrectURLWhenValidatingShouldReturnFalse() {
+    void givenIncorrectUrlWhenValidatingShouldReturnFalse() {
         //given
-        String URL = "httttp://127.0.0.1:80000/ejbca/publicweb/cmp/cmp";
+        String url = "httttp://127.0.0.1:80000/ejbca/publicweb/cmp/cmp";
 
         //when
-        boolean result = validator.isValid(URL, null);
+        boolean result = validator.isValid(url, null);
 
         //then
         assertFalse(result);
     }
-}
\ No newline at end of file
+}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java
index d1850473..e729c738 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java
@@ -18,28 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-
 package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class PortNumberViolationTest {
 
     private final PortNumberViolation violation = new PortNumberViolation();
 
     @Test
-    public void givenValidPortShouldReturnTrue() {
+    void givenValidPortShouldReturnTrue() {
         //given
-        String validURL1 = "http://127.0.0.1:8080/ejbca/publicweb/cmp/cmp";
-        String validURL2 = "http://127.0.0.1:1/ejbca/publicweb/cmp/cmp";
-        String validURL3 = "http://127.0.0.1:65535/ejbca/publicweb/cmp/cmp";
+        String validUrl1 = "http://127.0.0.1:8080/ejbca/publicweb/cmp/cmp";
+        String validUrl2 = "http://127.0.0.1:1/ejbca/publicweb/cmp/cmp";
+        String validUrl3 = "http://127.0.0.1:65535/ejbca/publicweb/cmp/cmp";
 
         //when
-        boolean result1 = violation.validate(validURL1);
-        boolean result2 = violation.validate(validURL2);
-        boolean result3 = violation.validate(validURL3);
+        boolean result1 = violation.validate(validUrl1);
+        boolean result2 = violation.validate(validUrl2);
+        boolean result3 = violation.validate(validUrl3);
 
         //then
         assertTrue(result1);
@@ -48,29 +48,29 @@ class PortNumberViolationTest {
     }
 
     @Test
-    public void givenEmptyPortShouldReturnTrue() {
+    void givenEmptyPortShouldReturnTrue() {
         //given
-        String validURL = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
+        String validUrl = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
 
         //when
-        boolean result = violation.validate(validURL);
+        boolean result = violation.validate(validUrl);
 
         //then
         assertTrue(result);
     }
 
     @Test
-    public void givenInvalidPortShouldReturnFalse() {
+    void givenInvalidPortShouldReturnFalse() {
         //given
-        String invalidURL1 = "http://127.0.0.1:0/ejbca/publicweb/cmp/cmp";
-        String invalidURL2 = "http://127.0.0.1:65536/ejbca/publicweb/cmp/cmp";
+        String invalidUrl1 = "http://127.0.0.1:0/ejbca/publicweb/cmp/cmp";
+        String invalidUrl2 = "http://127.0.0.1:65536/ejbca/publicweb/cmp/cmp";
 
         //when
-        boolean result1 = violation.validate(invalidURL1);
-        boolean result2 = violation.validate(invalidURL2);
+        boolean result1 = violation.validate(invalidUrl1);
+        boolean result2 = violation.validate(invalidUrl2);
 
         //then
         assertFalse(result1);
         assertFalse(result2);
     }
-}
\ No newline at end of file
+}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java
index cba2f340..dce66d52 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java
@@ -22,33 +22,35 @@ package org.onap.aaf.certservice.certification.configuration.validation.constrai
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 class RequestTypeViolationTest {
 
     private final RequestTypeViolation violation = new RequestTypeViolation();
 
     @Test
-    public void givenValidRequestTypeShouldReturnTrue() {
+    void givenValidRequestTypeShouldReturnTrue() {
         //given
-        String validURL = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
+        String validUrl = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
 
         //when
-        boolean result = violation.validate(validURL);
+        boolean result = violation.validate(validUrl);
 
         //then
         assertTrue(result);
     }
 
     @Test
-    public void givenInvalidRequestTypeShouldReturnFalse() {
+    void givenInvalidRequestTypeShouldReturnFalse() {
         //given
-        String invalidURL = "htestps://127.0.0.1/ejbca/publicweb/cmp/cmp";
+        String invalidUrl = "htestps://127.0.0.1/ejbca/publicweb/cmp/cmp";
 
         //when
-        boolean result = violation.validate(invalidURL);
+        boolean result = violation.validate(invalidUrl);
 
         //then
         assertFalse(result);
     }
-}
\ No newline at end of file
+}