AAI tasks added

- aaiClients spllitted for consuming and producing
- http removed from names of all clients and interfaces
- HttpRequestDetails added as a second parameter for tasks
- parameters required from dmaap consumer
 - pnf-name for URI (get request -> aaiConsumer)
 - pnf-name and ipv4-oam (and or ipv6-oam)
   (patch request -> aaiProducer)

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

1 files changed, 0 insertions, 188 deletions

diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClientImpl.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClientImpl.java
deleted file mode 100644
index 20ae8d0b..00000000
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClientImpl.java
+++ /dev/null
@@ -1,188 +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.service;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPatch;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.onap.dcaegen2.services.config.AAIHttpClientConfiguration;
-import org.onap.dcaegen2.services.utils.HttpRequestDetails;
-import org.onap.dcaegen2.services.utils.HttpUtils;
-import org.onap.dcaegen2.services.utils.RequestVerbs;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.lang.NonNull;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Optional;
-
-public class AAIExtendedHttpClientImpl implements AAIExtendedHttpClient {
-
-    Logger logger = LoggerFactory.getLogger(AAIExtendedHttpClientImpl.class);
-
-    private final CloseableHttpClient closeableHttpClient;
-    private final String aaiHost;
-    private final String aaiProtocol;
-    private final Integer aaiHostPortNumber;
-
-
-    public AAIExtendedHttpClientImpl (AAIHttpClientConfiguration aaiHttpClientConfiguration) {
-        final AAIHttpClient aaiHttpClient = new AAIHttpClientImpl(aaiHttpClientConfiguration);
-        closeableHttpClient = aaiHttpClient.getAAIHttpClient();
-        aaiHost = aaiHttpClientConfiguration.aaiHost();
-        aaiProtocol = aaiHttpClientConfiguration.aaiProtocol();
-        aaiHostPortNumber = aaiHttpClientConfiguration.aaiHostPortNumber();
-    }
-
-    @Override
-    public Optional<String> getHttpResponse(HttpRequestDetails requestDetails) {
-
-        Optional<String> extendedDetails = Optional.empty();
-        Optional<HttpRequestBase> request = createRequest(requestDetails);
-
-        try {
-            extendedDetails = closeableHttpClient.execute(request.get(), aaiResponseHandler());
-        } catch (IOException e) {
-            logger.error("Exception while executing HTTP request: {}", e);
-        }
-
-        return extendedDetails;
-    }
-
-    private URI createAAIExtendedURI(final String path, Map<String, String> queryParams) {
-
-        URI extendedURI = null;
-
-        final URIBuilder uriBuilder = new URIBuilder().setScheme(this.aaiProtocol).setHost(this.aaiHost)
-                .setPort(this.aaiHostPortNumber)
-                .setPath(path);
-        final String customQuery = createCustomQuery(queryParams);
-
-        if (StringUtils.isNoneBlank(customQuery)) {
-            uriBuilder.setCustomQuery(customQuery);
-        }
-
-        try {
-            extendedURI = uriBuilder.build();
-            logger.info("Building extended URI: {}", extendedURI);
-        } catch (URISyntaxException e) {
-            logger.error("Exception while building extended URI: {}", e);
-        }
-
-        return extendedURI;
-    }
-
-    private String createCustomQuery(@NonNull final Map<String, String> queryParams) {
-        final StringBuilder queryStringBuilder = new StringBuilder("");
-        final Iterator<Map.Entry<String, String>> queryParamIterator = queryParams.entrySet().iterator();
-
-        while (queryParamIterator.hasNext()) {
-            final Map.Entry<String, String> queryParamsEntry = queryParamIterator.next();
-            queryStringBuilder.append(queryParamsEntry.getKey()).append("=").append(queryParamsEntry.getValue());
-            if (queryParamIterator.hasNext()) {
-                queryStringBuilder.append("&");
-            }
-        }
-
-        return queryStringBuilder.toString();
-    }
-
-    private ResponseHandler<Optional<String>> aaiResponseHandler() {
-        return httpResponse ->  {
-            final int responseCode = httpResponse.getStatusLine().getStatusCode();
-            final HttpEntity responseEntity = httpResponse.getEntity();
-
-            if (HttpUtils.isSuccessfulResponseCode(responseCode) && responseEntity != null) {
-                logger.info("HTTP response successful.");
-                final String aaiResponse = EntityUtils.toString(responseEntity);
-                return Optional.of(aaiResponse);
-            } else {
-                String aaiResponse = responseEntity != null ? EntityUtils.toString(responseEntity) : "";
-                logger.error("HTTP response not successful : {}", aaiResponse);
-                return Optional.empty();
-            }
-        };
-    }
-
-    private HttpRequestBase createHttpRequest(URI extendedURI, HttpRequestDetails httpRequestDetails) {
-        if (isExtendedURINotNull(extendedURI) && (httpRequestDetails.requestVerb().equals(RequestVerbs.GET))) {
-            return new HttpGet(extendedURI);
-        } else if (isExtendedURINotNull(extendedURI) && (httpRequestDetails.requestVerb().equals(RequestVerbs.PUT))) {
-            return new HttpPut(extendedURI);
-        } else if (isExtendedURINotNull(extendedURI) &&
-                isPatchRequestValid(httpRequestDetails.requestVerb(),httpRequestDetails.jsonBody())) {
-            return createHttpPatch(extendedURI, httpRequestDetails.jsonBody());
-        } else {
-            return null;
-        }
-    }
-
-    private Boolean isExtendedURINotNull(URI extendedURI) {
-        return extendedURI != null;
-    }
-
-    private Optional<StringEntity> createStringEntity(Optional<String> jsonBody) {
-        return Optional.of(parseJson(jsonBody).get());
-    }
-
-    private HttpPatch createHttpPatch(URI extendedURI, Optional<String> jsonBody) {
-        HttpPatch httpPatch = new HttpPatch(extendedURI);
-        Optional<StringEntity> stringEntity = createStringEntity(jsonBody);
-        httpPatch.setEntity(stringEntity.get());
-        return httpPatch;
-    }
-
-    private Optional<StringEntity> parseJson(Optional<String> jsonBody) {
-        Optional<StringEntity> stringEntity = Optional.empty();
-
-        try {
-            stringEntity = Optional.of(new StringEntity(jsonBody.get()));
-        } catch (UnsupportedEncodingException e) {
-            logger.error("Exception while parsing JSON: {}", e);
-        }
-
-        return stringEntity;
-    }
-
-    private Boolean isPatchRequestValid(RequestVerbs requestVerb, Optional<String> jsonBody) {
-        return requestVerb == RequestVerbs.PATCH && jsonBody.isPresent();
-    }
-
-    private Optional<HttpRequestBase> createRequest(HttpRequestDetails requestDetails) {
-
-        final URI extendedURI = createAAIExtendedURI(requestDetails.aaiAPIPath(), requestDetails.queryParameters());
-        HttpRequestBase request = createHttpRequest(extendedURI, requestDetails);
-        requestDetails.headers().forEach(request::addHeader);
-        return Optional.of(request);
-    }
-}