fix xsd generation when obj crosses oxm files

[aai/aai-common.git] / aai-core / src / main / java / org / onap / aai / util / GenerateXsd.java

diff --git a/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java b/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java
index d94457e..84f0606 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java
+++ b/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java
@@ -236,6 +236,7 @@ public class GenerateXsd {
                                logger.error( "Exception creating output file " + outfileName);
                                logger.error( e.getMessage());
                                e.printStackTrace();
+                               System.exit(-1);
                                }
                        } else if ( versionSupportsSwagger(apiVersion )) {
                                outfileName = yaml_dir + "/aai_swagger_" + apiVersion + "." + generateTypeYAML;
@@ -244,8 +245,10 @@ public class GenerateXsd {
                                        YAMLfromOXM swagger = (YAMLfromOXM) ctx.getBean(YAMLfromOXM.class);
                                        swagger.setVersion(v);
                                        fileContent = swagger.process();
+                                       Map combinedJavaTypes = swagger.getCombinedJavaTypes();
                                        NodesYAMLfromOXM nodesSwagger = ctx.getBean(NodesYAMLfromOXM.class);
                                        nodesSwagger.setVersion(v);
+                                       nodesSwagger.setCombinedJavaTypes(combinedJavaTypes);
                                        nodesContent = nodesSwagger.process();
                                } catch(Exception e) {
                                logger.error( "Exception creating output file " + outfileName);