From 91292c21d8ee51c3840ed455955636b7ceda36fb Mon Sep 17 00:00:00 2001 From: pwielebs Date: Mon, 21 May 2018 12:50:27 +0200 Subject: Removing warnings related to optionals Change-Id: I4116ee1b16d8600a3f7109290b2f69b31fd51133 Issue-ID: DCAEGEN2-451 Signed-off-by: pwielebs --- .../services/prh/service/AAIProducerClient.java | 90 ++++++++-------------- 1 file changed, 34 insertions(+), 56 deletions(-) (limited to 'prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java') 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 3a07e94d..4f48c1c3 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 @@ -41,11 +41,10 @@ import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; import java.util.Map; -import java.util.Objects; import java.util.Optional; public class AAIProducerClient implements AAIExtendedHttpClient { - Logger logger = LoggerFactory.getLogger(AAIProducerClient.class); + private Logger logger = LoggerFactory.getLogger(AAIProducerClient.class); private final CloseableHttpClient closeableHttpClient; private final String aaiHost; @@ -66,30 +65,34 @@ public class AAIProducerClient implements AAIExtendedHttpClient { @Override - public Optional getHttpResponse(ConsumerDmaapModel consumerDmaapModel) throws IOException { - Optional request = createRequest(consumerDmaapModel); + public Optional getHttpResponse(ConsumerDmaapModel consumerDmaapModel) throws + URISyntaxException { try { - return closeableHttpClient.execute(request.get(), aaiResponseHandler()); - } catch (IOException e) { + 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 new IOException(); + throw e; } } - private URI createAAIExtendedURI(final String pnfName) { - URI extendedURI = null; - final URIBuilder uriBuilder = new URIBuilder() + 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); - try { - extendedURI = uriBuilder.build(); - logger.trace("Building extended URI: {}", extendedURI); - } catch (URISyntaxException e) { - logger.warn("Exception while building extended URI: ", e); - } - return extendedURI; + .setPath(aaiPath + "/" + pnfName).build(); } private ResponseHandler> aaiResponseHandler() { @@ -109,47 +112,22 @@ public class AAIProducerClient implements AAIExtendedHttpClient { }; } - private HttpRequestBase createHttpRequest(URI extendedURI, ConsumerDmaapModel consumerDmaapModel) { - String jsonBody = CommonFunctions.createJsonBody(consumerDmaapModel); - - if (isExtendedURINotNull(extendedURI) && jsonBody != null && !"".equals(jsonBody)) { - return createHttpPatch(extendedURI, Optional.ofNullable(CommonFunctions.createJsonBody(consumerDmaapModel))); - } else { - return null; - } - } - - private Boolean isExtendedURINotNull(URI extendedURI) { - return extendedURI != null; - } - - - private Optional createStringEntity(Optional jsonBody) { - return Optional.of(parseJson(jsonBody).get()); + 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(); + }); } - private HttpPatch createHttpPatch(URI extendedURI, Optional jsonBody) { + private HttpPatch createHttpPatch(URI extendedURI, String jsonBody) throws UnsupportedEncodingException { HttpPatch httpPatch = new HttpPatch(extendedURI); - Optional stringEntity = createStringEntity(jsonBody); - httpPatch.setEntity(stringEntity.get()); + httpPatch.setEntity( new StringEntity(jsonBody)); + aaiHeaders.forEach(httpPatch::addHeader); + httpPatch.addHeader("Content-Type", "application/merge-patch+json"); return httpPatch; } - - private Optional parseJson(Optional jsonBody) { - Optional stringEntity = Optional.empty(); - try { - stringEntity = Optional.of(new StringEntity(jsonBody.get())); - } catch (UnsupportedEncodingException e) { - logger.warn("Exception while parsing JSON: ", e); - } - return stringEntity; - } - - private Optional createRequest(ConsumerDmaapModel consumerDmaapModel) { - final URI extendedURI = createAAIExtendedURI(consumerDmaapModel.getPnfName()); - HttpRequestBase request = createHttpRequest(extendedURI, consumerDmaapModel); - aaiHeaders.forEach(Objects.requireNonNull(request)::addHeader); - Objects.requireNonNull(request).addHeader("Content-Type", "application/merge-patch+json"); - return Optional.of(request); - } } -- cgit 1.2.3-korg