Added JUnit for DMaaPWebClient

Refactored DMaaP tasks for
creation WebClient in higher
abstraction level

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

1 files changed, 3 insertions, 9 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 faf43bc7..11281d81 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,7 +25,6 @@ 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.DMaaPReactiveWebClient;
 import org.onap.dcaegen2.services.prh.service.producer.DMaaPProducerReactiveHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,6 +63,7 @@ public class DmaapPublisherTaskImpl extends DmaapPublisherTask {
         return publish(consumerDmaapModel);
     }
 
+    @Override
     protected DmaapPublisherConfiguration resolveConfiguration() {
         return prhAppConfig.getDmaapPublisherConfiguration();
     }
@@ -71,13 +71,7 @@ public class DmaapPublisherTaskImpl extends DmaapPublisherTask {
     @Override
     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());
-            });
+            .orElseGet(() -> new DMaaPProducerReactiveHttpClient(resolveConfiguration())
+                .createDMaaPWebClient(buildWebClient()));
     }
 }
\ No newline at end of file