AaiReactiveWebClientFactory junits

Change-Id: Id366c938199e27593b3d7f22f87905f38bbd77e0
Issue-ID: DCAEGEN2-975
Signed-off-by: piotr.karas <piotr.karas@nokia.com>

diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AaiRequestException.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AaiRequestException.java
deleted file mode 100644 (file)
index bd4355c..0000000
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AaiRequestException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dcaegen2.services.prh.exceptions;
-
-public class AaiRequestException extends Exception {
-
-    public AaiRequestException(String message) {
-        super(message);
-    }
-}

diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClientFactory.java
similarity index 95%
rename from prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClient.java
rename to prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClientFactory.java
index 2d1a7ac..e4f330e 100644 (file)
--- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClient.java
+++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClientFactory.java
@@ -40,9 +40,9 @@ import reactor.core.publisher.Mono;
 import reactor.netty.http.client.HttpClient;
 
 
-public class AaiReactiveWebClient {
+public class AaiReactiveWebClientFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AaiReactiveWebClient.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AaiReactiveWebClientFactory.class);
 
     private final String aaiUserName;
     private final String aaiUserPassword;
@@ -55,12 +55,12 @@ public class AaiReactiveWebClient {
     private final SslFactory sslFactory;
 
     /**
-     * Creating AaiReactiveWebClient.
+     * Creating AaiReactiveWebClientFactory.
      *
      * @param configuration - configuration object
      * @param sslFactory - factory for ssl setup
      */
-    public AaiReactiveWebClient(SslFactory sslFactory, AaiClientConfiguration configuration) {
+    public AaiReactiveWebClientFactory(SslFactory sslFactory, AaiClientConfiguration configuration) {
         this.aaiUserName = configuration.aaiUserName();
         this.aaiUserPassword = configuration.aaiUserPassword();
         this.aaiHeaders = configuration.aaiHeaders();

diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClientFactoryTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClientFactoryTest.java
new file mode 100644 (file)
index 0000000..bd976ab
--- /dev/null
+++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AaiReactiveWebClientFactoryTest.java
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PNF-REGISTRATION-HANDLER
+ * ================================================================================
+ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.prh.service;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import javax.net.ssl.SSLException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.prh.config.AaiClientConfiguration;
+import org.onap.dcaegen2.services.prh.ssl.SslFactory;
+
+
+class AaiReactiveWebClientFactoryTest {
+
+    private static final String TRUST_STORE_PATH = "trust_store_path";
+    private static final String TRUST_STORE_PASS_PATH = "trust_store_pass_path";
+    private static final String KEY_STORE_PATH = "key_store_path";
+    private static final String KEY_STORE_PASS_PATH = "key_store_pass_path";
+    private SslFactory sslFactory = mock(SslFactory.class);
+    private AaiClientConfiguration aaiClientConfiguration = mock(AaiClientConfiguration.class);
+    private AaiReactiveWebClientFactory aaiReactiveWebClientFactory;
+
+    @Test
+    void shouldCreateWebClientWithSecureSslContext() throws SSLException {
+        givenEnabledAaiCertAuthConfiguration();
+        aaiReactiveWebClientFactory = new AaiReactiveWebClientFactory(sslFactory, aaiClientConfiguration);
+
+        Assertions.assertNotNull(aaiReactiveWebClientFactory.build());
+        verify(sslFactory).createSecureContext(KEY_STORE_PATH, KEY_STORE_PASS_PATH,
+                TRUST_STORE_PATH, TRUST_STORE_PASS_PATH);
+    }
+
+    @Test
+    void shouldCreateWebClientWithInsecureSslContext() throws SSLException {
+        when(aaiClientConfiguration.enableAaiCertAuth()).thenReturn(false);
+        aaiReactiveWebClientFactory = new AaiReactiveWebClientFactory(sslFactory, aaiClientConfiguration);
+
+        Assertions.assertNotNull(aaiReactiveWebClientFactory.build());
+        verify(sslFactory).createInsecureContext();
+    }
+
+    private void givenEnabledAaiCertAuthConfiguration() {
+        when(aaiClientConfiguration.enableAaiCertAuth()).thenReturn(true);
+        when(aaiClientConfiguration.trustStorePath()).thenReturn(TRUST_STORE_PATH);
+        when(aaiClientConfiguration.trustStorePasswordPath()).thenReturn(TRUST_STORE_PASS_PATH);
+        when(aaiClientConfiguration.keyStorePath()).thenReturn(KEY_STORE_PATH);
+        when(aaiClientConfiguration.keyStorePasswordPath()).thenReturn(KEY_STORE_PASS_PATH);
+    }
+}
\ No newline at end of file

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTask.java
index 54a8ad8..711d808 100644 (file)
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTask.java
@@ -25,7 +25,7 @@ import org.onap.dcaegen2.services.prh.config.AaiClientConfiguration;
 import org.onap.dcaegen2.services.prh.exceptions.AaiNotFoundException;
 import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException;
 import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
-import org.onap.dcaegen2.services.prh.service.AaiReactiveWebClient;
+import org.onap.dcaegen2.services.prh.service.AaiReactiveWebClientFactory;
 import org.onap.dcaegen2.services.prh.service.producer.AaiProducerReactiveHttpClient;
 import org.onap.dcaegen2.services.prh.ssl.SslFactory;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -47,6 +47,6 @@ public abstract class AaiProducerTask {
         throws PrhTaskException, SSLException;
 
     WebClient buildWebClient() throws SSLException {
-        return new AaiReactiveWebClient(new SslFactory(), resolveConfiguration()).build();
+        return new AaiReactiveWebClientFactory(new SslFactory(), resolveConfiguration()).build();
     }
 }

diff --git a/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPConsumerReactiveHttpClientTest.java b/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPConsumerReactiveHttpClientTest.java
index 595fd6d..256d3c2 100644 (file)
--- a/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPConsumerReactiveHttpClientTest.java
+++ b/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/DMaaPConsumerReactiveHttpClientTest.java
@@ -96,7 +96,7 @@ class DMaaPConsumerReactiveHttpClientTest {
     }
 
     @Test
-    void getAppropriateUri_whenPassingCorrectedPathForPnf() throws URISyntaxException {
+    void getAppropriateUri_whenPassingCorrectedPathForPnf() {
         Assertions.assertEquals(dmaapConsumerReactiveHttpClient.getUri(),
             URI.create("https://54.45.33.2:1234/unauthenticated.SEC_OTHER_OUTPUT/OpenDCAE-c12/c12"));
     }