Refactor Instance Group processing

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

diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
index 505378e..67c0b2f 100644 (file)
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
@@ -26,7 +26,6 @@ import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.aai.babel.logging.ApplicationMsgs;
@@ -103,8 +102,8 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
      * @return the generated Artifacts
      */
     private GenerationData generateService(final String serviceVersion, ISdcCsarHelper csarHelper) {
-        List<NodeTemplate> serviceNodes = csarHelper.getServiceNodeTemplates();
-        if (serviceNodes == null) {
+        List<NodeTemplate> serviceNodeTemplates = csarHelper.getServiceNodeTemplates();
+        if (serviceNodeTemplates == null) {
             throw new IllegalArgumentException(GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA);
         }
 
@@ -116,12 +115,12 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
         Map<String, String> idTypeStore = new HashMap<>();
 
         ArtifactGeneratorToscaParser parser = new ArtifactGeneratorToscaParser(csarHelper);
-        if (!serviceNodes.isEmpty()) {
-            parser.processServiceTosca(serviceModel, idTypeStore, serviceNodes);
+        if (!serviceNodeTemplates.isEmpty()) {
+            parser.processServiceTosca(serviceModel, idTypeStore, serviceNodeTemplates);
         }
 
         // Process the resource TOSCA files
-        List<Resource> resources = parser.processResourceToscas(serviceNodes, idTypeStore);
+        List<Resource> resources = parser.processResourceToscas(serviceNodeTemplates, idTypeStore);
 
         MDC.put(MDC_PARAM_MODEL_INFO, serviceModel.getModelName() + "," + getArtifactLabel(serviceModel));
         String aaiServiceModel = modelGenerator.generateModelFor(serviceModel);