v20 support in schema-service without javafx

[aai/schema-service.git] / aai-schema-gen / src / main / java / org / onap / aai / schemagen / genxsd / YAMLfromOXM.java

diff --git a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java
index 40d5c0e..0ec95e9 100644 (file)
--- a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java
+++ b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java
@@ -85,7 +85,7 @@ public class YAMLfromOXM extends OxmFileProcessor {
         sb.append("description: |");
         if (versionSupportsSwaggerDiff(v.toString())) {
             sb.append("\n\n    [Differences versus the previous schema version]("
-                + "apidocs/aai_swagger_" + v.toString() + ".diff)");
+                    + "apidocs" + basePath + "/aai_swagger_" + v.toString() + ".diff)");
         }
         sb.append(
                 DOUBLE_LINE_SEPARATOR + "    Copyright © 2017-18 AT&T Intellectual Property. All rights reserved." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR + "    Licensed under the Creative Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except in compliance with the License." + DOUBLE_LINE_SEPARATOR + "    You may obtain a copy of the License at\n\n    (https://creativecommons.org/licenses/by/4.0/)" + DOUBLE_LINE_SEPARATOR + "    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." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR + "    This document is best viewed with Firefox or Chrome. ");
@@ -466,11 +466,11 @@ public class YAMLfromOXM extends OxmFileProcessor {
         logger.debug("opId vs useOpId:" + opId + " vs " + useOpId + " PathParams=" + pathParams);
         // add PUT
         PutOperation put = new PutOperation(useOpId, xmlRootElementName, tag, path,
-            pathParams == null ? "" : pathParams.toString(), this.v);
+            pathParams == null ? "" : pathParams.toString(), this.v, this.basePath);
         pathSb.append(put.toString());
         // add PATCH
         PatchOperation patch = new PatchOperation(useOpId, xmlRootElementName, tag, path,
-            pathParams == null ? "" : pathParams.toString(), this.v);
+            pathParams == null ? "" : pathParams.toString(), this.v, this.basePath);
         patch.setPrefixForPatchRef(patchDefinePrefix);
         pathSb.append(patch.toString());
         // add DELETE