diff options
| author |   Piotr Wielebski <piotr.wielebski@nokia.com> | 2019-03-27 10:59:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-27 10:59:06 +0000 |
| commit | 999a1d92f3f30156501186bc4b9407bb6913db67 (patch) | |
| tree | 2b4d1f114a839c77ab03e97ab3f404e62b20c302 /rest-services/dmaap-client/src/main/java/org/onap | |
| parent | 918d24a717d057054ec3a9fe4962e51a54723ce4 (diff) | |
| parent | 4dcef4e7da04caf4b98ce9553c600e3821b91922 (diff) | |
Merge "DMaaP consumer more generic Added logging to Cloud Http Client"
Diffstat (limited to 'rest-services/dmaap-client/src/main/java/org/onap')
| -rw-r--r-- | rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java | 11 |
1 files changed, 6 insertions, 5 deletions
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<JsonArray> getDMaaPConsumerResponse(Optional<RequestDiagnosticContext> requestDiagnosticContextOptional) { - Map<String,String> headers = DMaaPClientServiceUtils.getHeaders(consumerConfiguration.dmaapContentType()); + public Mono<JsonElement> getDMaaPConsumerResponse( + Optional<RequestDiagnosticContext> requestDiagnosticContextOptional) { + Map<String, String> 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() { |