From 4dcef4e7da04caf4b98ce9553c600e3821b91922 Mon Sep 17 00:00:00 2001 From: Marcin Migdal Date: Wed, 27 Mar 2019 11:53:45 +0100 Subject: DMaaP consumer more generic Added logging to Cloud Http Client Change-Id: I443163b3ec292370c39cd10229c3479e36f6c9c1 Issue-ID: DCAEGEN2-1310 Signed-off-by: mmigdal Signed-off-by: Marcin Migdal --- .../service/consumer/DMaaPConsumerReactiveHttpClient.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'rest-services/dmaap-client/src/main/java') diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java index b37ac3dc..81a62eba 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java @@ -20,7 +20,7 @@ package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.service.consumer; -import com.google.gson.JsonArray; +import com.google.gson.JsonElement; import java.net.URI; import java.util.Map; import java.util.Optional; @@ -60,15 +60,16 @@ public class DMaaPConsumerReactiveHttpClient extends DMaaPAbstractReactiveHttpCl * * @return reactive response from DMaaP in string format */ - public Mono getDMaaPConsumerResponse(Optional requestDiagnosticContextOptional) { - Map headers = DMaaPClientServiceUtils.getHeaders(consumerConfiguration.dmaapContentType()); + public Mono getDMaaPConsumerResponse( + Optional requestDiagnosticContextOptional) { + Map headers = DMaaPClientServiceUtils.getHeaders(consumerConfiguration.dmaapContentType()); if (requestDiagnosticContextOptional.isPresent()) { return cloudHttpClient - .get(getUri().toString(), requestDiagnosticContextOptional.get(), headers, JsonArray.class); + .get(getUri().toString(), requestDiagnosticContextOptional.get(), headers, JsonElement.class); } RequestDiagnosticContext requestDiagnosticContext = ImmutableRequestDiagnosticContext.builder() .invocationId(UUID.randomUUID()).requestId(UUID.randomUUID()).build(); - return cloudHttpClient.get(getUri().toString(), requestDiagnosticContext, headers, JsonArray.class); + return cloudHttpClient.get(getUri().toString(), requestDiagnosticContext, headers, JsonElement.class); } URI getUri() { -- cgit 1.2.3-korg