1 files changed, 62 insertions, 82 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionManager.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionManager.java
index e057c7f17f..03bfd827cd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionManager.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionManager.java
@@ -19,6 +19,9 @@
  */
 package org.openecomp.sdc.translator.services.heattotosca;
 
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
 import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
@@ -29,97 +32,74 @@ import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl;
 import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.FileNestedConsolidationData;
 
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
 public class UnifiedCompositionManager {
-  private ConsolidationService consolidationService;
-  private TranslationService translationService = new TranslationService();
-  private UnifiedCompositionService unifiedCompositionService = new UnifiedCompositionService();
 
-  public UnifiedCompositionManager(ConsolidationService consolidationService) {
-    this.consolidationService = consolidationService;
-  }
+    private ConsolidationService consolidationService;
+    private TranslationService translationService = new TranslationService();
+    private UnifiedCompositionService unifiedCompositionService = new UnifiedCompositionService();
 
-  public UnifiedCompositionManager() {
+    public UnifiedCompositionManager(ConsolidationService consolidationService) {
+        this.consolidationService = consolidationService;
+    }
 
-  }
+    public UnifiedCompositionManager() {
+    }
 
-  /**
-   * Create unified composition.
-   *
-   * @param toscaServiceModel  the tosca service model
-   * @param translationContext the translation context
-   * @return the tosca service model
-   */
-  public ToscaServiceModel createUnifiedComposition(ToscaServiceModel toscaServiceModel,
-                                                    TranslationContext translationContext) {
-    Map<String, ServiceTemplate> serviceTemplates = toscaServiceModel.getServiceTemplates();
-    ServiceTemplate mainServiceTemplate =
-        serviceTemplates.get(toscaServiceModel.getEntryDefinitionServiceTemplate());
-    createUnifiedComposition(toscaServiceModel, mainServiceTemplate, translationContext);
-    ToscaServiceModel unifiedToscaServiceModel =
-        HeatToToscaUtil.createToscaServiceModel(mainServiceTemplate, translationContext);
-    return unifiedToscaServiceModel;
-  }
+    /**
+     * Create unified composition.
+     *
+     * @param toscaServiceModel  the tosca service model
+     * @param translationContext the translation context
+     * @return the tosca service model
+     */
+    public ToscaServiceModel createUnifiedComposition(ToscaServiceModel toscaServiceModel, TranslationContext translationContext) {
+        Map<String, ServiceTemplate> serviceTemplates = toscaServiceModel.getServiceTemplates();
+        ServiceTemplate mainServiceTemplate = serviceTemplates.get(toscaServiceModel.getEntryDefinitionServiceTemplate());
+        createUnifiedComposition(toscaServiceModel, mainServiceTemplate, translationContext);
+        ToscaServiceModel unifiedToscaServiceModel = HeatToToscaUtil.createToscaServiceModel(mainServiceTemplate, translationContext);
+        return unifiedToscaServiceModel;
+    }
 
-  private void createUnifiedComposition(ToscaServiceModel toscaServiceModel,
-                                        ServiceTemplate serviceTemplate,
-                                        TranslationContext translationContext) {
-    handleNestedServiceTemplates(toscaServiceModel, serviceTemplate, translationContext);
-    consolidationService.serviceTemplateConsolidation(serviceTemplate, translationContext);
-    unifiedCompositionService
-        .updateUnifiedAbstractNodesConnectivity(serviceTemplate, translationContext);
-    translationContext.addUnifiedHandledServiceTeamplte(serviceTemplate);
-  }
+    private void createUnifiedComposition(ToscaServiceModel toscaServiceModel, ServiceTemplate serviceTemplate,
+                                          TranslationContext translationContext) {
+        handleNestedServiceTemplates(toscaServiceModel, serviceTemplate, translationContext);
+        consolidationService.serviceTemplateConsolidation(serviceTemplate, translationContext);
+        unifiedCompositionService.updateUnifiedAbstractNodesConnectivity(serviceTemplate, translationContext);
+        translationContext.addUnifiedHandledServiceTeamplte(serviceTemplate);
+    }
 
-  private void handleNestedServiceTemplates(ToscaServiceModel toscaServiceModel,
-                                            ServiceTemplate serviceTemplate,
-                                            TranslationContext translationContext) {
-    String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate);
-    FileNestedConsolidationData fileNestedConsolidationData =
-        translationContext.getConsolidationData().getNestedConsolidationData()
+    private void handleNestedServiceTemplates(ToscaServiceModel toscaServiceModel, ServiceTemplate serviceTemplate,
+                                              TranslationContext translationContext) {
+        String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate);
+        FileNestedConsolidationData fileNestedConsolidationData = translationContext.getConsolidationData().getNestedConsolidationData()
             .getFileNestedConsolidationData(serviceTemplateFileName);
-
-    if (Objects.nonNull(fileNestedConsolidationData)) {
-      ToscaAnalyzerService toscaAnalyzerService = new ToscaAnalyzerServiceImpl();
-      for (String substitutedNodeTemplateId : fileNestedConsolidationData
-          .getAllNestedNodeTemplateIds()) {
-        NodeTemplate nestedNodeTemplate =
-            DataModelUtil.getNodeTemplate(serviceTemplate, substitutedNodeTemplateId);
-        if (Objects.isNull(nestedNodeTemplate) || translationContext
-            .isNestedNodeWasHandled(serviceTemplateFileName, substitutedNodeTemplateId)) {
-          continue;
+        if (Objects.nonNull(fileNestedConsolidationData)) {
+            ToscaAnalyzerService toscaAnalyzerService = new ToscaAnalyzerServiceImpl();
+            for (String substitutedNodeTemplateId : fileNestedConsolidationData.getAllNestedNodeTemplateIds()) {
+                NodeTemplate nestedNodeTemplate = DataModelUtil.getNodeTemplate(serviceTemplate, substitutedNodeTemplateId);
+                if (Objects.isNull(nestedNodeTemplate) || translationContext
+                    .isNestedNodeWasHandled(serviceTemplateFileName, substitutedNodeTemplateId)) {
+                    continue;
+                }
+                Optional<String> substituteServiceTemplateName = toscaAnalyzerService
+                    .getSubstituteServiceTemplateName(substitutedNodeTemplateId, nestedNodeTemplate);
+                if (substituteServiceTemplateName.isPresent()) {
+                    ServiceTemplate substitutionServiceTemplate = toscaServiceModel.getServiceTemplates().get(substituteServiceTemplateName.get());
+                    createUnifiedCompositionForNestedServiceTemplate(toscaServiceModel, serviceTemplate, substitutionServiceTemplate,
+                        substitutedNodeTemplateId, translationContext);
+                }
+                translationContext.addNestedNodeAsHandled(serviceTemplateFileName, substitutedNodeTemplateId);
+            }
         }
-        Optional<String> substituteServiceTemplateName =
-            toscaAnalyzerService.getSubstituteServiceTemplateName(substitutedNodeTemplateId,
-                nestedNodeTemplate);
-        if (substituteServiceTemplateName.isPresent()) {
-          ServiceTemplate substitutionServiceTemplate =
-              toscaServiceModel.getServiceTemplates().get(substituteServiceTemplateName.get());
-          createUnifiedCompositionForNestedServiceTemplate(toscaServiceModel, serviceTemplate,
-              substitutionServiceTemplate, substitutedNodeTemplateId, translationContext);
-        }
-        translationContext.addNestedNodeAsHandled(serviceTemplateFileName,
-            substitutedNodeTemplateId);
-      }
     }
-  }
 
-  private void createUnifiedCompositionForNestedServiceTemplate(
-      ToscaServiceModel toscaServiceModel,
-      ServiceTemplate serviceTemplate,
-      ServiceTemplate substitutionServiceTemplate,
-      String substitutedNodeTemplateId,
-      TranslationContext translationContext) {
-    handleNestedServiceTemplates(toscaServiceModel, substitutionServiceTemplate,
-        translationContext);
-    consolidationService.substitutionServiceTemplateConsolidation(substitutedNodeTemplateId,
-        serviceTemplate, substitutionServiceTemplate, translationContext);
-    unifiedCompositionService
-        .updateUnifiedAbstractNodesConnectivity(substitutionServiceTemplate, translationContext);
-    translationContext.addUnifiedHandledServiceTeamplte(substitutionServiceTemplate);
-  }
+    private void createUnifiedCompositionForNestedServiceTemplate(ToscaServiceModel toscaServiceModel, ServiceTemplate serviceTemplate,
+                                                                  ServiceTemplate substitutionServiceTemplate, String substitutedNodeTemplateId,
+                                                                  TranslationContext translationContext) {
+        handleNestedServiceTemplates(toscaServiceModel, substitutionServiceTemplate, translationContext);
+        consolidationService
+            .substitutionServiceTemplateConsolidation(substitutedNodeTemplateId, serviceTemplate, substitutionServiceTemplate, translationContext);
+        unifiedCompositionService.updateUnifiedAbstractNodesConnectivity(substitutionServiceTemplate, translationContext);
+        translationContext.addUnifiedHandledServiceTeamplte(substitutionServiceTemplate);
+    }
 }
-