Removing AAF references from Cert-Service in OOM repo.

Certificates regenerated
External files (from legacy AAF) removed

Still left:
* Sonar link,
* Link to documentation,
* Names of K8s resources in RTD documentation,
* Link to CSITs

Issue-ID: OOM-2526
Signed-off-by: Pawel Baniewski <pawel.baniewski@nokia.com>
Change-Id: I675f7485160b9b8e46e9ea573550e62ed28ca607

7 files changed, 0 insertions, 855 deletions

diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java
deleted file mode 100644
index 87964295..00000000
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.aaf.certservice.certification.configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.onap.aaf.certservice.CertServiceApplication;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = CertServiceApplication.class)
-class CmpServersConfigLoaderTest {
-    private static final String EXISTING_CONFIG_FILENAME = "cmpServers.json";
-    private static final String INVALID_CONFIG_FILENAME = "invalidCmpServers.json";
-    private static final String NONEXISTENT_CONFIG_FILENAME = "nonExistingCmpServers.json";
-
-    private static final Map<String, String> EXPECTED_FIRST_CMP_SERVER = Map.of(
-            "CA_NAME", "TEST",
-            "URL", "http://127.0.0.1/ejbca/publicweb/cmp/cmp",
-            "ISSUER_DN", "CN=ManagementCA",
-            "CA_MODE", "CLIENT",
-            "IAK", "xxx",
-            "RV", "yyy"
-    );
-    private static final Map<String, String> EXPECTED_SECOND_CMP_SERVER = Map.of(
-            "CA_NAME", "TEST2",
-            "URL", "http://127.0.0.1/ejbca/publicweb/cmp/cmpRA",
-            "ISSUER_DN", "CN=ManagementCA2",
-            "CA_MODE", "RA",
-            "IAK", "xxx",
-            "RV", "yyy"
-    );
-
-    @Autowired
-    private CmpServersConfigLoader configLoader;
-
-    @Test
-    void shouldLoadCmpServersConfigWhenFileAvailable() throws CmpServersConfigLoadingException {
-        // Given
-        String path = getResourcePath(EXISTING_CONFIG_FILENAME);
-
-        // When
-        List<Cmpv2Server> cmpServers = configLoader.load(path);
-
-        // Then
-        assertThat(cmpServers).isNotNull();
-        assertThat(cmpServers).hasSize(2);
-        verifyThatCmpServerEquals(cmpServers.get(0), EXPECTED_FIRST_CMP_SERVER);
-        verifyThatCmpServerEquals(cmpServers.get(1), EXPECTED_SECOND_CMP_SERVER);
-    }
-
-    @Test
-    void shouldThrowExceptionWhenFileMissing() {
-        // When
-        Exception exception = assertThrows(
-                CmpServersConfigLoadingException.class,
-                () -> configLoader.load(NONEXISTENT_CONFIG_FILENAME));
-
-        // Then
-        assertThat(exception.getMessage()).contains("Exception occurred during CMP Servers configuration loading");
-    }
-
-    @Test
-    void shouldThrowExceptionWhenConfigurationIsInvalid() {
-        // Given
-        String path = getResourcePath(INVALID_CONFIG_FILENAME);
-
-        // When
-        Exception exception = assertThrows(
-                CmpServersConfigLoadingException.class,
-                () -> configLoader.load(path));
-
-        // Then
-        assertThat(exception.getMessage()).contains("Validation of CMPv2 servers configuration failed");
-        assertThat(exception.getCause().getMessage()).contains("authentication");
-    }
-
-    private String getResourcePath(String configFilename) {
-        return getClass().getClassLoader().getResource(configFilename).getFile();
-    }
-
-    private void verifyThatCmpServerEquals(Cmpv2Server cmpv2Server, Map<String, String> expected) {
-        assertThat(cmpv2Server.getCaName()).isEqualTo(expected.get("CA_NAME"));
-        assertThat(cmpv2Server.getUrl()).isEqualTo(expected.get("URL"));
-        assertThat(cmpv2Server.getIssuerDN().toString()).isEqualTo(expected.get("ISSUER_DN"));
-        assertThat(cmpv2Server.getCaMode().name()).isEqualTo(expected.get("CA_MODE"));
-        assertThat(cmpv2Server.getAuthentication().getIak()).isEqualTo(expected.get("IAK"));
-        assertThat(cmpv2Server.getAuthentication().getRv()).isEqualTo(expected.get("RV"));
-    }
-}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigTest.java
deleted file mode 100644
index 511c3966..00000000
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigTest.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.aaf.certservice.certification.configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.startsWith;
-
-import java.util.List;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.configuration.model.Authentication;
-import org.onap.aaf.certservice.certification.configuration.model.CaMode;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-
-@ExtendWith(MockitoExtension.class)
-class CmpServersConfigTest {
-
-    private static final String ERROR_MESSAGE = "Exception occurred during CMP Servers configuration loading";
-    private static final String APP_CONFIG_PATH = "/fake/path/to/config";
-    private static final List<Cmpv2Server> SAMPLE_CMP_SERVERS = generateTestConfiguration();
-
-    @Mock
-    private CmpServersConfigLoader cmpServersConfigLoader;
-
-    private CmpServersConfig cmpServersConfig;
-
-    @BeforeEach
-    void setUp() {
-        cmpServersConfig = new CmpServersConfig(APP_CONFIG_PATH, cmpServersConfigLoader);
-    }
-
-    @Test
-    void shouldCallLoaderWithPathFromPropertiesWhenCreated() throws CmpServersConfigLoadingException {
-        // When
-        this.cmpServersConfig.init();      // Manual PostConstruct call
-
-        // Then
-        Mockito.verify(cmpServersConfigLoader).load(startsWith(APP_CONFIG_PATH));
-    }
-
-    @Test
-    void shouldReturnLoadedServersWhenGetCalled() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenReturn(SAMPLE_CMP_SERVERS);
-        this.cmpServersConfig.init();      // Manual PostConstruct call
-
-        // When
-        List<Cmpv2Server> receivedCmpServers = this.cmpServersConfig.getCmpServers();
-
-        // Then
-        assertThat(receivedCmpServers).containsAll(SAMPLE_CMP_SERVERS);
-    }
-
-    @Test
-    void shouldReturnLoadedServersAfterReloadWhenGetCalled() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenReturn(SAMPLE_CMP_SERVERS);
-        List<Cmpv2Server> receivedCmpServers = this.cmpServersConfig.getCmpServers();
-        assertThat(receivedCmpServers).isNull();
-
-        // When
-        this.cmpServersConfig.reloadConfiguration();
-        receivedCmpServers = this.cmpServersConfig.getCmpServers();
-
-        // Then
-        assertThat(receivedCmpServers).containsAll(SAMPLE_CMP_SERVERS);
-    }
-
-    @Test
-    void shouldRethrowExceptionWhenReloaded() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenThrow(new CmpServersConfigLoadingException(
-                ERROR_MESSAGE));
-
-        // Then
-        assertThrows(
-                CmpServersConfigLoadingException.class,
-                () -> cmpServersConfig.reloadConfiguration());
-    }
-
-    @Test
-    void shouldPassMessageToRethrownErrorWhenReloadingFails() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenThrow(new CmpServersConfigLoadingException(ERROR_MESSAGE));
-
-        // When
-        Exception exception = assertThrows(
-                CmpServersConfigLoadingException.class,
-                () -> cmpServersConfig.reloadConfiguration());
-
-        // Then
-        assertThat(exception.getMessage()).isEqualTo(ERROR_MESSAGE);
-    }
-
-    @Test
-    void shouldNotReturnIakAndRvWhenToStringMethodIsUsed() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenReturn(SAMPLE_CMP_SERVERS);
-        this.cmpServersConfig.init();      // Manual PostConstruct call
-
-        // When
-        List<Cmpv2Server> receivedCmpServers = this.cmpServersConfig.getCmpServers();
-
-        // Then
-        receivedCmpServers.forEach((server) -> assertThat(server.toString())
-                .doesNotContain(
-                        server.getAuthentication().getIak(),
-                        server.getAuthentication().getRv()
-                ));
-    }
-
-    @Test
-    void shouldRethrowErrorWhenLoadingFails() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenThrow(new CmpServersConfigLoadingException(ERROR_MESSAGE));
-
-        // Then
-        assertThrows(
-                CmpServersConfigLoadingException.class,
-                () -> cmpServersConfig.loadConfiguration());
-    }
-
-    @Test
-    void shouldPassMessageToRethrownErrorWhenLoadingFails() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenThrow(new CmpServersConfigLoadingException(ERROR_MESSAGE));
-
-        // When
-        Exception exception = assertThrows(
-                CmpServersConfigLoadingException.class,
-                () -> cmpServersConfig.loadConfiguration());
-
-        // Then
-        assertThat(exception.getMessage()).isEqualTo(ERROR_MESSAGE);
-    }
-
-    @Test
-    void shouldBeNotReadyWhenCreated() {
-        assertThat(cmpServersConfig.isReady()).isFalse();
-    }
-
-    @Test
-    void shouldBeReadyWhenSuccessfullyInitialized() {
-        // When
-        this.cmpServersConfig.init();      // Manual PostConstruct call
-
-        // Then
-        assertThat(cmpServersConfig.isReady()).isTrue();
-    }
-
-    @Test
-    void shouldNotBeReadyWhenFailedToInitialize() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenThrow(new CmpServersConfigLoadingException(ERROR_MESSAGE));
-
-        // When
-        this.cmpServersConfig.init();      // Manual PostConstruct call
-
-        // Then
-        assertThat(cmpServersConfig.isReady()).isFalse();
-    }
-
-    @Test
-    void shouldBeReadyWhenSuccessfullyReloaded() throws CmpServersConfigLoadingException {
-        // When
-        this.cmpServersConfig.reloadConfiguration();
-
-        // Then
-        assertThat(cmpServersConfig.isReady()).isTrue();
-    }
-
-    @Test
-    void shouldNotBeReadyWhenFailedToReload() throws CmpServersConfigLoadingException {
-        // Given
-        Mockito.when(cmpServersConfigLoader.load(any())).thenThrow(new CmpServersConfigLoadingException(ERROR_MESSAGE));
-
-        // When
-        assertThrows(
-                CmpServersConfigLoadingException.class,
-                () -> cmpServersConfig.loadConfiguration());
-
-        // Then
-        assertThat(cmpServersConfig.isReady()).isFalse();
-    }
-
-    private static List<Cmpv2Server> generateTestConfiguration() {
-        Cmpv2Server testServer1 = new Cmpv2Server();
-        testServer1.setCaName("TEST_CA1");
-        testServer1.setIssuerDN(new X500Name("CN=testIssuer"));
-        testServer1.setUrl("http://test.ca.server");
-        Authentication testAuthentication1 = new Authentication();
-        testAuthentication1.setIak("testIak");
-        testAuthentication1.setRv("testRv");
-        testServer1.setAuthentication(testAuthentication1);
-        testServer1.setCaMode(CaMode.RA);
-
-        Cmpv2Server testServer2 = new Cmpv2Server();
-        testServer2.setCaName("TEST_CA2");
-        testServer2.setIssuerDN(new X500Name("CN=testIssuer2"));
-        testServer2.setUrl("http://test.ca.server");
-        Authentication testAuthentication2 = new Authentication();
-        testAuthentication2.setIak("test2Iak");
-        testAuthentication2.setRv("test2Rv");
-        testServer2.setAuthentication(testAuthentication2);
-        testServer2.setCaMode(CaMode.CLIENT);
-
-        return List.of(testServer1, testServer2);
-    }
-
-}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java
deleted file mode 100644
index b83fb9aa..00000000
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.aaf.certservice.certification.configuration;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.configuration.model.Authentication;
-import org.onap.aaf.certservice.certification.configuration.model.CaMode;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
-
-import java.util.Collections;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class Cmpv2ServerProviderTest {
-
-    private static final String TEST_CA = "testCA";
-
-    private Cmpv2ServerProvider cmpv2ServerProvider;
-
-    @Mock
-    private CmpServersConfig cmpServersConfig;
-
-    @BeforeEach
-    void setUp() {
-        cmpv2ServerProvider =
-                new Cmpv2ServerProvider(cmpServersConfig);
-    }
-
-    @Test
-    void shouldReturnOptionalWithServerWhenServerWithGivenCaNameIsPresentInConfig() {
-        // Given
-        Cmpv2Server testServer = createTestServer();
-        when(cmpServersConfig.getCmpServers()).thenReturn(Collections.singletonList(testServer));
-
-        // When
-        Cmpv2Server receivedServer = cmpv2ServerProvider
-                .getCmpv2Server(TEST_CA);
-
-        // Then
-        assertThat(receivedServer).isEqualToComparingFieldByField(testServer);
-    }
-
-    @Test
-    void shouldReturnEmptyOptionalWhenServerWithGivenCaNameIsNotPresentInConfig() {
-        // Given
-        String expectedMessage = "No server found for given CA name";
-        when(cmpServersConfig.getCmpServers()).thenReturn(Collections.emptyList());
-
-        // When
-        Exception exception = assertThrows(
-                Cmpv2ServerNotFoundException.class, () ->
-                        cmpv2ServerProvider.getCmpv2Server(TEST_CA)
-        );
-
-        // Then
-        assertTrue(exception.getMessage().contains(expectedMessage));
-    }
-
-    private Cmpv2Server createTestServer() {
-        Cmpv2Server testServer = new Cmpv2Server();
-        testServer.setCaName(TEST_CA);
-        testServer.setIssuerDN(new X500Name("CN=testIssuer"));
-        testServer.setUrl("http://test.ca.server");
-        Authentication testAuthentication = new Authentication();
-        testAuthentication.setIak("testIak");
-        testAuthentication.setRv("testRv");
-        testServer.setAuthentication(testAuthentication);
-        testServer.setCaMode(CaMode.RA);
-
-        return testServer;
-    }
-}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java
deleted file mode 100644
index 6db77753..00000000
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidatorTest.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.aaf.certservice.certification.configuration.validation;
-
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.onap.aaf.certservice.CertServiceApplication;
-import org.onap.aaf.certservice.certification.configuration.model.Authentication;
-import org.onap.aaf.certservice.certification.configuration.model.CaMode;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import java.security.InvalidParameterException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = CertServiceApplication.class)
-class Cmpv2ServersConfigurationValidatorTest {
-
-    private static final String EMPTY_STRING = "";
-
-    @Autowired
-    private Cmpv2ServersConfigurationValidator validator;
-
-    private Authentication authentication;
-    private Cmpv2Server server;
-    private List<Cmpv2Server> servers;
-
-    @BeforeEach
-    private void init() {
-        setAuthentication();
-        setServerConfiguration();
-        servers = new ArrayList<>();
-        servers.add(server);
-    }
-
-    @Test
-    void shouldThrowExceptionWhenCaNamesAreNotUnique() {
-        // Given
-        servers.add(server);
-
-        // When
-        Exception exception = assertThrows(
-                InvalidParameterException.class,
-                () -> validator.validate(servers));
-
-        // Then
-        assertThat(exception.getMessage()).contains("CA names are not unique within given CMPv2 servers");
-    }
-
-    @Test
-    void shouldThrowExceptionWhenWrongProtocolInUrl() {
-        // Given
-        server.setUrl("https://test.test.test:60000/");
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenWrongPortInUrl() {
-        // Given
-        server.setUrl("http://test.test.test:70000/");
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenWrongCaNameLength() {
-        // Given
-        server.setCaName(EMPTY_STRING);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenWrongRvLength() {
-        // Given
-        authentication.setRv(EMPTY_STRING);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-
-    @Test
-    void shouldThrowExceptionWhenWrongIakLength() {
-        // Given
-        authentication.setIak(EMPTY_STRING);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenCaNameIsNull() {
-        // Given
-        server.setCaName(null);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenIssuerDnIsNull() {
-        // Given
-        server.setIssuerDN(null);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenCaModeIsNull() {
-        // Given
-        server.setCaMode(null);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenUrlIsNull() {
-        // Given
-        server.setUrl(null);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenAuthenticationIsNull() {
-        // Given
-        server.setAuthentication(null);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenIakIsNull() {
-        // Given
-        authentication.setIak(null);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldThrowExceptionWhenRvIsNull() {
-        // Given
-        authentication.setRv(null);
-
-        // Then
-        assertExceptionIsThrown();
-    }
-
-    @Test
-    void shouldNotThrowExceptionWhenServerConfigurationIsValid() {
-        // Then
-        assertDoesNotThrow(() -> validator.validate(servers));
-    }
-
-    private void assertExceptionIsThrown() {
-        assertThrows(IllegalArgumentException.class, () -> validator.validate(servers));
-    }
-
-    private void setServerConfiguration() {
-        server = new Cmpv2Server();
-        server.setCaMode(CaMode.CLIENT);
-        server.setCaName("TEST");
-        server.setIssuerDN(new X500Name("CN=ManagementCA"));
-        server.setUrl("http://127.0.0.1/ejbca/publicweb/cmp/cmp");
-        server.setAuthentication(authentication);
-    }
-
-    private void setAuthentication() {
-        authentication = new Authentication();
-        authentication.setRv("testRV");
-        authentication.setIak("testIAK");
-    }
-
-}
\ No newline at end of file
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
deleted file mode 100644
index 7082626f..00000000
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/Cmpv2UrlValidatorTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-
-package org.onap.aaf.certservice.certification.configuration.validation.constraints;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
-class Cmpv2UrlValidatorTest {
-
-    private final Cmpv2UrlValidator validator = new Cmpv2UrlValidator();
-
-    @Test
-    void givenCorrectUrlWhenValidatingShouldReturnTrue() {
-        //given
-        String url = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
-
-        //when
-        boolean result = validator.isValid(url, null);
-
-        //then
-        assertTrue(result);
-    }
-
-    @Test
-    void givenIncorrectUrlWhenValidatingShouldReturnFalse() {
-        //given
-        String url = "httttp://127.0.0.1:80000/ejbca/publicweb/cmp/cmp";
-
-        //when
-        boolean result = validator.isValid(url, null);
-
-        //then
-        assertFalse(result);
-    }
-}
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
deleted file mode 100644
index e729c738..00000000
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/PortNumberViolationTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============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.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class PortNumberViolationTest {
-
-    private final PortNumberViolation violation = new PortNumberViolation();
-
-    @Test
-    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";
-
-        //when
-        boolean result1 = violation.validate(validUrl1);
-        boolean result2 = violation.validate(validUrl2);
-        boolean result3 = violation.validate(validUrl3);
-
-        //then
-        assertTrue(result1);
-        assertTrue(result2);
-        assertTrue(result3);
-    }
-
-    @Test
-    void givenEmptyPortShouldReturnTrue() {
-        //given
-        String validUrl = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
-
-        //when
-        boolean result = violation.validate(validUrl);
-
-        //then
-        assertTrue(result);
-    }
-
-    @Test
-    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";
-
-        //when
-        boolean result1 = violation.validate(invalidUrl1);
-        boolean result2 = violation.validate(invalidUrl2);
-
-        //then
-        assertFalse(result1);
-        assertFalse(result2);
-    }
-}
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
deleted file mode 100644
index dce66d52..00000000
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/constraints/violations/RequestTypeViolationTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============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.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
-class RequestTypeViolationTest {
-
-    private final RequestTypeViolation violation = new RequestTypeViolation();
-
-    @Test
-    void givenValidRequestTypeShouldReturnTrue() {
-        //given
-        String validUrl = "http://127.0.0.1/ejbca/publicweb/cmp/cmp";
-
-        //when
-        boolean result = violation.validate(validUrl);
-
-        //then
-        assertTrue(result);
-    }
-
-    @Test
-    void givenInvalidRequestTypeShouldReturnFalse() {
-        //given
-        String invalidUrl = "htestps://127.0.0.1/ejbca/publicweb/cmp/cmp";
-
-        //when
-        boolean result = violation.validate(invalidUrl);
-
-        //then
-        assertFalse(result);
-    }
-}