Cleaning AAI client after refactor

 - unused AAI consumer Client removal
 - unused AAI consumer Tasks removal

Change-Id: I8188806a13d581ff61e94fcdba6580b199c774a4
Issue-ID: DCAEGEN2-609
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

6 files changed, 0 insertions, 442 deletions

diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiClient.java
deleted file mode 100644
index 2d0f9eca..00000000
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. 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.dcaegen2.services.prh.service;
-
-import org.apache.http.impl.client.CloseableHttpClient;
-
-@FunctionalInterface
-public interface AaiClient {
-    CloseableHttpClient getAaiHttpClient();
-}
-
diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiClientImpl.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiClientImpl.java
deleted file mode 100644
index d9ba7c8e..00000000
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiClientImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. 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.dcaegen2.services.prh.service;
-
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.apache.http.ssl.TrustStrategy;
-import org.onap.dcaegen2.services.prh.config.AaiClientConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class AaiClientImpl implements AaiClient {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private AaiClientConfiguration aaiClientConfig;
-
-
-    AaiClientImpl(AaiClientConfiguration aaiClientConfiguration) {
-        this.aaiClientConfig = aaiClientConfiguration;
-    }
-
-    @Override
-    public CloseableHttpClient getAaiHttpClient() {
-
-        final HttpClientBuilder httpClientBuilder = HttpClients.custom().useSystemProperties();
-        final boolean aaiIgnoreSslCertificateErrors = aaiClientConfig.aaiIgnoreSslCertificateErrors();
-
-        TrustStrategy acceptingTrustStrategy = (cert, authType) -> true;
-
-        if (aaiIgnoreSslCertificateErrors) {
-            try {
-                logger.info("Setting SSL Context for AAI HTTP Client");
-                httpClientBuilder.setSSLContext(new SSLContextBuilder()
-                    .loadTrustMaterial(null, acceptingTrustStrategy)
-                    .build());
-
-            } catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
-                logger.error("Exception while setting SSL Context for AAI HTTP Client: {}", e);
-            }
-
-            httpClientBuilder.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
-        }
-
-        final String aaiUserName = aaiClientConfig.aaiUserName();
-
-        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-
-        if (aaiUserName != null) {
-            final String aaiHost = aaiClientConfig.aaiHost();
-            final Integer aaiHostPortNumber = aaiClientConfig.aaiPort();
-            final String aaiUserPassword = aaiClientConfig.aaiUserPassword();
-            final AuthScope aaiHostPortAuthScope = new AuthScope(aaiHost, aaiHostPortNumber);
-            final Credentials aaiCredentials = new UsernamePasswordCredentials(aaiUserName, aaiUserPassword);
-            credentialsProvider.setCredentials(aaiHostPortAuthScope, aaiCredentials);
-        }
-
-        httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-
-        return httpClientBuilder.build();
-    }
-}
diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiConsumerClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiConsumerClient.java
deleted file mode 100644
index 3cd95f53..00000000
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiConsumerClient.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. 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.dcaegen2.services.prh.service;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.onap.dcaegen2.services.prh.config.AaiClientConfiguration;
-import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
-import org.onap.dcaegen2.services.prh.model.utils.HttpUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class AaiConsumerClient {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private final CloseableHttpClient closeableHttpClient;
-    private final String aaiHost;
-    private final String aaiProtocol;
-    private final Integer aaiHostPortNumber;
-    private final String aaiPath;
-    private final Map<String, String> aaiHeaders;
-
-    /**
-     * A{@literal &}AI client for consuming data from A{@literal &}AI.
-     *
-     * @param aaiClientConfiguration - A{@literal &}AI client config
-     */
-    public AaiConsumerClient(AaiClientConfiguration aaiClientConfiguration) {
-        closeableHttpClient = new AaiClientImpl(aaiClientConfiguration).getAaiHttpClient();
-        aaiHost = aaiClientConfiguration.aaiHost();
-        aaiProtocol = aaiClientConfiguration.aaiProtocol();
-        aaiHostPortNumber = aaiClientConfiguration.aaiPort();
-        aaiPath = aaiClientConfiguration.aaiBasePath() + aaiClientConfiguration.aaiPnfPath();
-        aaiHeaders = aaiClientConfiguration.aaiHeaders();
-    }
-
-    /**
-     * Function which call http client for getting object from A{@literal &}AI.
-     *
-     * @param consumerDmaapModel - helper object for uri generation
-     * @return - status code of operation
-     * @throws IOException - Apache HTTP client exception
-     */
-    public Optional<String> getHttpResponse(ConsumerDmaapModel consumerDmaapModel) throws IOException {
-        Optional<HttpRequestBase> request = createRequest(consumerDmaapModel);
-        try {
-            return closeableHttpClient.execute(request.get(), aaiResponseHandler());
-        } catch (IOException e) {
-            logger.warn("Exception while executing http client: ", e);
-            throw new IOException();
-        }
-    }
-
-    private URI createAaiExtendedUri(String pnfName) {
-
-        URI extendedUri = null;
-
-        final URIBuilder uriBuilder = new URIBuilder()
-            .setScheme(aaiProtocol)
-            .setHost(aaiHost)
-            .setPort(aaiHostPortNumber)
-            .setPath(aaiPath + "/" + pnfName);
-
-        try {
-            extendedUri = uriBuilder.build();
-            logger.trace("Building extended URI: {}", extendedUri);
-        } catch (URISyntaxException e) {
-            logger.warn("Exception while building extended URI: {}", e);
-        }
-
-        return extendedUri;
-    }
-
-    private ResponseHandler<Optional<String>> aaiResponseHandler() {
-        return httpResponse -> {
-            final int responseCode = httpResponse.getStatusLine().getStatusCode();
-            logger.info("Status code of operation: {}", responseCode);
-            final HttpEntity responseEntity = httpResponse.getEntity();
-
-            if (HttpUtils.isSuccessfulResponseCode(responseCode)) {
-                logger.trace("HTTP response successful.");
-                final String aaiResponse = EntityUtils.toString(responseEntity);
-                return Optional.of(aaiResponse);
-            } else {
-                String aaiResponse = responseEntity != null ? EntityUtils.toString(responseEntity) : "";
-                logger.warn("HTTP response not successful : {}", aaiResponse);
-                return Optional.of(String.valueOf(responseCode));
-            }
-        };
-    }
-
-    private HttpRequestBase createHttpRequest(URI extendedUri) {
-        return isExtendedUriNotNull(extendedUri) ? new HttpGet(extendedUri) : null;
-    }
-
-    private Boolean isExtendedUriNotNull(URI extendedUri) {
-        return extendedUri != null;
-    }
-
-    private Optional<HttpRequestBase> createRequest(ConsumerDmaapModel consumerDmaapModel) {
-        final URI extendedUri = createAaiExtendedUri(consumerDmaapModel.getPnfName());
-        HttpRequestBase request = createHttpRequest(extendedUri);
-        aaiHeaders.forEach(Objects.requireNonNull(request)::addHeader);
-        Objects.requireNonNull(request).addHeader("Content-Type", "application/json");
-        return Optional.of(request);
-    }
-}
diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiExtendedHttpClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiExtendedHttpClient.java
deleted file mode 100644
index 8e424fe6..00000000
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiExtendedHttpClient.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. 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.dcaegen2.services.prh.service;
-
-import java.net.URISyntaxException;
-import java.util.Optional;
-
-import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
-
-
-@FunctionalInterface
-public interface AaiExtendedHttpClient {
-
-    Optional<Integer> getHttpResponse(ConsumerDmaapModel consumerDmaapModel) throws URISyntaxException;
-}
diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiConsumerClientTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiConsumerClientTest.java
deleted file mode 100644
index a7b82b5f..00000000
--- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiConsumerClientTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. 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.dcaegen2.services.prh.service;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.onap.dcaegen2.services.prh.config.AaiClientConfiguration;
-import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
-
-class AaiConsumerClientTest {
-
-    private static AaiConsumerClient testedObject;
-    private static AaiClientConfiguration aaiHttpClientConfigurationMock = mock(AaiClientConfiguration.class);
-    private static CloseableHttpClient closeableHttpClientMock = mock(CloseableHttpClient.class);
-    private static final String JSON_MESSAGE = "{ \"pnf-id\": \"example-pnf-id-val-22343\", "
-        + "\"regional-resource-zone\":null, \"ipaddress-v4-oam\": \"11.22.33.44\" }";
-    private static ConsumerDmaapModel consumerDmaapModelMock = mock(ConsumerDmaapModel.class);
-    private static final String PNF_NAME = "nokia-pnf-nhfsadhff";
-
-    @BeforeAll
-    static void setup() throws NoSuchFieldException, IllegalAccessException {
-
-        Map<String, String> aaiHeaders = new HashMap<>();
-        aaiHeaders.put("X-FromAppId", "prh");
-        aaiHeaders.put("X-TransactionId", "9999");
-        aaiHeaders.put("Accept", "application/json");
-        aaiHeaders.put("Authorization", "Basic QUFJOkFBSQ==");
-        aaiHeaders.put("Real-Time", "true");
-        aaiHeaders.put("Content-Type", "application/json");
-
-        when(aaiHttpClientConfigurationMock.aaiHost()).thenReturn("54.45.33.2");
-        when(aaiHttpClientConfigurationMock.aaiProtocol()).thenReturn("https");
-        when(aaiHttpClientConfigurationMock.aaiPort()).thenReturn(1234);
-        when(aaiHttpClientConfigurationMock.aaiUserName()).thenReturn("PRH");
-        when(aaiHttpClientConfigurationMock.aaiUserPassword()).thenReturn("PRH");
-        when(aaiHttpClientConfigurationMock.aaiBasePath()).thenReturn("/aai/v11");
-        when(aaiHttpClientConfigurationMock.aaiPnfPath()).thenReturn("/network/pnfs/pnf");
-        when(aaiHttpClientConfigurationMock.aaiHeaders()).thenReturn(aaiHeaders);
-
-        when(consumerDmaapModelMock.getPnfName()).thenReturn(PNF_NAME);
-
-        testedObject = new AaiConsumerClient(aaiHttpClientConfigurationMock);
-        setField();
-    }
-
-
-    @Test
-    void getExtendedDetails_returnsSuccess() throws IOException {
-
-        when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class)))
-            .thenReturn(Optional.of(JSON_MESSAGE));
-        Optional<String> actualResult = testedObject.getHttpResponse(consumerDmaapModelMock);
-        Assertions.assertEquals(Optional.of(JSON_MESSAGE), actualResult);
-    }
-
-
-    private static void setField() throws NoSuchFieldException, IllegalAccessException {
-        Field field = testedObject.getClass().getDeclaredField("closeableHttpClient");
-        field.setAccessible(true);
-        field.set(testedObject, closeableHttpClientMock);
-    }
-}
diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiHttpClientImplTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiHttpClientImplTest.java
deleted file mode 100644
index ebedc4a0..00000000
--- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiHttpClientImplTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. 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.dcaegen2.services.prh.service;
-
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.onap.dcaegen2.services.prh.config.AaiClientConfiguration;
-
-class AaiHttpClientImplTest {
-
-    private static AaiClientImpl testedObject;
-
-
-    @BeforeAll
-    public static void setup() {
-        AaiClientConfiguration aaiHttpClientConfigurationMock = mock(AaiClientConfiguration.class);
-        when(aaiHttpClientConfigurationMock.aaiHost()).thenReturn("54.45.33.2");
-        when(aaiHttpClientConfigurationMock.aaiProtocol()).thenReturn("https");
-        when(aaiHttpClientConfigurationMock.aaiPort()).thenReturn(1234);
-        when(aaiHttpClientConfigurationMock.aaiUserName()).thenReturn("PNF");
-        when(aaiHttpClientConfigurationMock.aaiUserPassword()).thenReturn("PNF");
-        when(aaiHttpClientConfigurationMock.aaiIgnoreSslCertificateErrors()).thenReturn(true);
-
-        testedObject  = new AaiClientImpl(aaiHttpClientConfigurationMock);
-    }
-
-    @Test
-    public void getAaiHttpClientObject_shouldNotBeNull() {
-        assertNotNull(testedObject.getAaiHttpClient());
-    }
-}
-