Merge "[OOM-CPMv2] Fix sonar issue"

diff --git a/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java b/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java
index 267a281..2512458 100644 (file)
--- a/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java
+++ b/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java
@@ -31,29 +31,27 @@ import org.onap.oom.certservice.certification.configuration.CmpServersConfig;
 import org.springframework.http.HttpStatus;
 
 @ExtendWith(MockitoExtension.class)
-public class ReadinessControllerTest {
+class ReadinessControllerTest {
 
     @Mock
     private CmpServersConfig cmpServersConfig;
 
     @Test
-    public void shouldReturnStatusOkWhenConfigIsReady() {
+    void shouldReturnStatusOkWhenConfigIsReady() {
         // Given
         Mockito.when(cmpServersConfig.isReady()).thenReturn(true);
 
         // Then
         assertThat(new ReadinessController(cmpServersConfig).checkReady().getStatusCode()).isEqualTo(HttpStatus.OK);
-        ;
     }
 
     @Test
-    public void shouldReturnStatusServiceUnavailableWhenConfigIsNotReady() {
+    void shouldReturnStatusServiceUnavailableWhenConfigIsNotReady() {
         // Given
         Mockito.when(cmpServersConfig.isReady()).thenReturn(false);
 
         // Then
         assertThat(new ReadinessController(cmpServersConfig).checkReady().getStatusCode()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE);
-        ;
     }
 
 }

diff --git a/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java
index e980aa2..52ed99e 100644 (file)
--- a/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java
+++ b/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java
@@ -36,7 +36,7 @@ import java.security.PrivateKey;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.onap.oom.certservice.certification.TestUtils.createCsrModel;
 
-public class X509CertificateBuilderTest {
+class X509CertificateBuilderTest {
 
     private X509CertificateBuilder certificateBuilder;
 

diff --git a/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java
index ade13f7..9212269 100644 (file)
--- a/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java
+++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java
@@ -99,7 +99,7 @@ class EnvsForCsrTest {
     }
 
     @Test
-    public void shouldReportThatSystemEnvOuVariableIsNotPresentWhenItWasNotDefined() {
+    void shouldReportThatSystemEnvOuVariableIsNotPresentWhenItWasNotDefined() {
         // when
         final Optional<String> testEnv = envsForCsr.getOrganizationUnit();
 
@@ -191,7 +191,7 @@ class EnvsForCsrTest {
     }
 
     @Test
-    public void shouldReportThatSystemEnvSansVariableIsNotPresentWhenItWasNotDefined() {
+    void shouldReportThatSystemEnvSansVariableIsNotPresentWhenItWasNotDefined() {
         // when
         final Optional<String> testEnv = envsForCsr.getSubjectAlternativesName();
 

diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java
index 5c79f6e..19833cb 100644 (file)
--- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java
@@ -35,7 +35,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.onap.oom.certservice.postprocessor.merger.exception.AliasConflictException;
 
 @ExtendWith(MockitoExtension.class)
-public class AppExecutorTest {
+class AppExecutorTest {
 
     @Mock
     Runnable logic;

diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java
index 56f76e1..fbebae0 100644 (file)
--- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java
@@ -28,7 +28,7 @@ import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-public class FileToolsTest {
+class FileToolsTest {
 
     public static final String BAK_EXTENSION = ".bak";
 

diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java
index bde2300..03989f6 100644 (file)
--- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java
@@ -37,7 +37,7 @@ class PemAliasGeneratorTest {
         //when
         String alias = pemAliasGenerator.getAlias();
         //then
-        assertThat(alias.contains(PREFIX_ALIAS_NAME)).isTrue();
+        assertThat(alias).contains(PREFIX_ALIAS_NAME);
     }
 
     @Test