Use checked Exception instead of RuntimeException

Replace IllegalArgumentException with XmlArtifactGenerationException in
the ArtifactGeneratorToscaParser method processResourceModels().
Add comments to explain the processing.

Change-Id: Icf401ae22ebe26d687fc58c33743582c9c9e576e
Issue-ID: AAI-2281
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java b/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
index 281ac63..0777e51 100644
--- a/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
+++ b/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
@@ -237,10 +237,18 @@ public class ArtifactGeneratorToscaParser {
     }
 
     /**
+     * Add each of the resources to the specified resourceModel. If the resourceModel type is Allotted Resource then
+     * validate that one of the resources is a Providing Service.
+     *
      * @param resourceModel
+     *            parent Resource model
      * @param resourceNodeTemplates
+     *            the child node templates of the resourceModel
+     * @throws XmlArtifactGenerationException
+     *             if the resourceModel is an ALLOTTED_RESOURCE with no Providing Service
      */
-    public void processResourceModels(Model resourceModel, List<NodeTemplate> resourceNodeTemplates) {
+    public void processResourceModels(Resource resourceModel, List<NodeTemplate> resourceNodeTemplates)
+            throws XmlArtifactGenerationException {
         boolean foundProvidingService = false;
 
         for (NodeTemplate resourceNodeTemplate : resourceNodeTemplates) {
@@ -261,9 +269,8 @@ public class ArtifactGeneratorToscaParser {
         }
 
         if (resourceModel.hasWidgetType("ALLOTTED_RESOURCE") && !foundProvidingService) {
-            final String modelInvariantId = resourceModel.getModelId();
-            throw new IllegalArgumentException(String.format(GENERATOR_AAI_PROVIDING_SERVICE_MISSING,
-                    modelInvariantId == null ? "<null ID>" : modelInvariantId));
+            throw new XmlArtifactGenerationException(String.format(GENERATOR_AAI_PROVIDING_SERVICE_MISSING,
+                    Optional.ofNullable(resourceModel.getModelId()).orElse("<null ID>")));
         }
     }