From b6bc8925a354825545b8527879e0f687b0dbab3a Mon Sep 17 00:00:00 2001 From: wasala Date: Wed, 23 May 2018 09:53:41 +0200 Subject: Fix sonar issues Change-Id: I61155448422f0084ac08f294452ac90f5b3454aa Issue-ID: DCAEGEN2-396 Signed-off-by: wasala --- .../services/prh/service/AAIConsumerClient.java | 2 +- .../services/prh/service/AAIProducerClient.java | 58 +++++++++++----------- 2 files changed, 29 insertions(+), 31 deletions(-) (limited to 'prh-aai-client/src/main/java/org/onap/dcaegen2') 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 index 99a4a8b2..aa4630b5 100644 --- 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 @@ -94,7 +94,7 @@ public class AAIConsumerClient { private ResponseHandler> aaiResponseHandler() { return httpResponse -> { final int responseCode = httpResponse.getStatusLine().getStatusCode(); - logger.trace("Status code of operation: {}", responseCode); + logger.info("Status code of operation: {}", responseCode); final HttpEntity responseEntity = httpResponse.getEntity(); if (HttpUtils.isSuccessfulResponseCode(responseCode) ) { 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 index 4f48c1c3..bb4d145e 100644 --- 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 @@ -44,6 +44,8 @@ import java.util.Map; import java.util.Optional; public class AAIProducerClient implements AAIExtendedHttpClient { + + private static final String EXCEPTION_MESSAGE = "Exception while executing http client: "; private Logger logger = LoggerFactory.getLogger(AAIProducerClient.class); private final CloseableHttpClient closeableHttpClient; @@ -51,7 +53,7 @@ public class AAIProducerClient implements AAIExtendedHttpClient { private final String aaiProtocol; private final Integer aaiHostPortNumber; private final String aaiPath; - private final Map aaiHeaders; + private final Map aaiHeaders; public AAIProducerClient(AAIClientConfiguration aaiClientConfiguration) { @@ -66,20 +68,15 @@ public class AAIProducerClient implements AAIExtendedHttpClient { @Override public Optional getHttpResponse(ConsumerDmaapModel consumerDmaapModel) throws - URISyntaxException { - try { - return createRequest(consumerDmaapModel).flatMap(x->{ - try { - return closeableHttpClient.execute(x, aaiResponseHandler()); - } catch (IOException e) { - logger.warn("Exception while executing http client: ", e); - return Optional.empty(); - } - }); - } catch (URISyntaxException e ) { - logger.warn("Exception while executing http client: ", e); - throw e; - } + URISyntaxException { + return createRequest(consumerDmaapModel).flatMap(x -> { + try { + return closeableHttpClient.execute(x, aaiResponseHandler()); + } catch (IOException e) { + logger.warn(EXCEPTION_MESSAGE, e); + return Optional.empty(); + } + }); } private Optional createRequest(ConsumerDmaapModel consumerDmaapModel) throws URISyntaxException { @@ -89,16 +86,16 @@ public class AAIProducerClient implements AAIExtendedHttpClient { private URI createAAIExtendedURI(final String pnfName) throws URISyntaxException { return new URIBuilder() - .setScheme(aaiProtocol) - .setHost(aaiHost) - .setPort(aaiHostPortNumber) - .setPath(aaiPath + "/" + pnfName).build(); + .setScheme(aaiProtocol) + .setHost(aaiHost) + .setPort(aaiHostPortNumber) + .setPath(aaiPath + "/" + pnfName).build(); } private ResponseHandler> aaiResponseHandler() { - return (HttpResponse httpResponse) -> { + return (HttpResponse httpResponse) -> { final Integer responseCode = httpResponse.getStatusLine().getStatusCode(); - logger.trace("Status code of operation: {}", responseCode); + logger.info("Status code of operation: {}", responseCode); final HttpEntity responseEntity = httpResponse.getEntity(); if (HttpUtils.isSuccessfulResponseCode(responseCode)) { @@ -113,19 +110,20 @@ public class AAIProducerClient implements AAIExtendedHttpClient { } private Optional createHttpRequest(URI extendedURI, ConsumerDmaapModel consumerDmaapModel) { - return Optional.ofNullable(CommonFunctions.createJsonBody(consumerDmaapModel)).filter(x-> !x.isEmpty()).flatMap(myJson -> { - try { - return Optional.of(createHttpPatch(extendedURI, myJson)); - } catch (UnsupportedEncodingException e) { - logger.warn("Exception while executing http client: ", e); - } - return Optional.empty(); - }); + return Optional.ofNullable(CommonFunctions.createJsonBody(consumerDmaapModel)).filter(x -> !x.isEmpty()) + .flatMap(myJson -> { + try { + return Optional.of(createHttpPatch(extendedURI, myJson)); + } catch (UnsupportedEncodingException e) { + logger.warn(EXCEPTION_MESSAGE, e); + } + return Optional.empty(); + }); } private HttpPatch createHttpPatch(URI extendedURI, String jsonBody) throws UnsupportedEncodingException { HttpPatch httpPatch = new HttpPatch(extendedURI); - httpPatch.setEntity( new StringEntity(jsonBody)); + httpPatch.setEntity(new StringEntity(jsonBody)); aaiHeaders.forEach(httpPatch::addHeader); httpPatch.addHeader("Content-Type", "application/merge-patch+json"); return httpPatch; -- cgit 1.2.3-korg