diff options
author | wasala <przemyslaw.wasala@nokia.com> | 2018-07-04 14:12:23 +0200 |
---|---|---|
committer | wasala <przemyslaw.wasala@nokia.com> | 2018-08-07 09:45:22 +0200 |
commit | 3d1f84c127e2244a42d5e02d4c50f8e9f06000d1 (patch) | |
tree | a9a661e395404c2d0f8203041a7ab6c5f54acd50 /prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java | |
parent | 79984d737c71d3c92f3cd283eaf2b9b6157c2ce2 (diff) |
Added reactive DMaaPClient
Extracted WebCLientBuilder for
Producer and Consumer.
Added unit test for ReactiveProducerClient.
Change-Id: I632e6928813ed9feb48982900c173f741e4483e3
Issue-ID: DCAEGEN2-563
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
Diffstat (limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java')
-rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java index 7cbeb3b3..faf43bc7 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java @@ -25,12 +25,13 @@ import org.onap.dcaegen2.services.prh.configuration.AppConfig; import org.onap.dcaegen2.services.prh.configuration.Config; import org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; -import org.onap.dcaegen2.services.prh.service.producer.ExtendedDmaapProducerHttpClientImpl; +import org.onap.dcaegen2.services.prh.service.DMaaPReactiveWebClient; +import org.onap.dcaegen2.services.prh.service.producer.DMaaPProducerReactiveHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; +import reactor.core.publisher.Mono; /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/13/18 @@ -40,7 +41,7 @@ public class DmaapPublisherTaskImpl extends DmaapPublisherTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Config prhAppConfig; - private ExtendedDmaapProducerHttpClientImpl extendedDmaapProducerHttpClient; + private DMaaPProducerReactiveHttpClient dMaaPProducerReactiveHttpClient; @Autowired public DmaapPublisherTaskImpl(AppConfig prhAppConfig) { @@ -48,19 +49,17 @@ public class DmaapPublisherTaskImpl extends DmaapPublisherTask { } @Override - Integer publish(ConsumerDmaapModel consumerDmaapModel) throws DmaapNotFoundException { - logger.info("Publishing on DmaaP topic {} object {}", resolveConfiguration().dmaapTopicName(), + Mono<Integer> publish(Mono<ConsumerDmaapModel> consumerDmaapModel) { + logger.info("Publishing on DMaaP topic {} object {}", resolveConfiguration().dmaapTopicName(), consumerDmaapModel); - return extendedDmaapProducerHttpClient.getHttpProducerResponse(consumerDmaapModel) - .filter(response -> response == HttpStatus.OK.value()) - .orElseThrow(() -> new DmaapNotFoundException("Incorrect response from Dmaap")); + return dMaaPProducerReactiveHttpClient.getDMaaPProducerResponse(consumerDmaapModel).map(Integer::parseInt); } @Override - public Integer execute(ConsumerDmaapModel consumerDmaapModel) throws DmaapNotFoundException { + public Mono<Integer> execute(Mono<ConsumerDmaapModel> consumerDmaapModel) throws DmaapNotFoundException { consumerDmaapModel = Optional.ofNullable(consumerDmaapModel) - .orElseThrow(() -> new DmaapNotFoundException("Invoked null object to Dmaap task")); - extendedDmaapProducerHttpClient = resolveClient(); + .orElseThrow(() -> new DmaapNotFoundException("Invoked null object to DMaaP task")); + dMaaPProducerReactiveHttpClient = resolveClient(); logger.trace("Method called with arg {}", consumerDmaapModel); return publish(consumerDmaapModel); } @@ -70,8 +69,15 @@ public class DmaapPublisherTaskImpl extends DmaapPublisherTask { } @Override - ExtendedDmaapProducerHttpClientImpl resolveClient() { - return Optional.ofNullable(extendedDmaapProducerHttpClient) - .orElseGet(() -> new ExtendedDmaapProducerHttpClientImpl(resolveConfiguration())); + DMaaPProducerReactiveHttpClient resolveClient() { + return Optional.ofNullable(dMaaPProducerReactiveHttpClient) + .orElseGet(() -> { + DmaapPublisherConfiguration dmaapPublisherConfiguration = resolveConfiguration(); + return new DMaaPProducerReactiveHttpClient(dmaapPublisherConfiguration).createDMaaPWebClient( + new DMaaPReactiveWebClient.WebClientBuilder() + .dmaapContentType(dmaapPublisherConfiguration.dmaapContentType()) + .dmaapUserName(dmaapPublisherConfiguration.dmaapUserName()) + .dmaapUserPassword(dmaapPublisherConfiguration.dmaapUserPassword()).build()); + }); } }
\ No newline at end of file |