From fdc904e28525bf714b195cc2938684f5fd0f5c66 Mon Sep 17 00:00:00 2001
From: Andrew Gauld <agauld@att.com>
Date: Fri, 10 Jul 2020 14:24:15 +0000
Subject: Runtimeapi dependency updates

Change-Id: Ied9b193eb47554db4824238a986d48b67aabf158
Issue-ID: DCAEGEN2-2272
Signed-off-by: Andrew Gauld <agauld@att.com>
---
 mod/runtimeapi/runtime-core/pom.xml                              | 2 +-
 mod/runtimeapi/runtime-web/pom.xml                               | 6 +++---
 .../java/org/onap/dcae/runtime/web/RuntimeapiApplication.java    | 4 ++--
 .../dcae/runtime/web/controllers/TestFlowGraphController.java    | 9 ++++++++-
 4 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'mod')

diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml
index 7add43b..fa0abc1 100644
--- a/mod/runtimeapi/runtime-core/pom.xml
+++ b/mod/runtimeapi/runtime-core/pom.xml
@@ -54,7 +54,7 @@ limitations under the License.
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.23</version>
+            <version>1.26</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml
index c19c29e..722c36a 100644
--- a/mod/runtimeapi/runtime-web/pom.xml
+++ b/mod/runtimeapi/runtime-web/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
 		<version>1.0.1</version>
 	</parent>
 	<artifactId>runtime-web</artifactId>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>runtime-web</name>
 	<description>MOD Runtime Web Module</description>
@@ -64,12 +64,12 @@ limitations under the License.
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
-			<version>2.9.2</version>
+			<version>2.10.5</version>
 		</dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.9.2</version>
+			<version>2.10.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
diff --git a/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/RuntimeapiApplication.java b/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/RuntimeapiApplication.java
index f22c7e7..611b332 100644
--- a/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/RuntimeapiApplication.java
+++ b/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/RuntimeapiApplication.java
@@ -19,10 +19,10 @@ package org.onap.dcae.runtime.web;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 @SpringBootApplication
-@EnableSwagger2
+@EnableSwagger2WebMvc
 public class RuntimeapiApplication {
 
 	public static void main(String[] args) {
diff --git a/mod/runtimeapi/runtime-web/src/test/java/org/onap/dcae/runtime/web/controllers/TestFlowGraphController.java b/mod/runtimeapi/runtime-web/src/test/java/org/onap/dcae/runtime/web/controllers/TestFlowGraphController.java
index dbbfd8d..60ff810 100644
--- a/mod/runtimeapi/runtime-web/src/test/java/org/onap/dcae/runtime/web/controllers/TestFlowGraphController.java
+++ b/mod/runtimeapi/runtime-web/src/test/java/org/onap/dcae/runtime/web/controllers/TestFlowGraphController.java
@@ -29,6 +29,7 @@ import org.onap.dcae.runtime.web.TestUtils;
 import org.onap.dcae.runtime.web.models.Action;
 import org.onap.dcae.runtime.web.models.DistributeGraphRequest;
 import org.onap.dcae.runtime.web.models.GraphRequest;
+import org.onap.dcae.runtime.web.RuntimeapiApplication;
 import org.onap.dcae.runtime.web.service.GraphServiceImpl;
 import org.onap.dcae.runtime.web.service.BlueprintInventory;
 import org.junit.Before;
@@ -50,7 +51,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes=RuntimeapiApplication.class)
 @AutoConfigureMockMvc
 public class TestFlowGraphController {
 
@@ -78,6 +79,12 @@ public class TestFlowGraphController {
 		.applyTo(blueprintInventory);
     }
 
+    @Test
+    public void testSwaggerUi() throws Exception {
+    	mockMvc.perform(get("/swagger-ui.html"))
+		.andExpect(status().isOk());
+    }
+
     @Test
     public void testInitializeGraph() throws Exception{
         graphRequest.setMain(true);
-- 
cgit 1.2.3-korg