Add swagger models for swagger endpoint generation

The swagger models dependency is required to generate the swagger for
the Swagger endpoint in Springboot applications.

Springboot needs Jackson annotations as well.

Issue https://jira.onap.org/browse/POLICY-3465 opened for the general
Swagger upgrade work.

Issue-ID: POLICY-3424
Change-Id: Ie86db5652be26df085234f0699f0363081d06af0
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java
index d4429b8..695ae06 100644 (file)
--- a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java
+++ b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java
@@ -20,7 +20,6 @@
 
 package org.onap.policy.clamp.controlloop.participant.simulator.main.rest;
 
-import io.swagger.v3.oas.annotations.Hidden;
 import java.util.Map;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
@@ -38,7 +37,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.ServletWebRequest;
 
 @Controller
-@Hidden
 public class ParticipantErrorController implements ErrorController {
 
     private final ErrorAttributes errorAttributes;

diff --git a/pom.xml b/pom.xml
index eb8b58a..da214ff 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,15 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${version.jackson}</version>
+        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 6efdec7..4c8bf24 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -434,13 +434,6 @@
             <artifactId>docker-java</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Swagger models for swagger generation -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>${version.swagger}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>