From 5005d7463fb8ef25f0b4e975d4392367037c7239 Mon Sep 17 00:00:00 2001 From: wasala Date: Wed, 8 Aug 2018 13:39:14 +0200 Subject: Reactive A&AI client *plugged reactiveHttpClient in prh workflow *added junit tests for workflow Change-Id: I74f3fa7354de9b0f7f164c070ea61b70e74bde23 Issue-ID: DCAEGEN2-609 Signed-off-by: wasala --- .../services/prh/service/AaiProducerClient.java | 145 --------------------- 1 file changed, 145 deletions(-) delete mode 100644 prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiProducerClient.java (limited to 'prh-aai-client/src/main') diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiProducerClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiProducerClient.java deleted file mode 100644 index b5368c6d..00000000 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiProducerClient.java +++ /dev/null @@ -1,145 +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.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Base64; -import java.util.Map; -import java.util.Optional; - -import java.util.function.Predicate; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPatch; -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.prh.config.AaiClientConfiguration; -import org.onap.dcaegen2.services.prh.model.CommonFunctions; -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 AaiProducerClient implements AaiExtendedHttpClient { - - private static final String EXCEPTION_MESSAGE = "Exception while executing http client: "; - private static Predicate isEmpty = String::isEmpty; - 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 aaiHeaders; - private final String aaiUserName; - private final String aaiUserPassword; - - /** - * A{@literal &}AI client for publishing data to A{@literal &}AI. - * - * @param aaiClientConfiguration - confiuration for A{@literal &}AI - */ - public AaiProducerClient(AaiClientConfiguration aaiClientConfiguration) { - closeableHttpClient = new AaiClientImpl(aaiClientConfiguration).getAaiHttpClient(); - aaiHost = aaiClientConfiguration.aaiHost(); - aaiProtocol = aaiClientConfiguration.aaiProtocol(); - aaiHostPortNumber = aaiClientConfiguration.aaiPort(); - aaiPath = aaiClientConfiguration.aaiBasePath() + aaiClientConfiguration.aaiPnfPath(); - aaiHeaders = aaiClientConfiguration.aaiHeaders(); - aaiUserName = aaiClientConfiguration.aaiUserName(); - aaiUserPassword = aaiClientConfiguration.aaiUserPassword(); - } - - - @Override - public Optional getHttpResponse(ConsumerDmaapModel consumerDmaapModel) throws URISyntaxException { - return createRequest(consumerDmaapModel).flatMap(httpRequestBase -> { - try { - return closeableHttpClient.execute(httpRequestBase, this::handleResponse); - } catch (IOException e) { - logger.warn(EXCEPTION_MESSAGE, e); - return Optional.empty(); - } - }); - } - - private Optional createRequest(ConsumerDmaapModel consumerDmaapModel) throws URISyntaxException { - final URI extendedUri = createAaiExtendedUri(consumerDmaapModel.getPnfName()); - return createHttpRequest(extendedUri, consumerDmaapModel); - } - - private URI createAaiExtendedUri(final String pnfName) throws URISyntaxException { - return new URIBuilder() - .setScheme(aaiProtocol) - .setHost(aaiHost) - .setPort(aaiHostPortNumber) - .setPath(aaiPath + "/" + pnfName).build(); - } - - private Optional createHttpRequest(URI extendedUri, ConsumerDmaapModel consumerDmaapModel) { - return Optional.ofNullable(CommonFunctions.createJsonBody(consumerDmaapModel)).filter(isEmpty.negate()) - .flatMap(myJson -> { - try { - logger.info("AAI: sending json {}", myJson); - return Optional.of(createHttpPatch(extendedUri, myJson)); - } catch (UnsupportedEncodingException e) { - logger.warn(EXCEPTION_MESSAGE, e); - } - return Optional.empty(); - }); - } - - HttpPatch createHttpPatch(URI extendedUri, String jsonBody) throws UnsupportedEncodingException { - HttpPatch httpPatch = new HttpPatch(extendedUri); - httpPatch.setEntity(new StringEntity(jsonBody)); - aaiHeaders.forEach(httpPatch::addHeader); - httpPatch.addHeader("Content-Type", "application/merge-patch+json"); - httpPatch.addHeader("Authorization", "Basic " + encode()); - return httpPatch; - } - - String encode() throws UnsupportedEncodingException { - return Base64.getEncoder().encodeToString((this.aaiUserName + ":" + this.aaiUserPassword) - .getBytes("UTF-8")); - } - - Optional handleResponse(HttpResponse response) throws IOException { - - final Integer responseCode = response.getStatusLine().getStatusCode(); - logger.info("Status code of operation: {}", responseCode); - final HttpEntity responseEntity = response.getEntity(); - - if (HttpUtils.isSuccessfulResponseCode(responseCode)) { - logger.trace("HTTP response successful."); - return Optional.of(responseCode); - } else { - String aaiResponse = responseEntity != null ? EntityUtils.toString(responseEntity) : ""; - logger.warn("HTTP response not successful : {}", aaiResponse); - return Optional.of(responseCode); - } - } -} -- cgit 1.2.3-korg