1 files changed, 59 insertions, 6 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/VfModuleArtifactPayload.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/VfModuleArtifactPayload.java
index 89cb6d91ee..71593fa99a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/VfModuleArtifactPayload.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/VfModuleArtifactPayload.java
@@ -20,14 +20,26 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.openecomp.sdc.be.model.GroupDefinition;
+import org.openecomp.sdc.be.model.GroupInstance;
+import org.openecomp.sdc.be.model.GroupInstanceProperty;
 import org.openecomp.sdc.be.model.GroupProperty;
 import org.openecomp.sdc.common.api.Constants;
 
 public class VfModuleArtifactPayload {
+	
+	private String vfModuleModelName, vfModuleModelInvariantUUID, vfModuleModelVersion, vfModuleModelUUID, vfModuleModelCustomizationUUID, vfModuleModelDescription;
+	private Boolean isBase;
+	private List<String> artifacts;
+	private Map< String, Object> properties;
+	
 	public VfModuleArtifactPayload(GroupDefinition group) {
 		vfModuleModelName = group.getName();
 		vfModuleModelInvariantUUID = group.getInvariantUUID();
@@ -40,10 +52,38 @@ public class VfModuleArtifactPayload {
 		setBaseValue(group);
 
 	}
+	
+	public VfModuleArtifactPayload(GroupInstance group) {
+		vfModuleModelName = group.getGroupName();
+		vfModuleModelInvariantUUID = group.getInvariantUUID();
+		vfModuleModelVersion = group.getVersion();
+		vfModuleModelUUID = group.getGroupUUID();
+		vfModuleModelCustomizationUUID = group.getCustomizationUUID();
+		vfModuleModelDescription = group.getDescription();
 
+		artifacts = group.getArtifactsUuid();
+		// Base Value is set from properties
+		setBaseValue(group);
+		
+		if(group.convertToGroupInstancesProperties() != null)
+			setProperties(group.convertToGroupInstancesProperties());
+			//converts List of GroupInstanceProperties to Map propertyName : GroupInstanceProperty ()
+			//setProperties(group.getGroupInstancesProperties().stream().collect(Collectors.toMap(p->p.getName(), p->p)));
+
+	}
+
+	private void setBaseValue(GroupInstance group) {
+		if (group.convertToGroupInstancesProperties() != null) {
+			Optional<GroupInstanceProperty> findBaseProperty = group.convertToGroupInstancesProperties().stream().filter(p -> p.getName().equals(Constants.IS_BASE)).findAny();
+			if (findBaseProperty.isPresent()) {
+				isBase = Boolean.valueOf(findBaseProperty.get().getValue());
+			}
+
+		}
+	}
 	private void setBaseValue(GroupDefinition group) {
 		if (group.getProperties() != null) {
-			Optional<GroupProperty> findBaseProperty = group.getProperties().stream().filter(p -> p.getName().equals(Constants.IS_BASE)).findAny();
+			Optional<GroupProperty> findBaseProperty = group.convertToGroupProperties().stream().filter(p -> p.getName().equals(Constants.IS_BASE)).findAny();
 			if (findBaseProperty.isPresent()) {
 				isBase = Boolean.valueOf(findBaseProperty.get().getValue());
 			}
@@ -51,9 +91,7 @@ public class VfModuleArtifactPayload {
 		}
 	}
 
-	private String vfModuleModelName, vfModuleModelInvariantUUID, vfModuleModelVersion, vfModuleModelUUID, vfModuleModelDescription;
-	private Boolean isBase;
-	private List<String> artifacts;
+
 
 	public List<String> getArtifacts() {
 		return artifacts;
@@ -62,10 +100,25 @@ public class VfModuleArtifactPayload {
 	public void setArtifacts(List<String> artifacts) {
 		this.artifacts = artifacts;
 	}
+	
+	
+
+	public Map<String, Object> getProperties() {
+		return properties;
+	}
+
+	/*public void setProperties(Map<String, Object> properties) {
+		this.properties = properties;
+	}*/
+	
+	public void setProperties(List<GroupInstanceProperty> properties) {
+		this.properties  = properties.stream().filter(p -> !p.getName().equals(Constants.IS_BASE)).collect(
+	                Collectors.toMap(x -> x.getName(), x -> x.getValue() == null? "":x.getValue() ));
+	}
 
 	public static int compareByGroupName(VfModuleArtifactPayload art1, VfModuleArtifactPayload art2) {
-		Integer thisCounter = Integer.parseInt(art1.vfModuleModelName.split(Constants.MODULE_NAME_DELIMITER)[1]);
-		Integer otherCounter = Integer.parseInt(art2.vfModuleModelName.split(Constants.MODULE_NAME_DELIMITER)[1]);
+		Float thisCounter = Float.parseFloat(art1.vfModuleModelName.split(Constants.MODULE_NAME_DELIMITER)[1].replace(' ', '.'));
+		Float otherCounter = Float.parseFloat(art2.vfModuleModelName.split(Constants.MODULE_NAME_DELIMITER)[1].replace(' ', '.'));
 		return thisCounter.compareTo(otherCounter);
 	}
 }