diff options
author | wasala <przemyslaw.wasala@nokia.com> | 2018-06-26 15:15:03 +0200 |
---|---|---|
committer | wasala <przemyslaw.wasala@nokia.com> | 2018-08-07 08:21:02 +0200 |
commit | 8b1502fb0f1af5d00ec26e712e57b792fbd16bd8 (patch) | |
tree | 7cc80c278f17710863e6d865df77c5edfa6d4fbc /prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java | |
parent | e17c2d89d0470501fa60ed487726b0bbf3305f8c (diff) |
Added dmaapReactiveConsumer
*Tests have not been ready yet
Change-Id: I2e1d9c4218f91ae2f066b28acdbaa1870d7d27e7
Issue-ID: DCAEGEN2-557
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
Diffstat (limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java')
-rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java index 3944d416..564a7a41 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java @@ -23,15 +23,17 @@ import java.util.Optional; import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration; import org.onap.dcaegen2.services.prh.configuration.AppConfig; import org.onap.dcaegen2.services.prh.configuration.Config; +import org.onap.dcaegen2.services.prh.exceptions.DmaapEmptyResponseException; import org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException; import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.service.DmaapConsumerJsonParser; -import org.onap.dcaegen2.services.prh.service.consumer.ExtendedDmaapConsumerHttpClientImpl; +import org.onap.dcaegen2.services.prh.service.consumer.DmaapConsumerReactiveHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import reactor.core.publisher.Mono; /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18 @@ -41,8 +43,8 @@ public class DmaapConsumerTaskImpl extends DmaapConsumerTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Config prhAppConfig; - private ExtendedDmaapConsumerHttpClientImpl extendedDmaapConsumerHttpClient; private DmaapConsumerJsonParser dmaapConsumerJsonParser; + private DmaapConsumerReactiveHttpClient dmaapConsumerReactiveHttpClient; @Autowired public DmaapConsumerTaskImpl(AppConfig prhAppConfig) { @@ -57,18 +59,18 @@ public class DmaapConsumerTaskImpl extends DmaapConsumerTask { @Override - ConsumerDmaapModel consume(String message) throws PrhTaskException { - logger.info("Consumed model from DMaaP: {}", message); - return dmaapConsumerJsonParser.getJsonObject(message) - .orElseThrow(() -> new DmaapNotFoundException("Null response from JSON Object in single request")); + Mono<ConsumerDmaapModel> consume(Mono<String> message) { + logger.info("Consumed model from DmaaP: {}", message); + return dmaapConsumerJsonParser.getJsonObject(message); } + @Override - public ConsumerDmaapModel execute(String object) throws PrhTaskException { - extendedDmaapConsumerHttpClient = resolveClient(); + public Mono<ConsumerDmaapModel> execute(String object) { + dmaapConsumerReactiveHttpClient = resolveClient(); +// dmaapConsumerReactiveHttpClient.initWebClient(); logger.trace("Method called with arg {}", object); - return consume((extendedDmaapConsumerHttpClient.getHttpConsumerResponse().orElseThrow(() -> - new PrhTaskException("DMaaPConsumerTask has returned null")))); + return consume((dmaapConsumerReactiveHttpClient.getDmaaPConsumerResposne())); } @Override @@ -81,8 +83,8 @@ public class DmaapConsumerTaskImpl extends DmaapConsumerTask { } @Override - ExtendedDmaapConsumerHttpClientImpl resolveClient() { - return Optional.ofNullable(extendedDmaapConsumerHttpClient) - .orElseGet(() -> new ExtendedDmaapConsumerHttpClientImpl(resolveConfiguration())); + DmaapConsumerReactiveHttpClient resolveClient() { + return Optional.ofNullable(dmaapConsumerReactiveHttpClient) + .orElseGet(() -> new DmaapConsumerReactiveHttpClient(resolveConfiguration())); } -}
\ No newline at end of file +} |