From a557b012ab5c51f9a5fb88328eb678eb78091118 Mon Sep 17 00:00:00 2001 From: Marcin Migdal Date: Fri, 8 Mar 2019 15:49:58 +0100 Subject: Change CloudHttpClient API Change-Id: Icbbe871e71c6bb46aba7411b9f9016af14c5eab9 Issue-ID: DCAEGEN2-1310 Signed-off-by: Marcin Migdal --- .../client/service/producer/DMaaPPublisherReactiveHttpClient.java | 3 ++- .../service/producer/DMaaPPublisherReactiveHttpClientTest.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'rest-services/dmaap-client/src') diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClient.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClient.java index 6314bcba..84596cde 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClient.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClient.java @@ -33,6 +33,7 @@ import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder; import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; import org.onap.dcaegen2.services.sdk.rest.services.uri.URI.URIBuilder; import reactor.core.publisher.Mono; +import reactor.netty.http.client.HttpClientResponse; /** @@ -64,7 +65,7 @@ public class DMaaPPublisherReactiveHttpClient extends DMaaPAbstractReactiveHttpC * @return status code of operation */ - public Mono getDMaaPProducerResponse(DmaapModel dmaapModel, + public Mono getDMaaPProducerResponse(DmaapModel dmaapModel, Optional requestDiagnosticContextOptional) { return Mono.defer(() -> { Map headers = DMaaPClientServiceUtils.getHeaders(dmaapPublisherConfiguration.dmaapContentType()); diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClientTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClientTest.java index 0ff1e207..a2b3575a 100644 --- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClientTest.java +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClientTest.java @@ -38,6 +38,7 @@ import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder; import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; +import reactor.netty.http.client.HttpClientResponse; /** * @author Przemysław Wąsala on 7/4/18 @@ -76,7 +77,7 @@ class DMaaPPublisherReactiveHttpClientTest { @Test void getHttpResponse_Success() { //given - Mono expectedResult = Mono.just(Integer.valueOf(200)); + Mono expectedResult = Mono.just(mock(HttpClientResponse.class)); //when when( cloudHttpClientMock @@ -84,7 +85,7 @@ class DMaaPPublisherReactiveHttpClientTest { DMaaPClientServiceUtils.getHeaders(ContentType.APPLICATION_JSON.getMimeType()), jsonBodyBuilderMock, mock(ClientModel.class))) - .thenReturn(Mono.just(Integer.valueOf(200))); + .thenReturn(Mono.just(mock(HttpClientResponse.class))); //then StepVerifier.create(expectedResult).expectSubscription() .expectNextMatches(results -> { -- cgit 1.2.3-korg