Re-implement model type value for Resource Mapping

[aai/babel.git] / src / main / java / org / onap / aai / babel / xml / generator / api / AaiModelGeneratorImpl.java

diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
index 3bff7e7..5c6488c 100644 (file)
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2019 European Software Marketing Ltd.
+ * Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017-2019 European Software Marketing Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import org.onap.aai.babel.logging.ApplicationMsgs;
 import org.onap.aai.babel.logging.LogHelper;
+import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException;
 import org.onap.aai.babel.xml.generator.model.Resource;
 import org.onap.aai.babel.xml.generator.model.Service;
 import org.onap.aai.babel.xml.generator.model.Widget;
@@ -56,9 +57,10 @@ public class AaiModelGeneratorImpl implements AaiModelGenerator {
      * @param service
      *            Java object model representing an AAI {@link Service} model
      * @return XML representation of the service model in String format
+     * @throws XmlArtifactGenerationException 
      */
     @Override
-    public String generateModelFor(Service service) {
+    public String generateModelFor(Service service) throws XmlArtifactGenerationException {
         // Create a JAXB Model for AAI service model
         Model aaiServiceModel = new Model();
         log.debug("Generating Model for Service with ModelName: " + service.getModelName());
@@ -73,7 +75,7 @@ public class AaiModelGeneratorImpl implements AaiModelGenerator {
         modelVer.setModelElements(new ModelElements());
         ModelElements modelElements = modelVer.getModelElements();
         // Populate basic model details
-        aaiServiceModel.setModelType(service.getModelType().name().toLowerCase()); // Using enum name as model type
+        aaiServiceModel.setModelType(service.getModelTypeName());
         List<ModelElement> modelElementList = modelElements.getModelElement();
 
         // Add service base widget model element
@@ -116,9 +118,10 @@ public class AaiModelGeneratorImpl implements AaiModelGenerator {
      * @param resource
      *            Java object model representing an AAI {@link Resource} model
      * @return XML representation of the resource model in String format
+     * @throws XmlArtifactGenerationException 
      */
     @Override
-    public String generateModelFor(Resource resource) {
+    public String generateModelFor(Resource resource) throws XmlArtifactGenerationException {
         // Create a JAXB Model for AAI Resource model
         Model aaiResourceModel = new Model();
         log.debug("Generating Model for Resource with ModelName: " + resource.getModelName());
@@ -131,7 +134,7 @@ public class AaiModelGeneratorImpl implements AaiModelGenerator {
         modelVer.setModelVersionId(resource.getModelNameVersionId());
         modelVer.setModelElements(new ModelElements());
         ModelElements modelElements = modelVer.getModelElements();
-        aaiResourceModel.setModelType(resource.getModelType().name().toLowerCase()); // Using enum name as model type
+        aaiResourceModel.setModelType(resource.getModelTypeName());
         List<ModelElement> modelElementList = modelElements.getModelElement();
 
         // Add resource base widget model element