1 files changed, 6 insertions, 7 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java
index 5586574669..7f3025408f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java
@@ -5,19 +5,18 @@ import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Utility class for consolidation data collection helper methods.
  */
 public class UnifiedCompositionUtil {
 
-  protected static Logger logger = (Logger) LoggerFactory.getLogger(UnifiedCompositionUtil.class);
+  protected static Logger logger = LoggerFactory.getLogger(UnifiedCompositionUtil.class);
 
   /**
    * Gets all ports per port type, which are connected to the computes from the input
@@ -27,9 +26,9 @@ public class UnifiedCompositionUtil {
    *                                                   consolidation data
    * @return set of port ids, per port type
    */
-  public static Map<String, Set<String>> collectAllPortsFromEachTypesFromComputes(
+  static Map<String, List<String>> collectAllPortsFromEachTypesFromComputes(
       Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDataCollection) {
-    Map<String, Set<String>> portTypeToIds = new HashMap<>();
+    Map<String, List<String>> portTypeToIds = new HashMap<>();
 
     for (ComputeTemplateConsolidationData compute : computeTemplateConsolidationDataCollection) {
       Map<String, List<String>> ports = compute.getPorts();
@@ -41,10 +40,10 @@ public class UnifiedCompositionUtil {
     return portTypeToIds;
   }
 
-  private static void addPortsToMap(Map<String, Set<String>> portTypeToIds,
+  private static void addPortsToMap(Map<String, List<String>> portTypeToIds,
                                     Map<String, List<String>> ports) {
     for (Map.Entry<String, List<String>> portTypeToIdEntry : ports.entrySet()) {
-      portTypeToIds.putIfAbsent(portTypeToIdEntry.getKey(), new HashSet<>());
+      portTypeToIds.putIfAbsent(portTypeToIdEntry.getKey(), new ArrayList<>());
       portTypeToIds.get(portTypeToIdEntry.getKey()).addAll(portTypeToIdEntry.getValue());
     }
   }