From b1e0ceb789a9c0781bb3b97d4b1ff0e75396fd29 Mon Sep 17 00:00:00 2001 From: Piotr Jaszczyk Date: Wed, 8 May 2019 14:52:24 +0200 Subject: Release DMaaP client API * remove @ExperimentalApi annotation * deprecate old API * extract http-client module + refactor * change DmaapClientFactory so it's more configurable Change-Id: I710d20558eece8cc3d7c0740e765d34737134b3a Issue-ID: DCAEGEN2-1492 Signed-off-by: Piotr Jaszczyk --- .../dmaap/client/api/MessageRouterPublisherIT.java | 78 ++++++++++++++++++++++ .../client/api/MessageRouterSubscriberIT.java | 75 +++++++++++++++++++++ .../src/test/resources/logback-test.xml | 61 +++++++++++++---- .../resources/sample-mr-subscribe-response.json | 5 ++ 4 files changed, 205 insertions(+), 14 deletions(-) create mode 100644 rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisherIT.java create mode 100644 rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriberIT.java create mode 100644 rest-services/dmaap-client/src/test/resources/sample-mr-subscribe-response.json (limited to 'rest-services/dmaap-client/src/test') diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisherIT.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisherIT.java new file mode 100644 index 00000000..8ed3eb31 --- /dev/null +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisherIT.java @@ -0,0 +1,78 @@ +/* + * ============LICENSE_START==================================== + * DCAEGEN2-SERVICES-SDK + * ========================================================= + * Copyright (C) 2019 Nokia. All rights reserved. + * ========================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END===================================== + */ + +package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api; + +import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.test.DummyHttpServer.sendString; + +import com.google.gson.JsonElement; +import com.google.gson.JsonPrimitive; +import io.vavr.collection.List; +import java.time.Duration; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.onap.dcaegen2.services.sdk.model.streams.dmaap.ImmutableMessageRouterSink; +import org.onap.dcaegen2.services.sdk.model.streams.dmaap.MessageRouterSink; +import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.test.DummyHttpServer; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.ImmutableMessageRouterPublishRequest; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.ImmutableMessageRouterPublishResponse; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishRequest; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishResponse; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.MessageRouterPublisherConfig; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; + +/** + * @author Piotr Jaszczyk + * @since May 2019 + */ +class MessageRouterPublisherIT { + private MessageRouterPublisher sut = DmaapClientFactory.createMessageRouterPublisher(MessageRouterPublisherConfig.createDefault()); + private static DummyHttpServer server; + private static MessageRouterSink sinkDefinition; + + @BeforeAll + static void setUp() { + server = DummyHttpServer.start(routes -> + routes.post("/events/TOPIC", (req, resp) -> sendString(resp, Mono.just("TODO"))) + ); + sinkDefinition = ImmutableMessageRouterSink.builder() + .name("the topic") + .topicUrl(String.format("http://%s:%d/events/TOPIC", server.host(), server.port())) + .build(); + } + + @Test + void testStub() { + final MessageRouterPublishRequest mrRequest = ImmutableMessageRouterPublishRequest.builder() + .sinkDefinition(sinkDefinition) + .build(); + + final Flux result = sut + .put(mrRequest, Flux.just("ala", "ma", "kota").map(JsonPrimitive::new)); + + final List expectedItems = List.of("ala", "ma", "kota").map(JsonPrimitive::new); + StepVerifier.create(result) + .expectNext(ImmutableMessageRouterPublishResponse.builder().items(expectedItems).build()) + .expectComplete() + .verify(Duration.ofSeconds(10)); + } +} diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriberIT.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriberIT.java new file mode 100644 index 00000000..ab51bfef --- /dev/null +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriberIT.java @@ -0,0 +1,75 @@ +/* + * ============LICENSE_START==================================== + * DCAEGEN2-SERVICES-SDK + * ========================================================= + * Copyright (C) 2019 Nokia. All rights reserved. + * ========================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END===================================== + */ + +package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api; + +import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.test.DummyHttpServer.sendResource; + +import com.google.gson.JsonElement; +import java.time.Duration; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.onap.dcaegen2.services.sdk.model.streams.dmaap.ImmutableMessageRouterSource; +import org.onap.dcaegen2.services.sdk.model.streams.dmaap.MessageRouterSource; +import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.test.DummyHttpServer; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.ImmutableMessageRouterSubscribeRequest; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterSubscribeRequest; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.MessageRouterSubscriberConfig; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; + +/** + * @author Piotr Jaszczyk + * @since May 2019 + */ +class MessageRouterSubscriberIT { + private MessageRouterSubscriber sut = DmaapClientFactory.createMessageRouterSubscriber(MessageRouterSubscriberConfig.createDefault()); + private static DummyHttpServer server; + private static MessageRouterSource sourceDefinition; + + @BeforeAll + static void setUp() { + server = DummyHttpServer.start(routes -> + routes.get("/events/TOPIC/group1/consumer8", (req, resp) -> sendResource(resp, "/sample-mr-subscribe-response.json")) + ); + sourceDefinition = ImmutableMessageRouterSource.builder() + .name("the topic") + .topicUrl(String.format("http://%s:%d/events/TOPIC", server.host(), server.port())) + .build(); + } + + @Test + void testStub() { + final MessageRouterSubscribeRequest mrRequest = ImmutableMessageRouterSubscribeRequest.builder() + .sourceDefinition(sourceDefinition) + .consumerGroup("group1") + .consumerId("consumer8") + .build(); + + final Flux result = sut + .getElements(mrRequest) + .map(JsonElement::getAsString); + + StepVerifier.create(result) + .expectNext("I", "like", "pizza") + .expectComplete() + .verify(Duration.ofSeconds(10)); + } +} diff --git a/rest-services/dmaap-client/src/test/resources/logback-test.xml b/rest-services/dmaap-client/src/test/resources/logback-test.xml index c1f00665..07a1aae6 100644 --- a/rest-services/dmaap-client/src/test/resources/logback-test.xml +++ b/rest-services/dmaap-client/src/test/resources/logback-test.xml @@ -1,21 +1,54 @@ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============LICENSE_END========================================================= +--> - + + + + + + + + + + + + + + + ${READABLE_LOG_PATTERN} + + + + + + + + diff --git a/rest-services/dmaap-client/src/test/resources/sample-mr-subscribe-response.json b/rest-services/dmaap-client/src/test/resources/sample-mr-subscribe-response.json new file mode 100644 index 00000000..f3ba41a5 --- /dev/null +++ b/rest-services/dmaap-client/src/test/resources/sample-mr-subscribe-response.json @@ -0,0 +1,5 @@ +[ + "I", + "like", + "pizza" +] -- cgit 1.2.3-korg