1 files changed, 8 insertions, 13 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
index 6e23454a62..e4a1187072 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
@@ -25,6 +25,7 @@ import static java.util.stream.Collectors.toList;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -84,6 +85,9 @@ public class UiComponentDataConverter {
             case INPUTS:
                 setInputs(dataTransfer, component);
                 break;
+            case OUTPUTS:
+                setOutputs(dataTransfer, component);
+                break;
             case COMPONENT_INSTANCE_RELATION:
                 setComponentInstanceRelation(dataTransfer, component);
                 break;
@@ -212,6 +216,10 @@ public class UiComponentDataConverter {
         }
     }
 
+    private void setOutputs(final UiComponentDataTransfer dataTransfer, final Component component) {
+        dataTransfer.setOutputs(component.getOutputs() == null ? Collections.emptyList() : component.getOutputs());
+    }
+
     private void setComponentInstanceInputs(UiComponentDataTransfer dataTransfer, Component component) {
         if (component.getComponentInstancesInputs() == null) {
             dataTransfer.setComponentInstancesInputs(new HashMap<>());
@@ -374,11 +382,6 @@ public class UiComponentDataConverter {
                 case DERIVED_FROM:
                     setDerivedFrom(resource, dataTransfer);
                     break;
-
-                case ATTRIBUTES:
-                    setAttributes(resource, dataTransfer);
-                    break;
-
                 case ADDITIONAL_INFORMATION:
                     setAdditionalInfo(resource, dataTransfer);
                     break;
@@ -427,14 +430,6 @@ public class UiComponentDataConverter {
         }
     }
 
-    private void setAttributes(Resource resource, UiResourceDataTransfer dataTransfer) {
-        if (resource.getAttributes() == null) {
-            dataTransfer.setAttributes(new ArrayList<>());
-        } else {
-            dataTransfer.setAttributes(resource.getAttributes());
-        }
-    }
-
     private void setAdditionalInfo(Resource resource, UiResourceDataTransfer dataTransfer) {
         if (resource.getAdditionalInformation() == null) {
             dataTransfer.setAdditionalInformation(new ArrayList<>());