From c998a3a5fd0ae456b895cd38a20f0937ec99da15 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Fri, 11 Nov 2022 13:43:16 +0000
Subject: Modify OpenAPI yaml to fix swagger editor errors

Using this approach for schemas fixes the errors in the online Swagger
Editor and the code generation still obeys the import mappings and uses
the Java classes.

Issue-ID: POLICY-4450
Change-Id: Ifc3064f8258c4281c9e6bfde16a812ffccd125c1
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 runtime-acm/pom.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'runtime-acm/pom.xml')

diff --git a/runtime-acm/pom.xml b/runtime-acm/pom.xml
index 9aa89c090..a219850fc 100644
--- a/runtime-acm/pom.xml
+++ b/runtime-acm/pom.xml
@@ -19,9 +19,7 @@
   ============LICENSE_END=========================================================
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -66,21 +64,23 @@
                         </goals>
                         <configuration>
                             <inputSpec>${project.basedir}/src/main/resources/openapi/openapi.yaml</inputSpec>
-                            <invokerPackage>org.onap.acm.rest.controller</invokerPackage>
+                            <invokerPackage>org.onap.policy.clamp.acm.runtime.main.rest</invokerPackage>
                             <modelPackage>org.onap.policy.clamp.models.acm.concepts</modelPackage>
                             <apiPackage>org.onap.policy.clamp.acm.runtime.main.rest</apiPackage>
                             <language>spring</language>
                             <generateModels>false</generateModels>
                             <generateSupportingFiles>false</generateSupportingFiles>
-                            <importMappings>ToscaServiceTemplates=org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplates,
-                            SimpleResponse=org.onap.policy.clamp.models.acm.messages.rest.SimpleResponse,
-                            InstancePropertiesResponse=org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstancePropertiesResponse,
-                            CommissioningResponse=org.onap.policy.clamp.models.acm.messages.rest.commissioning.CommissioningResponse,
-                            ToscaNodeTemplate=org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate,
-                            ToscaServiceTemplate=org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate,
-                            AutomationCompositions=org.onap.policy.clamp.models.acm.concepts.AutomationCompositions,
-                            InstantiationCommand=org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstantiationCommand,
-                            InstantiationResponse=org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstantiationResponse</importMappings>
+                            <importMappings>
+                                ToscaServiceTemplates=org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplates,
+                                ToscaServiceTemplate=org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate,
+                                ToscaNodeTemplate=org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate,
+                                AutomationCompositions=org.onap.policy.clamp.models.acm.concepts.AutomationCompositions,
+                                SimpleResponse=org.onap.policy.clamp.models.acm.messages.rest.SimpleResponse,
+                                InstancePropertiesResponse=org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstancePropertiesResponse,
+                                CommissioningResponse=org.onap.policy.clamp.models.acm.messages.rest.commissioning.CommissioningResponse,
+                                InstantiationCommand=org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstantiationCommand,
+                                InstantiationResponse=org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstantiationResponse
+                            </importMappings>
                             <configOptions>
                                 <sourceFolder>src/gen/java</sourceFolder>
                                 <dateLibrary>java11</dateLibrary>
-- 
cgit