Bug fixes

Improve UnitTest
Add changes after review in
DmaaPReactiveTasks workflow

Change-Id: I920092235528964758014c2d9d229ccd22e69cae
Issue-ID: DCAEGEN2-563
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java
index af8d14a3..f559683d 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java
@@ -32,19 +32,15 @@ import reactor.core.publisher.Mono;
  */
 abstract class DmaapPublisherTask {
 
-    abstract Mono<Integer> publish(Mono<ConsumerDmaapModel> consumerDmaapModel) throws PrhTaskException;
+    abstract Mono<String> publish(Mono<ConsumerDmaapModel> consumerDmaapModel) throws PrhTaskException;
 
     abstract DMaaPProducerReactiveHttpClient resolveClient();
 
     protected abstract DmaapPublisherConfiguration resolveConfiguration();
 
-    protected abstract Mono<Integer> execute(Mono<ConsumerDmaapModel> consumerDmaapModel) throws PrhTaskException;
+    protected abstract Mono<String> execute(Mono<ConsumerDmaapModel> consumerDmaapModel) throws PrhTaskException;
 
     WebClient buildWebClient() {
-        DmaapPublisherConfiguration dmaapPublisherConfiguration = resolveConfiguration();
-        return new DMaaPReactiveWebClient.WebClientBuilder()
-            .dmaapContentType(dmaapPublisherConfiguration.dmaapContentType())
-            .dmaapUserName(dmaapPublisherConfiguration.dmaapUserName())
-            .dmaapUserPassword(dmaapPublisherConfiguration.dmaapUserPassword()).build();
+        return new DMaaPReactiveWebClient().fromConfiguration(resolveConfiguration()).build();
     }
 }