3 files changed, 48 insertions, 9 deletions

diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/ConsumerReactiveHttpClientFactory.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/ConsumerReactiveHttpClientFactory.java
index 951e0b0b..a80f1346 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/ConsumerReactiveHttpClientFactory.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/ConsumerReactiveHttpClientFactory.java
@@ -20,18 +20,21 @@
 
 package org.onap.dcaegen2.services.prh.service.consumer;
 
+import javax.net.ssl.SSLException;
 import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration;
 
 public class ConsumerReactiveHttpClientFactory {
 
-    private final DMaaPReactiveWebClient reactiveWebClient;
+    private final DMaaPReactiveWebClientFactory reactiveWebClient;
 
-    public ConsumerReactiveHttpClientFactory(DMaaPReactiveWebClient reactiveWebClient) {
+    public ConsumerReactiveHttpClientFactory(DMaaPReactiveWebClientFactory reactiveWebClient) {
         this.reactiveWebClient = reactiveWebClient;
     }
 
-    public DMaaPConsumerReactiveHttpClient create(DmaapConsumerConfiguration consumerConfiguration) {
-        return new DMaaPConsumerReactiveHttpClient(consumerConfiguration, reactiveWebClient.build());
+    public DMaaPConsumerReactiveHttpClient create(DmaapConsumerConfiguration consumerConfiguration)
+            throws SSLException {
+        return new DMaaPConsumerReactiveHttpClient(consumerConfiguration,
+                reactiveWebClient.build(consumerConfiguration));
     }
 
 }
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPReactiveWebClient.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPReactiveWebClientFactory.java
index 9eb6ee62..68dda512 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPReactiveWebClient.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPReactiveWebClientFactory.java
@@ -23,30 +23,62 @@ package org.onap.dcaegen2.services.prh.service.consumer;
 import static org.onap.dcaegen2.services.prh.model.logging.MdcVariables.RESPONSE_CODE;
 import static org.onap.dcaegen2.services.prh.model.logging.MdcVariables.SERVICE_NAME;
 
+import io.netty.handler.ssl.SslContext;
+import javax.net.ssl.SSLException;
+import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration;
+import org.onap.dcaegen2.services.prh.ssl.SslFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
+import org.springframework.http.client.reactive.ClientHttpConnector;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
+import reactor.netty.http.client.HttpClient;
+
 
 /**
  * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 7/4/18
  */
-public class DMaaPReactiveWebClient {
+public class DMaaPReactiveWebClientFactory {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
+    private final SslFactory sslFactory;
+
+    public DMaaPReactiveWebClientFactory() {
+        this(new SslFactory());
+    }
+
+    DMaaPReactiveWebClientFactory(SslFactory sslFactory) {
+        this.sslFactory = sslFactory;
+    }
+
     /**
      * Construct Reactive WebClient with appropriate settings.
      *
      * @return WebClient
      */
-    public WebClient build() {
+    public WebClient build(DmaapConsumerConfiguration consumerConfiguration) throws SSLException {
+        SslContext sslContext = createSslContext(consumerConfiguration);
+        ClientHttpConnector reactorClientHttpConnector = new ReactorClientHttpConnector(
+                HttpClient.create().secure(sslContextSpec -> sslContextSpec.sslContext(sslContext)));
         return WebClient.builder()
-            .filter(logRequest())
-            .filter(logResponse())
-            .build();
+                .clientConnector(reactorClientHttpConnector)
+                .filter(logRequest())
+                .filter(logResponse())
+                .build();
+    }
+
+    private SslContext createSslContext(DmaapConsumerConfiguration consumerConfiguration) throws SSLException {
+        if (consumerConfiguration.enableDmaapCertAuth()) {
+            return sslFactory.createSecureContext(
+                    consumerConfiguration.keyStore(), consumerConfiguration.keyStorePassword(),
+                    consumerConfiguration.trustStore(), consumerConfiguration.trustStorePassword()
+            );
+        }
+        return sslFactory.createInsecureContext();
     }
 
     private ExchangeFilterFunction logResponse() {
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/producer/DMaaPPublisherReactiveHttpClient.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/producer/DMaaPPublisherReactiveHttpClient.java
index d4687c51..b262e6e9 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/producer/DMaaPPublisherReactiveHttpClient.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/producer/DMaaPPublisherReactiveHttpClient.java
@@ -29,6 +29,8 @@ import java.net.URI;
 import java.util.UUID;
 import org.onap.dcaegen2.services.prh.config.DmaapPublisherConfiguration;
 import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -45,6 +47,7 @@ import reactor.core.publisher.Mono;
  */
 public class DMaaPPublisherReactiveHttpClient {
 
+    private final Logger logger = LoggerFactory.getLogger(DMaaPPublisherReactiveHttpClient.class);
     private final String dmaapHostName;
     private final Integer dmaapPortNumber;
     private final String dmaapProtocol;
@@ -77,6 +80,7 @@ public class DMaaPPublisherReactiveHttpClient {
     public Mono<ResponseEntity<String>> getDMaaPProducerResponse(ConsumerDmaapModel consumerDmaapModelMono) {
         return Mono.defer(() -> {
             HttpEntity<String> request = new HttpEntity<>(createJsonBody(consumerDmaapModelMono), getAllHeaders());
+            logger.info("Request: {} {}", getUri(), request);
             return Mono.just(restTemplate.exchange(getUri(), HttpMethod.POST, request, String.class));
 
         });