Remove code

Issue-ID: OOM-2526
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Change-Id: Ie81cfa9c4f8aaecd18fb567526aa61d391575741

49 files changed, 0 insertions, 2656 deletions

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java
deleted file mode 100644
index af30ff3e..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/AppExitHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AppExitHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(AppExitHandler.class);
-
-    public void exit(ExitStatus exitStatus) {
-        LOGGER.info("Application exits with following exit code: {} and message: {}",
-                exitStatus.getExitCodeValue(), exitStatus.getMessage());
-        System.exit(exitStatus.getExitCodeValue());
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java
deleted file mode 100644
index 56c355e4..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client;
-
-import org.onap.aaf.certservice.client.api.ExitableException;
-import org.onap.aaf.certservice.client.certification.ArtifactsCreatorProvider;
-import org.onap.aaf.certservice.client.certification.CsrFactory;
-import org.onap.aaf.certservice.client.certification.KeyPairFactory;
-import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder;
-import org.onap.aaf.certservice.client.common.Base64Encoder;
-import org.onap.aaf.certservice.client.configuration.EnvsForClient;
-import org.onap.aaf.certservice.client.configuration.EnvsForCsr;
-import org.onap.aaf.certservice.client.configuration.EnvsForTls;
-import org.onap.aaf.certservice.client.configuration.factory.ClientConfigurationFactory;
-import org.onap.aaf.certservice.client.configuration.factory.CsrConfigurationFactory;
-import org.onap.aaf.certservice.client.configuration.factory.SslContextFactory;
-import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration;
-import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
-import org.onap.aaf.certservice.client.httpclient.CloseableHttpsClientProvider;
-import org.onap.aaf.certservice.client.httpclient.HttpClient;
-import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.net.ssl.SSLContext;
-import java.security.KeyPair;
-
-import static org.onap.aaf.certservice.client.api.ExitStatus.SUCCESS;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.KEY_SIZE;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.RSA_ENCRYPTION_ALGORITHM;
-
-public class CertServiceClient {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CertServiceClient.class);
-
-    private AppExitHandler appExitHandler;
-
-    public CertServiceClient(AppExitHandler appExitHandler) {
-        this.appExitHandler = appExitHandler;
-    }
-
-    public void run() {
-        KeyPairFactory keyPairFactory = new KeyPairFactory(RSA_ENCRYPTION_ALGORITHM, KEY_SIZE);
-        PrivateKeyToPemEncoder pkEncoder = new PrivateKeyToPemEncoder();
-        Base64Encoder base64Encoder = new Base64Encoder();
-        try {
-            ClientConfiguration clientConfiguration = new ClientConfigurationFactory(new EnvsForClient()).create();
-            CsrConfiguration csrConfiguration = new CsrConfigurationFactory(new EnvsForCsr()).create();
-            KeyPair keyPair = keyPairFactory.create();
-            CsrFactory csrFactory = new CsrFactory(csrConfiguration);
-            SSLContext sslContext = new SslContextFactory(new EnvsForTls()).create();
-
-            CloseableHttpsClientProvider provider = new CloseableHttpsClientProvider(
-                    sslContext, clientConfiguration.getRequestTimeout());
-            HttpClient httpClient = new HttpClient(provider, clientConfiguration.getUrlToCertService());
-
-            CertServiceResponse certServiceData =
-                    httpClient.retrieveCertServiceData(
-                            clientConfiguration.getCaName(),
-                            base64Encoder.encode(csrFactory.createCsrInPem(keyPair)),
-                            base64Encoder.encode(pkEncoder.encodePrivateKeyToPem(keyPair.getPrivate())));
-
-            ArtifactsCreatorProvider
-                    .get(clientConfiguration.getOutputType(),
-                            clientConfiguration.getCertsOutputPath())
-                    .create(certServiceData.getCertificateChain(),
-                            certServiceData.getTrustedCertificates(),
-                            keyPair.getPrivate());
-
-        } catch (ExitableException e) {
-            LOGGER.error("Cert Service Client fails in execution: ", e);
-            appExitHandler.exit(e.applicationExitStatus());
-        }
-        appExitHandler.exit(SUCCESS);
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/MainApp.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/MainApp.java
deleted file mode 100644
index 6a29241f..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/MainApp.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client;
-
-public class MainApp {
-    public static void main(String[] args) {
-        CertServiceClient certServiceClient = new CertServiceClient(new AppExitHandler());
-        certServiceClient.run();
-    }
-}
\ No newline at end of file
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java
deleted file mode 100644
index a84485eb..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.api;
-
-public enum ExitStatus {
-
-    SUCCESS(0, "Success"),
-    CLIENT_CONFIGURATION_EXCEPTION(1, "Invalid client configuration"),
-    CSR_CONFIGURATION_EXCEPTION(2, "Invalid CSR configuration"),
-    KEY_PAIR_GENERATION_EXCEPTION(3, "Fail in key pair generation"),
-    CSR_GENERATION_EXCEPTION(4, "Fail in CSR generation"),
-    CERT_SERVICE_API_CONNECTION_EXCEPTION(5, "CertService HTTP unsuccessful response"),
-    HTTP_CLIENT_EXCEPTION(6, "Internal HTTP Client connection problem"),
-    PEM_CONVERSION_EXCEPTION(7, "Fail in PEM conversion"),
-    PK_TO_PEM_ENCODING_EXCEPTION(8, "Fail in Private Key to PEM Encoding"),
-    TLS_CONFIGURATION_EXCEPTION(9, "Invalid TLS configuration"),
-    FILE_CREATION_EXCEPTION(10, "File could not be created");
-
-    private final int value;
-    private final String message;
-
-    ExitStatus(int value, String message) {
-        this.value = value;
-        this.message = message;
-    }
-
-    public int getExitCodeValue() {
-        return value;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitableException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitableException.java
deleted file mode 100644
index 3a7a542b..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitableException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.api;
-
-public abstract class ExitableException extends Exception {
-    public ExitableException(Throwable cause) {
-        super(cause);
-    }
-
-    public ExitableException(String message) {
-        super(message);
-    }
-
-    public abstract ExitStatus applicationExitStatus();
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProvider.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProvider.java
deleted file mode 100644
index 954f3d30..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification;
-
-import org.onap.aaf.certservice.client.certification.conversion.ArtifactsCreator;
-import org.onap.aaf.certservice.client.certification.conversion.ConvertedArtifactsCreatorFactory;
-import org.onap.aaf.certservice.client.certification.conversion.PemArtifactsCreator;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
-
-public enum ArtifactsCreatorProvider {
-    P12("PKCS12") {
-        @Override
-        ArtifactsCreator create(String destPath) {
-            return ConvertedArtifactsCreatorFactory.createConverter(destPath, getExtension(), getKeyStoreType());
-        }
-    },
-    JKS("JKS") {
-        @Override
-        ArtifactsCreator create(String destPath) {
-            return ConvertedArtifactsCreatorFactory.createConverter(destPath, getExtension(), getKeyStoreType());
-        }
-    },
-    PEM("PEM") {
-        @Override
-        ArtifactsCreator create(String destPath) {
-            return new PemArtifactsCreator(CertFileWriter.createWithDir(destPath), new PrivateKeyToPemEncoder());
-        }
-    };
-
-    private final String keyStoreType;
-
-    ArtifactsCreatorProvider(String keyStoreType) {
-        this.keyStoreType = keyStoreType;
-    }
-
-    public static ArtifactsCreator get(String outputType, String destPath) {
-        return valueOf(outputType).create(destPath);
-    }
-
-    String getKeyStoreType() {
-        return keyStoreType;
-    }
-
-    String getExtension() {
-        return this.toString().toLowerCase();
-    }
-
-    abstract ArtifactsCreator create(String destPath);
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/CsrFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/CsrFactory.java
deleted file mode 100644
index 0faf5cab..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/CsrFactory.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
-import org.onap.aaf.certservice.client.certification.exception.CsrGenerationException;
-import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.security.auth.x500.X500Principal;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.security.KeyPair;
-import java.util.Optional;
-
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.COMMON_NAME;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.COUNTRY;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.LOCATION;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION_UNIT;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.SIGN_ALGORITHM;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.STATE;
-
-
-public class CsrFactory {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CsrFactory.class);
-    private static final String SANS_DELIMITER = ":";
-    private final CsrConfiguration configuration;
-
-
-    public CsrFactory(CsrConfiguration configuration) {
-        this.configuration = configuration;
-    }
-
-
-    public String createCsrInPem(KeyPair keyPair) throws CsrGenerationException {
-        LOGGER.info("Creation of CSR has been started with following parameters: {}", configuration.toString());
-        String csrParameters = getMandatoryParameters().append(getOptionalParameters()).toString();
-        X500Principal subject = new X500Principal(csrParameters);
-        PKCS10CertificationRequest request = createPkcs10Csr(subject, keyPair);
-
-        LOGGER.info("Creation of CSR has been completed successfully");
-        return convertPkcs10CsrToPem(request);
-    }
-
-    private StringBuilder getMandatoryParameters() {
-        return new StringBuilder(String.format("%s=%s, %s=%s, %s=%s, %s=%s",
-                COMMON_NAME, configuration.getCommonName(),
-                COUNTRY, configuration.getCountry(),
-                STATE, configuration.getState(),
-                ORGANIZATION, configuration.getOrganization()));
-    }
-
-    private String getOptionalParameters() {
-        StringBuilder optionalParameters = new StringBuilder();
-        Optional.ofNullable(configuration.getOrganizationUnit())
-                .filter(CsrFactory::isParameterPresent)
-                .map(unit -> optionalParameters.append(String.format(", %s=%s", ORGANIZATION_UNIT, unit)));
-        Optional.ofNullable(configuration.getLocation())
-                .filter(CsrFactory::isParameterPresent)
-                .map(location -> optionalParameters.append(String.format(", %s=%s", LOCATION, location)));
-        return optionalParameters.toString();
-    }
-
-    private PKCS10CertificationRequest createPkcs10Csr(X500Principal subject, KeyPair keyPair) throws CsrGenerationException {
-        JcaPKCS10CertificationRequestBuilder builder = new JcaPKCS10CertificationRequestBuilder(subject, keyPair.getPublic());
-
-        if (isParameterPresent(configuration.getSans())) {
-            builder.addAttribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest, generateSansExtension());
-        }
-
-        return builder.build(getContentSigner(keyPair));
-    }
-
-    private ContentSigner getContentSigner(KeyPair keyPair) throws CsrGenerationException {
-        ContentSigner contentSigner;
-        try {
-            contentSigner = new JcaContentSignerBuilder(SIGN_ALGORITHM).build(keyPair.getPrivate());
-        } catch (OperatorCreationException e) {
-            LOGGER.error("Creation of PKCS10Csr failed, exception message: {}", e.getMessage());
-            throw new CsrGenerationException(e);
-
-        }
-        return contentSigner;
-    }
-
-    private String convertPkcs10CsrToPem(PKCS10CertificationRequest request) throws CsrGenerationException {
-        final StringWriter stringWriter = new StringWriter();
-        try (JcaPEMWriter pemWriter = new JcaPEMWriter(stringWriter)) {
-            LOGGER.info("Conversion of CSR to PEM has been started");
-            pemWriter.writeObject(request);
-        } catch (IOException e) {
-            LOGGER.error("Conversion to PEM failed, exception message: {}", e.getMessage());
-            throw new CsrGenerationException(e);
-        }
-        return stringWriter.toString();
-    }
-
-    private Extensions generateSansExtension() throws CsrGenerationException {
-        ExtensionsGenerator generator = new ExtensionsGenerator();
-        try {
-            generator.addExtension(Extension.subjectAlternativeName, false, createGeneralNames());
-        } catch (IOException e) {
-            LOGGER.error("Generation of SANs parameter failed, exception message: {}", e.getMessage());
-            throw new CsrGenerationException(e);
-        }
-        return generator.generate();
-    }
-
-    private GeneralNames createGeneralNames() {
-        String[] sansTable = this.configuration.getSans().split(SANS_DELIMITER);
-        int length = sansTable.length;
-        GeneralName[] generalNames = new GeneralName[length];
-        for (int i = 0; i < length; i++) {
-            generalNames[i] = new GeneralName(GeneralName.dNSName, sansTable[i]);
-        }
-        return new GeneralNames(generalNames);
-    }
-
-    private static Boolean isParameterPresent(String parameter) {
-        return parameter != null && !"".equals(parameter);
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/EncryptionAlgorithmConstants.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/EncryptionAlgorithmConstants.java
deleted file mode 100644
index 63ede568..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/EncryptionAlgorithmConstants.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification;
-
-public final class EncryptionAlgorithmConstants {
-
-    private EncryptionAlgorithmConstants() {
-    }
-
-    public static final String RSA_ENCRYPTION_ALGORITHM = "RSA";
-    public static final String SIGN_ALGORITHM = "SHA1withRSA";
-    public static final int KEY_SIZE = 2048;
-
-    public static final String COMMON_NAME = "CN";
-    public static final String ORGANIZATION = "O";
-    public static final String ORGANIZATION_UNIT = "OU";
-    public static final String LOCATION = "L";
-    public static final String STATE = "ST";
-    public static final String COUNTRY = "C";
-
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/KeyPairFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/KeyPairFactory.java
deleted file mode 100644
index e997cd0d..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/KeyPairFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification;
-
-import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-
-public class KeyPairFactory {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(KeyPairFactory.class);
-    private final String encryptionAlgorithm;
-    private final int keySize;
-
-    public KeyPairFactory(String encryptionAlgorithm, int keySize) {
-        this.encryptionAlgorithm = encryptionAlgorithm;
-        this.keySize = keySize;
-    }
-
-    public KeyPair create() throws KeyPairGenerationException {
-        try {
-            LOGGER.info("KeyPair generation started with algorithm: {} and key size: {}", encryptionAlgorithm, keySize);
-            return createKeyPairGenerator().generateKeyPair();
-        } catch (NoSuchAlgorithmException e) {
-            String errorMessage = String.format("Generation of KeyPair failed, exception message: %s", e.getMessage());
-            throw new KeyPairGenerationException(errorMessage);
-        }
-    }
-
-    private KeyPairGenerator createKeyPairGenerator() throws NoSuchAlgorithmException {
-        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(encryptionAlgorithm);
-        keyPairGenerator.initialize(keySize);
-        return keyPairGenerator;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoder.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoder.java
deleted file mode 100644
index fa6485e5..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoder.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification;
-
-
-import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.onap.aaf.certservice.client.certification.exception.PkEncodingException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.security.PrivateKey;
-
-public class PrivateKeyToPemEncoder {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PrivateKeyToPemEncoder.class);
-    private static final String PEM_OBJECT_TYPE = "RSA PRIVATE KEY";
-
-    public String encodePrivateKeyToPem(PrivateKey pk) throws PkEncodingException {
-        LOGGER.info("Attempt to encode private key to PEM");
-        StringWriter stringWriter = new StringWriter();
-        try (JcaPEMWriter pemWriter = new JcaPEMWriter(stringWriter)) {
-            pemWriter.writeObject(new PemObject(PEM_OBJECT_TYPE, pk.getEncoded()));
-        } catch (IOException e) {
-            LOGGER.error("Encode of private key to PEM failed. Exception message: {}", e.getMessage());
-            throw new PkEncodingException(e);
-        }
-        return stringWriter.toString();
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreator.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreator.java
deleted file mode 100644
index 428b85aa..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.conversion;
-
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-import java.security.PrivateKey;
-import java.util.List;
-
-public interface ArtifactsCreator {
-    void create(List<String> keystoreData, List<String> truststoreData, PrivateKey privateKey)
-            throws ExitableException;
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreator.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreator.java
deleted file mode 100644
index 4826732c..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.conversion;
-
-import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException;
-import org.onap.aaf.certservice.client.certification.exception.PemConversionException;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.security.PrivateKey;
-import java.util.List;
-
-public class ConvertedArtifactsCreator implements ArtifactsCreator {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConvertedArtifactsCreator.class);
-    private static final String CERTIFICATE_ALIAS = "certificate";
-    private static final String TRUSTED_CERTIFICATE_ALIAS = "trusted-certificate-";
-    private static final int PASSWORD_LENGTH = 24;
-    private static final String PASS_EXT = "pass";
-    private static final String KEYSTORE = "keystore";
-    private static final String TRUSTSTORE = "truststore";
-
-    private final String fileExtension;
-    private final RandomPasswordGenerator passwordGenerator;
-    private final PemConverter converter;
-    private final CertFileWriter fileWriter;
-
-    ConvertedArtifactsCreator(CertFileWriter fileWriter, RandomPasswordGenerator passwordGenerator,
-                              PemConverter converter, String fileExtension) {
-        this.passwordGenerator = passwordGenerator;
-        this.converter = converter;
-        this.fileWriter = fileWriter;
-        this.fileExtension = fileExtension;
-    }
-
-    @Override
-    public void create(List<String> keystoreData, List<String> truststoreData, PrivateKey privateKey)
-            throws PemConversionException, CertFileWriterException {
-        createKeystore(keystoreData, privateKey);
-        createTruststore(truststoreData);
-    }
-
-    private void createKeystore(List<String> data, PrivateKey privateKey)
-            throws PemConversionException, CertFileWriterException {
-        Password password = passwordGenerator.generate(PASSWORD_LENGTH);
-        String keystoreArtifactName = getFilenameWithExtension(KEYSTORE, fileExtension);
-        String keystorePass = getFilenameWithExtension(KEYSTORE, PASS_EXT);
-
-        LOGGER.debug("Attempt to create keystore files and saving data. File names: {}, {}", keystoreArtifactName, keystorePass);
-
-        fileWriter.saveData(converter.convertKeystore(data, password, CERTIFICATE_ALIAS, privateKey), keystoreArtifactName);
-        fileWriter.saveData(getPasswordAsBytes(password), keystorePass);
-    }
-
-    private void createTruststore(List<String> data)
-            throws PemConversionException, CertFileWriterException {
-        Password password = passwordGenerator.generate(PASSWORD_LENGTH);
-        String truststoreArtifactName = getFilenameWithExtension(TRUSTSTORE, fileExtension);
-        String truststorePass = getFilenameWithExtension(TRUSTSTORE, PASS_EXT);
-
-        LOGGER.debug("Attempt to create truststore files and saving data. File names: {}, {}", truststoreArtifactName, truststorePass);
-
-        fileWriter.saveData(converter.convertTruststore(data, password, TRUSTED_CERTIFICATE_ALIAS), truststoreArtifactName);
-        fileWriter.saveData(getPasswordAsBytes(password), truststorePass);
-    }
-
-    private byte[] getPasswordAsBytes(Password password) {
-        return password.getCurrentPassword().getBytes();
-    }
-
-    private String getFilenameWithExtension(String filename, String extension) {
-        return String.format("%s.%s", filename, extension);
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java
deleted file mode 100644
index bda796eb..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.conversion;
-
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
-
-public class ConvertedArtifactsCreatorFactory {
-
-    private ConvertedArtifactsCreatorFactory() {
-    }
-
-    public static ConvertedArtifactsCreator createConverter(String destPath, String fileExtension, String keyStoreType) {
-        return new ConvertedArtifactsCreator(
-                CertFileWriter.createWithDir(destPath),
-                new RandomPasswordGenerator(),
-                new PemConverter(keyStoreType),
-                fileExtension);
-    }
-
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/Password.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/Password.java
deleted file mode 100644
index 6ea1a219..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/Password.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.conversion;
-
-class Password {
-    // We are excluding this line in Sonar due to fact that
-    // PASSWORD_PATTERN does not contain password. This solution
-    // is safe.
-    private static final String PASSWORD_PATTERN = "[\\w$#]{16,}"; // NOSONAR
-    private final String currentPassword;
-
-    Password(String currentPassword) {
-        this.currentPassword = currentPassword;
-    }
-
-    String getCurrentPassword() {
-        return currentPassword;
-    }
-
-    char[] toCharArray() {
-        return currentPassword.toCharArray();
-    }
-
-    boolean isCorrectPasswordPattern() {
-        return currentPassword.matches(PASSWORD_PATTERN);
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreator.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreator.java
deleted file mode 100644
index 4bec222f..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.conversion;
-
-import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder;
-import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException;
-import org.onap.aaf.certservice.client.certification.exception.PkEncodingException;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.security.PrivateKey;
-import java.util.List;
-
-public class PemArtifactsCreator implements ArtifactsCreator {
-    private static final Logger LOGGER = LoggerFactory.getLogger(PemArtifactsCreator.class);
-
-    private static final String KEY_PEM = "key.pem";
-    private static final String KEYSTORE_PEM = "keystore.pem";
-    private static final String TRUSTSTORE_PEM = "truststore.pem";
-
-    private final CertFileWriter writer;
-    private final PrivateKeyToPemEncoder pkEncoder;
-
-    public PemArtifactsCreator(CertFileWriter writer, PrivateKeyToPemEncoder pkEncoder) {
-        this.writer = writer;
-        this.pkEncoder = pkEncoder;
-    }
-
-    @Override
-    public void create(List<String> keystoreData, List<String> truststoreData, PrivateKey privateKey)
-            throws PkEncodingException, CertFileWriterException {
-        LOGGER.debug("Attempt to create PEM private key file and saving data. File name: {}", KEY_PEM);
-        writer.saveData(pkEncoder.encodePrivateKeyToPem(privateKey).getBytes(), KEY_PEM);
-
-        LOGGER.debug("Attempt to create PEM keystore file and saving data. File name: {}", KEYSTORE_PEM);
-        writer.saveData(getDataAsBytes(keystoreData), KEYSTORE_PEM);
-
-        LOGGER.debug("Attempt to create PEM truststore file and saving data. File name: {}", TRUSTSTORE_PEM);
-        writer.saveData(getDataAsBytes(truststoreData), TRUSTSTORE_PEM);
-    }
-
-    private byte[] getDataAsBytes(List<String> data) {
-        return String.join("\n", data).getBytes();
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemConverter.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemConverter.java
deleted file mode 100644
index 5e82c177..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PemConverter.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.conversion;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMParser;
-import org.onap.aaf.certservice.client.certification.exception.PemConversionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.security.KeyStore;
-import java.security.KeyStore.LoadStoreParameter;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.util.List;
-import java.util.Optional;
-
-class PemConverter {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PemConverter.class);
-    private static final String PASSWORD_ERROR_MSG = "Password should be min. 16 chars long and should contain only alphanumeric characters and special characters like Underscore (_), Dollar ($) and Pound (#)";
-    private static final LoadStoreParameter EMPTY_KEYSTORE_CONFIGURATION = null;
-    private final String keyStoreType;
-
-    public PemConverter(String keyStoreType) {
-        this.keyStoreType = keyStoreType;
-    }
-
-    byte[] convertKeystore(List<String> certificateChain, Password password, String alias, PrivateKey privateKey)
-            throws PemConversionException {
-        LOGGER.info("Conversion of PEM certificates to " + keyStoreType + " keystore");
-        return convert(certificateChain, password, certs -> getKeyStore(alias, password, certs, privateKey));
-    }
-
-    byte[] convertTruststore(List<String> trustAnchors, Password password, String alias)
-            throws PemConversionException {
-        LOGGER.info("Conversion of PEM certificates to " + keyStoreType + " truststore");
-        return convert(trustAnchors, password, certs -> getTrustStore(alias, certs));
-    }
-
-    private byte[] convert(List<String> certificates, Password password, StoreEntryOperation operation)
-            throws PemConversionException {
-        checkPassword(password);
-        final Certificate[] X509Certificates = convertToCertificateArray(certificates);
-        return getKeyStoreBytes(password, operation, X509Certificates);
-    }
-
-    private void checkPassword(Password password) throws PemConversionException {
-        if (!password.isCorrectPasswordPattern()) {
-            LOGGER.error(PASSWORD_ERROR_MSG);
-            throw new PemConversionException(PASSWORD_ERROR_MSG);
-        }
-    }
-
-    private byte[] getKeyStoreBytes(Password password, StoreEntryOperation op, Certificate[] x509Certificates)
-            throws PemConversionException {
-        try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
-            KeyStore ks = op.getStore(x509Certificates);
-            ks.store(bos, password.toCharArray());
-            return bos.toByteArray();
-        } catch (IOException | CertificateException | NoSuchAlgorithmException | KeyStoreException e) {
-            LOGGER.error("Pem to " + keyStoreType + " converter failed, exception message: {}", e.getMessage());
-            throw new PemConversionException(e);
-        }
-    }
-
-    private KeyStore getKeyStore(String alias, Password password, Certificate[] certificates, PrivateKey privateKey)
-            throws KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException {
-        KeyStore ks = getKeyStoreInstance();
-        ks.setKeyEntry(alias, privateKey, password.toCharArray(), certificates);
-        return ks;
-    }
-
-    private KeyStore getTrustStore(String alias, Certificate[] certificates)
-            throws KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException {
-        KeyStore ks = getKeyStoreInstance();
-        long index = 1L;
-        for (Certificate c : certificates) {
-            ks.setCertificateEntry(alias + index++, c);
-        }
-        return ks;
-    }
-
-    private KeyStore getKeyStoreInstance()
-            throws KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException {
-        KeyStore ks = KeyStore.getInstance(keyStoreType);
-        ks.load(EMPTY_KEYSTORE_CONFIGURATION);
-        return ks;
-    }
-
-    private Certificate[] convertToCertificateArray(List<String> certificates)
-            throws PemConversionException {
-        Certificate[] parsedCertificates = new Certificate[certificates.size()];
-        for (String certificate : certificates) {
-            parsedCertificates[certificates.indexOf(certificate)] = parseCertificate(certificate);
-        }
-        return parsedCertificates;
-    }
-
-    private Certificate parseCertificate(String certificate) throws PemConversionException {
-        try (PEMParser pem = new PEMParser(new StringReader(certificate))) {
-            X509CertificateHolder certHolder = Optional.ofNullable((X509CertificateHolder) pem.readObject())
-                    .orElseThrow(
-                            () -> new PemConversionException("The certificate couldn't be parsed correctly. " + certificate));
-            return new JcaX509CertificateConverter()
-                    .setProvider(new BouncyCastleProvider())
-                    .getCertificate(certHolder);
-        } catch (IOException | CertificateException e) {
-            LOGGER.error("Certificates conversion failed, exception message: {}", e.getMessage());
-            throw new PemConversionException(e);
-        }
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGenerator.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGenerator.java
deleted file mode 100644
index 8ad85d2c..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGenerator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.conversion;
-
-import org.apache.commons.lang3.RandomStringUtils;
-
-import java.security.SecureRandom;
-
-class RandomPasswordGenerator {
-
-    private static final String ALPHA = "abcdefghijklmnopqrstuvwxyz";
-    private static final String NUMBERS = "0123456789";
-    private static final String SPECIAL_CHARS = "_$#";
-    private static final char[] SET_OF_CHARS = (ALPHA + ALPHA.toUpperCase() + NUMBERS + SPECIAL_CHARS).toCharArray();
-    private static final char START_POSITION_IN_ASCII_CHARS = 0;
-    private static final char END_POSITION_IN_ASCII_CHARS = 0;
-    private static final boolean USE_LETTERS_ONLY = false;
-    private static final boolean USE_NUMBERS_ONLY = false;
-
-    // We are excluding this line in Sonar due to fact that
-    //we are using new SecureRandom which provides
-    //cryptographic security
-    Password generate(int passwordLength) {
-        return new Password(RandomStringUtils.random(//NOSONAR
-                passwordLength,
-                START_POSITION_IN_ASCII_CHARS,
-                END_POSITION_IN_ASCII_CHARS,
-                USE_LETTERS_ONLY,
-                USE_NUMBERS_ONLY,
-                SET_OF_CHARS,
-                new SecureRandom())
-        );
-    }
-}
-
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/StoreEntryOperation.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/StoreEntryOperation.java
deleted file mode 100644
index 7a41d1fe..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/StoreEntryOperation.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.conversion;
-
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-
-@FunctionalInterface
-public interface StoreEntryOperation {
-
-    KeyStore getStore(Certificate[] certificates)
-            throws CertificateException, NoSuchAlgorithmException, KeyStoreException, IOException;
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertFileWriterException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertFileWriterException.java
deleted file mode 100644
index 7912f6d7..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertFileWriterException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class CertFileWriterException extends ExitableException {
-
-    public CertFileWriterException(Throwable cause) {
-        super(cause);
-    }
-
-    @Override
-    public ExitStatus applicationExitStatus() {
-        return ExitStatus.FILE_CREATION_EXCEPTION;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CsrGenerationException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CsrGenerationException.java
deleted file mode 100644
index ba501cd6..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CsrGenerationException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class CsrGenerationException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.CSR_GENERATION_EXCEPTION;
-
-    public CsrGenerationException(Throwable cause) {
-        super(cause);
-    }
-
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/KeyPairGenerationException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/KeyPairGenerationException.java
deleted file mode 100644
index 11030ff3..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/KeyPairGenerationException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class KeyPairGenerationException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.KEY_PAIR_GENERATION_EXCEPTION;
-
-    public KeyPairGenerationException(String errorMessage) {
-        super(errorMessage);
-    }
-
-
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PemConversionException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PemConversionException.java
deleted file mode 100644
index cad3388b..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PemConversionException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class PemConversionException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.PEM_CONVERSION_EXCEPTION;
-
-    public PemConversionException(Throwable cause) {
-        super(cause);
-    }
-
-    public PemConversionException(String message) {
-        super(message);
-    }
-
-    @Override
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PkEncodingException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PkEncodingException.java
deleted file mode 100644
index 89976bf3..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/PkEncodingException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class PkEncodingException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.PK_TO_PEM_ENCODING_EXCEPTION;
-
-    public PkEncodingException(Throwable cause) {
-        super(cause);
-    }
-
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriter.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriter.java
deleted file mode 100644
index fec3ebd3..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriter.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.certification.writer;
-
-import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Path;
-
-public class CertFileWriter {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CertFileWriter.class);
-    private final String destPath;
-
-    private CertFileWriter(String destPath) {
-        this.destPath = destPath;
-    }
-
-    public static CertFileWriter createWithDir(String destPath) {
-        createDirIfNotExists(destPath);
-        return new CertFileWriter(destPath);
-    }
-
-    public void saveData(byte[] data, String filename) throws CertFileWriterException {
-        LOGGER.debug("Attempt to save file {} in path {}", filename, destPath);
-        try (FileOutputStream outputStream = new FileOutputStream(Path.of(destPath, filename).toString())) {
-            outputStream.write(data);
-        } catch (IOException e) {
-            LOGGER.error("File creation failed, exception message: {}", e.getMessage());
-            throw new CertFileWriterException(e);
-        }
-    }
-
-    private static void createDirIfNotExists(String destPath) {
-        File destFolderPath = new File(destPath);
-        if (!destFolderPath.exists()) {
-            LOGGER.debug("Destination path not exists, subdirectories are created");
-            destFolderPath.mkdirs();
-        }
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/common/Base64Encoder.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/common/Base64Encoder.java
deleted file mode 100644
index bfa43071..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/common/Base64Encoder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.common;
-
-import org.bouncycastle.util.encoders.Base64;
-
-public class Base64Encoder {
-    public String encode(String string) {
-        return new String(Base64.encode(string.getBytes()));
-    }
-}
\ No newline at end of file
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/ClientConfigurationEnvs.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/ClientConfigurationEnvs.java
deleted file mode 100644
index f8a0e91a..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/ClientConfigurationEnvs.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration;
-
-public enum ClientConfigurationEnvs {
-    REQUEST_URL,
-    REQUEST_TIMEOUT,
-    OUTPUT_PATH,
-    CA_NAME,
-    OUTPUT_TYPE
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/CsrConfigurationEnvs.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/CsrConfigurationEnvs.java
deleted file mode 100644
index d1cfcd5a..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/CsrConfigurationEnvs.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration;
-
-public enum CsrConfigurationEnvs {
-    COMMON_NAME,
-    ORGANIZATION,
-    ORGANIZATION_UNIT,
-    LOCATION,
-    STATE,
-    COUNTRY,
-    SANS
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java
deleted file mode 100644
index 15339bbd..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration;
-
-import java.util.Optional;
-
-public class EnvProvider {
-    public Optional<String> readEnvVariable(String envVariableName) {
-        return Optional.ofNullable(getSystemEnv(envVariableName))
-                .filter(EnvProvider::isEnvPresent);
-    }
-
-    String getSystemEnv(String envVariableName) {
-        return System.getenv(envVariableName);
-    }
-
-    private static Boolean isEnvPresent(String envValue) {
-        return !"".equals(envValue);
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java
deleted file mode 100644
index 9321964c..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForClient.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration;
-
-import java.util.Optional;
-
-public class EnvsForClient {
-    private final EnvProvider envProvider = new EnvProvider();
-
-    public Optional<String> getUrlToCertService() {
-        return readEnv(ClientConfigurationEnvs.REQUEST_URL);
-    }
-
-    public Optional<String> getRequestTimeOut() {
-        return readEnv(ClientConfigurationEnvs.REQUEST_TIMEOUT);
-    }
-
-    public Optional<String> getOutputPath() {
-        return readEnv(ClientConfigurationEnvs.OUTPUT_PATH);
-    }
-
-    public Optional<String> getCaName() {
-        return readEnv(ClientConfigurationEnvs.CA_NAME);
-    }
-
-    public Optional<String> getOutputType() {
-        return readEnv(ClientConfigurationEnvs.OUTPUT_TYPE);
-    }
-
-    private Optional<String> readEnv(ClientConfigurationEnvs envName) {
-        return envProvider.readEnvVariable(envName.toString());
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java
deleted file mode 100644
index 9a892b24..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForCsr.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration;
-
-import java.util.Optional;
-
-public class EnvsForCsr {
-    private final EnvProvider envProvider = new EnvProvider();
-
-    public Optional<String> getCommonName() {
-        return readEnv(CsrConfigurationEnvs.COMMON_NAME);
-    }
-
-    public Optional<String> getOrganization() {
-        return readEnv(CsrConfigurationEnvs.ORGANIZATION);
-    }
-
-    public Optional<String> getOrganizationUnit() {
-        return readEnv(CsrConfigurationEnvs.ORGANIZATION_UNIT);
-    }
-
-    public Optional<String> getLocation() {
-        return readEnv(CsrConfigurationEnvs.LOCATION);
-    }
-
-    public Optional<String> getState() {
-        return readEnv(CsrConfigurationEnvs.STATE);
-    }
-
-    public Optional<String> getCountry() {
-        return readEnv(CsrConfigurationEnvs.COUNTRY);
-    }
-
-    public Optional<String> getSubjectAlternativesName() {
-        return readEnv(CsrConfigurationEnvs.SANS);
-    }
-
-    Optional<String> readEnv(CsrConfigurationEnvs envName) {
-        return envProvider.readEnvVariable(envName.toString());
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForTls.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForTls.java
deleted file mode 100644
index 55b536a7..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvsForTls.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration;
-
-import java.util.Optional;
-
-public class EnvsForTls {
-    private final EnvProvider envProvider = new EnvProvider();
-
-    public Optional<String> getKeystorePath() {
-        return readEnv(TlsConfigurationEnvs.KEYSTORE_PATH);
-    }
-
-    public Optional<String> getKeystorePassword() {
-        return readEnv(TlsConfigurationEnvs.KEYSTORE_PASSWORD);
-    }
-
-    public Optional<String> getTruststorePath() {
-        return readEnv(TlsConfigurationEnvs.TRUSTSTORE_PATH);
-    }
-
-    public Optional<String> getTruststorePassword() {
-        return readEnv(TlsConfigurationEnvs.TRUSTSTORE_PASSWORD);
-    }
-
-    Optional<String> readEnv(TlsConfigurationEnvs envName) {
-        return envProvider.readEnvVariable(envName.toString());
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/TlsConfigurationEnvs.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/TlsConfigurationEnvs.java
deleted file mode 100644
index 4009a088..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/TlsConfigurationEnvs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration;
-
-public enum TlsConfigurationEnvs {
-    KEYSTORE_PATH,
-    KEYSTORE_PASSWORD,
-    TRUSTSTORE_PATH,
-    TRUSTSTORE_PASSWORD
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java
deleted file mode 100644
index ea280736..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/ClientConfigurationException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class ClientConfigurationException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.CLIENT_CONFIGURATION_EXCEPTION;
-
-    public ClientConfigurationException(String message) {
-        super(message);
-    }
-
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java
deleted file mode 100644
index cf785a71..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/CsrConfigurationException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class CsrConfigurationException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.CSR_CONFIGURATION_EXCEPTION;
-
-    public CsrConfigurationException(String message) {
-        super(message);
-    }
-
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationException.java
deleted file mode 100644
index 91f164e3..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class TlsConfigurationException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.TLS_CONFIGURATION_EXCEPTION;
-
-    public TlsConfigurationException(String message) {
-        super(message);
-    }
-
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java
deleted file mode 100644
index 24ed8b0d..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.factory;
-
-
-import org.onap.aaf.certservice.client.certification.ArtifactsCreatorProvider;
-import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException;
-import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException;
-import org.onap.aaf.certservice.client.configuration.model.ConfigurationModel;
-
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.regex.Pattern;
-
-public abstract class AbstractConfigurationFactory<T extends ConfigurationModel> {
-
-    abstract T create() throws ClientConfigurationException, CsrConfigurationException;
-
-    public boolean isPathValid(String path) {
-        return path.matches("^/|(/[a-zA-Z0-9_-]+)+/?$");
-    }
-
-    public boolean isAlphaNumeric(String caName) {
-        return caName.matches("^[a-zA-Z0-9]*$");
-    }
-
-    public boolean isCommonNameValid(String commonName) {
-        return !isSpecialCharsPresent(commonName)
-                && !isHttpProtocolsPresent(commonName)
-                && !isIpAddressPresent(commonName)
-                && !isPortNumberPresent(commonName);
-    }
-
-    public boolean isSpecialCharsPresent(String stringToCheck) {
-        return Pattern.compile("[~#@*$+%!()?/{}<>\\|_^]").matcher(stringToCheck).find();
-    }
-
-    public boolean isCountryValid(String country) {
-        return Arrays.asList(Locale.getISOCountries()).contains(country);
-    }
-
-    public boolean isOutputTypeValid(String outputType) {
-        return Arrays.stream(ArtifactsCreatorProvider.values())
-                .map(ArtifactsCreatorProvider::toString)
-                .anyMatch(name -> name.equals(outputType));
-    }
-
-    private boolean isPortNumberPresent(String stringToCheck) {
-        return Pattern.compile(":[0-9]{1,5}").matcher(stringToCheck).find();
-    }
-
-    private boolean isIpAddressPresent(String stringToCheck) {
-        return Pattern.compile("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}").matcher(stringToCheck).find();
-    }
-
-    private boolean isHttpProtocolsPresent(String stringToCheck) {
-        return Pattern.compile("[h][t][t][p][:][/][/]|[h][t][t][p][s][:][/][/]").matcher(stringToCheck).find();
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java
deleted file mode 100644
index d8498d84..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.factory;
-
-import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.EnvsForClient;
-import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException;
-import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Optional;
-
-public class ClientConfigurationFactory extends AbstractConfigurationFactory<ClientConfiguration> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ClientConfigurationFactory.class);
-    private final EnvsForClient envsForClient;
-
-    public ClientConfigurationFactory(EnvsForClient envsForClient) {
-        this.envsForClient = envsForClient;
-    }
-
-    @Override
-    public ClientConfiguration create() throws ClientConfigurationException {
-
-        ClientConfiguration configuration = new ClientConfiguration();
-
-
-        envsForClient.getUrlToCertService()
-                .map(configuration::setUrlToCertService);
-
-        envsForClient.getRequestTimeOut()
-                .map(timeout -> configuration.setRequestTimeout(Integer.valueOf(timeout)));
-
-        envsForClient.getOutputPath()
-                .filter(this::isPathValid)
-                .map(configuration::setCertsOutputPath)
-                .orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.OUTPUT_PATH + " is invalid."));
-
-        envsForClient.getCaName()
-                .filter(this::isAlphaNumeric)
-                .map(configuration::setCaName)
-                .orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.CA_NAME + " is invalid."));
-
-        Optional<String> outputType = envsForClient.getOutputType();
-
-        if (outputType.isPresent()) {
-            outputType.filter(this::isOutputTypeValid)
-                    .map(configuration::setOutputType)
-                    .orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.OUTPUT_TYPE + " is invalid."));
-        }
-
-        LOGGER.info("Successful validation of Client configuration. Configuration data: {}", configuration.toString());
-
-        return configuration;
-    }
-}
-
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactory.java
deleted file mode 100644
index 1d4cf2b2..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.factory;
-
-import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.EnvsForCsr;
-import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException;
-import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class CsrConfigurationFactory extends AbstractConfigurationFactory<CsrConfiguration> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CsrConfigurationFactory.class);
-    private final EnvsForCsr envsForCsr;
-
-    public CsrConfigurationFactory(EnvsForCsr envsForCsr) {
-        this.envsForCsr = envsForCsr;
-    }
-
-    @Override
-    public CsrConfiguration create() throws CsrConfigurationException {
-
-        CsrConfiguration configuration = new CsrConfiguration();
-
-        envsForCsr.getCommonName()
-                .filter(this::isCommonNameValid)
-                .map(configuration::setCommonName)
-                .orElseThrow(() -> new CsrConfigurationException(CsrConfigurationEnvs.COMMON_NAME + " is invalid."));
-
-        envsForCsr.getOrganization()
-                .filter(org -> !isSpecialCharsPresent(org))
-                .map(configuration::setOrganization)
-                .orElseThrow(() -> new CsrConfigurationException(CsrConfigurationEnvs.ORGANIZATION + " is invalid."));
-
-        envsForCsr.getState()
-                .map(configuration::setState)
-                .orElseThrow(() -> new CsrConfigurationException(CsrConfigurationEnvs.STATE + " is invalid."));
-
-        envsForCsr.getCountry()
-                .filter(this::isCountryValid)
-                .map(configuration::setCountry)
-                .orElseThrow(() -> new CsrConfigurationException(CsrConfigurationEnvs.COUNTRY + " is invalid."));
-
-        envsForCsr.getOrganizationUnit()
-                .map(configuration::setOrganizationUnit);
-
-        envsForCsr.getLocation()
-                .map(configuration::setLocation);
-
-        envsForCsr.getSubjectAlternativesName()
-                .map(configuration::setSubjectAlternativeNames);
-
-        LOGGER.info("Successful validation of CSR configuration. Configuration data: {}", configuration.toString());
-
-        return configuration;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactory.java
deleted file mode 100644
index 7da8fa58..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.factory;
-
-import org.apache.http.ssl.SSLContexts;
-import org.onap.aaf.certservice.client.configuration.EnvsForTls;
-import org.onap.aaf.certservice.client.configuration.TlsConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.exception.TlsConfigurationException;
-
-import javax.net.ssl.SSLContext;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-
-public class SslContextFactory {
-
-    private static final String JKS = "jks";
-
-    private EnvsForTls envsForTls;
-
-    public SslContextFactory(EnvsForTls envsForTls) {
-        this.envsForTls = envsForTls;
-    }
-
-    public SSLContext create() throws TlsConfigurationException {
-        String keystorePath = envsForTls.getKeystorePath()
-                .orElseThrow(() -> new TlsConfigurationException(createEnvMissingMessage(TlsConfigurationEnvs.KEYSTORE_PATH)));
-        String keystorePassword = envsForTls.getKeystorePassword()
-                .orElseThrow(() -> new TlsConfigurationException(createEnvMissingMessage(TlsConfigurationEnvs.KEYSTORE_PASSWORD)));
-        String truststorePath = envsForTls.getTruststorePath()
-                .orElseThrow(() -> new TlsConfigurationException(createEnvMissingMessage(TlsConfigurationEnvs.TRUSTSTORE_PATH)));
-        String truststorePassword = envsForTls.getTruststorePassword()
-                .orElseThrow(() -> new TlsConfigurationException(createEnvMissingMessage(TlsConfigurationEnvs.TRUSTSTORE_PASSWORD)));
-
-        return createSslContext(keystorePath, keystorePassword, truststorePath, truststorePassword);
-    }
-
-    private String createEnvMissingMessage(TlsConfigurationEnvs keystorePath) {
-        return String.format("%s env is missing.", keystorePath);
-    }
-
-    private KeyStore setupKeystore(String keystorePath, String certPassword)
-            throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
-        KeyStore keyStore = KeyStore.getInstance(JKS);
-        FileInputStream identityKeyStoreFile = new FileInputStream(new File(
-                keystorePath));
-        keyStore.load(identityKeyStoreFile, certPassword.toCharArray());
-        return keyStore;
-    }
-
-    private SSLContext createSslContext(String keystorePath, String keystorePassword, String truststorePath, String truststorePassword) throws TlsConfigurationException {
-        try {
-            KeyStore identityKeystore = setupKeystore(keystorePath, keystorePassword);
-            KeyStore trustKeystore = setupKeystore(truststorePath, truststorePassword);
-
-            return SSLContexts.custom()
-                    .loadKeyMaterial(identityKeystore, keystorePassword.toCharArray())
-                    .loadTrustMaterial(trustKeystore, null)
-                    .build();
-        } catch (Exception e) {
-            throw new TlsConfigurationException("TLS configuration exception: " + e);
-        }
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java
deleted file mode 100644
index 78fa1b4b..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.model;
-
-import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
-
-public class ClientConfiguration implements ConfigurationModel {
-
-    private static final Integer DEFAULT_TIMEOUT_MS = 30000;
-    private static final String DEFAULT_REQUEST_URL = "https://aaf-cert-service:8443/v1/certificate/";
-    private static final String DEFAULT_OUTPUT_TYPE = "P12";
-
-    private String urlToCertService;
-    private Integer requestTimeout;
-    private String certsOutputPath;
-    private String caName;
-    private String outputType;
-
-
-    public ClientConfiguration() {
-        urlToCertService = DEFAULT_REQUEST_URL;
-        requestTimeout = DEFAULT_TIMEOUT_MS;
-        outputType = DEFAULT_OUTPUT_TYPE;
-    }
-
-
-    public String getUrlToCertService() {
-        return urlToCertService;
-    }
-
-    public ClientConfiguration setUrlToCertService(String urlToCertService) {
-        this.urlToCertService = urlToCertService;
-        return this;
-    }
-
-    public Integer getRequestTimeout() {
-        return requestTimeout;
-    }
-
-    public ClientConfiguration setRequestTimeout(Integer requestTimeout) {
-        this.requestTimeout = requestTimeout;
-        return this;
-    }
-
-    public String getCertsOutputPath() {
-        return certsOutputPath;
-    }
-
-    public ClientConfiguration setCertsOutputPath(String certsOutputPath) {
-        this.certsOutputPath = certsOutputPath;
-        return this;
-    }
-
-    public String getCaName() {
-        return caName;
-    }
-
-    public ClientConfiguration setCaName(String caName) {
-        this.caName = caName;
-        return this;
-    }
-
-    public String getOutputType() {
-        return outputType;
-    }
-
-    public ClientConfiguration setOutputType(String outputType) {
-        this.outputType = outputType;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("%s: %s, %s: %s, %s: %s, %s: %s, %s: %s",
-                ClientConfigurationEnvs.REQUEST_URL, urlToCertService,
-                ClientConfigurationEnvs.REQUEST_TIMEOUT, requestTimeout,
-                ClientConfigurationEnvs.OUTPUT_PATH, certsOutputPath,
-                ClientConfigurationEnvs.CA_NAME, caName,
-                ClientConfigurationEnvs.OUTPUT_TYPE, outputType);
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java
deleted file mode 100644
index 15c22233..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.model;
-
-public interface ConfigurationModel {
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java
deleted file mode 100644
index 55f33c9f..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.configuration.model;
-
-
-import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs;
-
-public class CsrConfiguration implements ConfigurationModel {
-
-    private String commonName;
-    private String organization;
-    private String state;
-    private String country;
-    private String organizationUnit;
-    private String location;
-    private String sans;
-
-
-    public String getCommonName() {
-        return commonName;
-    }
-
-    public CsrConfiguration setCommonName(String commonName) {
-        this.commonName = commonName;
-        return this;
-    }
-
-    public String getOrganization() {
-        return organization;
-    }
-
-    public CsrConfiguration setOrganization(String organization) {
-        this.organization = organization;
-        return this;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public CsrConfiguration setState(String state) {
-        this.state = state;
-        return this;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public CsrConfiguration setCountry(String country) {
-        this.country = country;
-        return this;
-    }
-
-    public String getOrganizationUnit() {
-        return organizationUnit;
-    }
-
-    public CsrConfiguration setOrganizationUnit(String organizationUnit) {
-        this.organizationUnit = organizationUnit;
-        return this;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public CsrConfiguration setLocation(String location) {
-        this.location = location;
-        return this;
-    }
-
-    public String getSans() {
-        return sans;
-    }
-
-    public CsrConfiguration setSubjectAlternativeNames(String subjectAlternativeNames) {
-        this.sans = subjectAlternativeNames;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("%s: %s, %s: %s, %s: %s, %s: %s, %s: %s, %s: %s, %s: %s",
-                CsrConfigurationEnvs.COMMON_NAME, commonName,
-                CsrConfigurationEnvs.COUNTRY, country,
-                CsrConfigurationEnvs.STATE, state,
-                CsrConfigurationEnvs.ORGANIZATION, organization,
-                CsrConfigurationEnvs.ORGANIZATION_UNIT, organizationUnit,
-                CsrConfigurationEnvs.LOCATION, location,
-                CsrConfigurationEnvs.SANS, sans);
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpsClientProvider.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpsClientProvider.java
deleted file mode 100644
index 3b7a46ab..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpsClientProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.httpclient;
-
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import javax.net.ssl.SSLContext;
-
-public class CloseableHttpsClientProvider {
-
-    private final int timeout;
-    private final SSLContext sslContext;
-
-    public CloseableHttpsClientProvider(SSLContext sslContext, int timeout) {
-        this.sslContext = sslContext;
-        this.timeout = timeout;
-    }
-
-    public CloseableHttpClient getClient() {
-        RequestConfig config =
-                RequestConfig.custom()
-                        .setConnectionRequestTimeout(timeout)
-                        .setConnectTimeout(timeout)
-                        .setSocketTimeout(timeout)
-                        .build();
-
-        return HttpClientBuilder.create()
-                .setSSLContext(sslContext)
-                .setDefaultRequestConfig(config).build();
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java
deleted file mode 100644
index 0780afad..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.httpclient;
-
-import com.google.gson.Gson;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.onap.aaf.certservice.client.httpclient.exception.CertServiceApiResponseException;
-import org.onap.aaf.certservice.client.httpclient.exception.HttpClientException;
-import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse;
-import org.onap.aaf.certservice.client.httpclient.model.ErrorCertServiceResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-public class HttpClient {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(HttpClient.class);
-    private static final String CSR_HEADER_NAME = "CSR";
-    private static final String PK_HEADER_NAME = "PK";
-    private static final String CHARSET_UTF_8 = "UTF-8";
-
-    private final Gson gson = new Gson();
-    private final CloseableHttpsClientProvider httpClientProvider;
-    private final String certServiceAddress;
-
-    public HttpClient(CloseableHttpsClientProvider httpClientProvider, String certServiceAddress) {
-        this.httpClientProvider = httpClientProvider;
-        this.certServiceAddress = certServiceAddress;
-    }
-
-    public CertServiceResponse retrieveCertServiceData(String caName, String csr, String encodedPk)
-            throws CertServiceApiResponseException, HttpClientException {
-
-        try (CloseableHttpClient httpClient = httpClientProvider.getClient()) {
-            LOGGER.info("Attempt to send request to API, on url: {}{} ", certServiceAddress, caName);
-            HttpResponse httpResponse = httpClient.execute(createHttpRequest(caName, csr, encodedPk));
-            LOGGER.info("Received response from API");
-            return extractCertServiceResponse(httpResponse);
-
-        } catch (IOException e) {
-            LOGGER.error("Failed execute request to API for URL: {}{} , exception message: {}",
-                    certServiceAddress, caName, e.getMessage());
-            throw new HttpClientException(e);
-        }
-    }
-
-    private HttpGet createHttpRequest(String caName, String csr, String pk) {
-        String url = certServiceAddress + caName;
-        HttpGet httpGet = new HttpGet(url);
-        httpGet.addHeader(CSR_HEADER_NAME, csr);
-        httpGet.addHeader(PK_HEADER_NAME, pk);
-        return httpGet;
-    }
-
-    private CertServiceResponse extractCertServiceResponse(HttpResponse httpResponse)
-            throws CertServiceApiResponseException, HttpClientException {
-        int httpResponseCode = getStatusCode(httpResponse);
-        if (HttpStatus.SC_OK != httpResponseCode) {
-            LOGGER.error("Error on API response. Response Code: {}", httpResponseCode);
-            throw generateApiResponseException(httpResponse);
-        }
-        String jsonResponse = getStringResponse(httpResponse.getEntity());
-        return gson.fromJson(jsonResponse, CertServiceResponse.class);
-    }
-
-    private CertServiceApiResponseException generateApiResponseException(HttpResponse httpResponse)
-            throws HttpClientException {
-        String stringResponse = getStringResponse(httpResponse.getEntity());
-        ErrorCertServiceResponse errorCertServiceResponse =
-                gson.fromJson(stringResponse, ErrorCertServiceResponse.class);
-
-        return new CertServiceApiResponseException(getStatusCode(httpResponse), errorCertServiceResponse.getMessage());
-    }
-
-    private int getStatusCode(HttpResponse httpResponse) {
-        return httpResponse.getStatusLine().getStatusCode();
-    }
-
-    private String getStringResponse(HttpEntity httpEntity) throws HttpClientException {
-        try {
-            return EntityUtils.toString(httpEntity, CHARSET_UTF_8);
-        } catch (IOException e) {
-            LOGGER.error("Cannot parse response to string, exception message: {}", e.getMessage());
-            throw new HttpClientException(e);
-        }
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java
deleted file mode 100644
index ad5a5f1c..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.httpclient.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class CertServiceApiResponseException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.CERT_SERVICE_API_CONNECTION_EXCEPTION;
-
-    public CertServiceApiResponseException(int responseCode, String messageFromApi) {
-
-        super(String.format("CertService HTTP unsuccessful response. Response code: %d . Message from Service: %s",
-                responseCode,
-                messageFromApi));
-    }
-
-    @Override
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java
deleted file mode 100644
index e9f0f0ad..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.httpclient.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class HttpClientException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.HTTP_CLIENT_EXCEPTION;
-
-    public HttpClientException(Throwable cause) {
-        super(cause);
-    }
-
-    @Override
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/CertServiceResponse.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/CertServiceResponse.java
deleted file mode 100644
index 4ca17999..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/CertServiceResponse.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.httpclient.model;
-
-import java.util.Collections;
-import java.util.List;
-
-public class CertServiceResponse {
-
-    private final List<String> certificateChain;
-    private final List<String> trustedCertificates;
-
-    public CertServiceResponse(List<String> certificateChain, List<String> trustedCertificates) {
-        this.certificateChain = certificateChain;
-        this.trustedCertificates = trustedCertificates;
-    }
-
-    public List<String> getCertificateChain() {
-        return Collections.unmodifiableList(certificateChain);
-    }
-
-    public List<String> getTrustedCertificates() {
-        return Collections.unmodifiableList(trustedCertificates);
-    }
-
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java
deleted file mode 100644
index 4a9efcb4..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * 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.client.httpclient.model;
-
-public class ErrorCertServiceResponse {
-
-    private final String errorMessage;
-
-    public ErrorCertServiceResponse(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-    public String getMessage() {
-        return errorMessage;
-    }
-
-}
diff --git a/certServiceClient/src/main/resources/log4j2.xml b/certServiceClient/src/main/resources/log4j2.xml
deleted file mode 100644
index bf4b6239..00000000
--- a/certServiceClient/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Configuration status="INFO">
-
-    <Appenders>
-        <Console name="CONSOLE" target="SYSTEM_OUT">
-            <PatternLayout
-                    pattern="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red blink, ERROR=red, WARN=yellow bold, INFO=green, DEBUG=green bold, TRACE=blue} %style{%pid}{magenta} [%15.15t] %style{%-40.40C{1.}}{cyan} : %m%n%throwable"/>
-        </Console>
-
-        <RollingFile fileName="var/log/onap/aaf/certservice-client/certservice-client.log"
-                     filePattern="logs/certservice-client-%d{yyyy-MM-dd}-%i.log" name="ROLLING_FILE">
-            <PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="64 MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="10"/>
-        </RollingFile>
-
-    </Appenders>
-
-    <Loggers>
-
-        <Logger name="reactor.netty" level="WARN"/>
-        <Logger name="reactor.netty.tcp.TcpServer" level="OFF"/>
-        <Logger name="io.netty" level="INFO"/>
-        <Logger name="io.netty.util" level="WARN"/>
-
-        <Root level="DEBUG">
-            <AppenderRef ref="CONSOLE"/>
-            <AppenderRef ref="ROLLING_FILE"/>
-        </Root>
-
-    </Loggers>
-</Configuration>
\ No newline at end of file