From 41fddf53b41e2870a94fa54454bd60665cc203c1 Mon Sep 17 00:00:00 2001
From: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Date: Wed, 9 Jan 2019 15:08:46 +0100
Subject: High Volume VES Collector Client - stub

Other minor changes:
* Set dependencies to compatible versions (spring, spring-boot and
  reactor + reactor-netty)
* Fix compilation errors on Java 11

Change-Id: If482c0dffd7162315df6d7b7fdedf554ef7c5d9d
Issue-ID: DCAEGEN2-1070
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
---
 rest-services/aai-client/pom.xml                                   | 6 +++---
 .../aai/client/service/AaiReactiveWebClientFactoryTest.java        | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'rest-services/aai-client')

diff --git a/rest-services/aai-client/pom.xml b/rest-services/aai-client/pom.xml
index 5492e0a3..c799fc92 100644
--- a/rest-services/aai-client/pom.xml
+++ b/rest-services/aai-client/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.onap.dcaegen2.services.sdk</groupId>
     <artifactId>dcaegen2-services-sdk-rest-services</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
   <artifactId>aai-client</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.1-SNAPSHOT</version>
 
   <name>dcaegen2-services-sdk-rest-services-aai-client</name>
   <description>Active and Available Inventory Rest Services Module</description>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
       <artifactId>common-dependency</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiReactiveWebClientFactoryTest.java b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiReactiveWebClientFactoryTest.java
index 153189fd..46a57b69 100644
--- a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiReactiveWebClientFactoryTest.java
+++ b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiReactiveWebClientFactoryTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import io.netty.handler.ssl.SslContext;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
@@ -42,6 +43,7 @@ class AaiReactiveWebClientFactoryTest {
     private SslFactory sslFactory = mock(SslFactory.class);
     private AaiClientConfiguration aaiClientConfiguration = mock(AaiClientConfiguration.class);
     private AaiReactiveWebClientFactory aaiReactiveWebClientFactory;
+    private SslContext dummySslContext = mock(SslContext.class);
 
     @Test
     void shouldCreateWebClientWithSecureSslContext() throws SSLException {
@@ -56,17 +58,20 @@ class AaiReactiveWebClientFactoryTest {
     @Test
     void shouldCreateWebClientWithInsecureSslContext() throws SSLException {
         when(aaiClientConfiguration.enableAaiCertAuth()).thenReturn(false);
+        when(sslFactory.createInsecureContext()).thenReturn(dummySslContext);
         aaiReactiveWebClientFactory = new AaiReactiveWebClientFactory(sslFactory, aaiClientConfiguration);
 
         Assertions.assertNotNull(aaiReactiveWebClientFactory.build());
         verify(sslFactory).createInsecureContext();
     }
 
-    private void givenEnabledAaiCertAuthConfiguration() {
+    private void givenEnabledAaiCertAuthConfiguration() throws SSLException {
         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);
+        when(sslFactory.createSecureContext(KEY_STORE_PATH, KEY_STORE_PASS_PATH, TRUST_STORE_PATH, TRUST_STORE_PASS_PATH))
+                .thenReturn(dummySslContext);
     }
 }
-- 
cgit 1.2.3-korg