1 files changed, 14 insertions, 7 deletions

diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java b/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java
index 82488a7..32a91aa 100644
--- a/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java
+++ b/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java
@@ -4,18 +4,28 @@ import org.onap.sdc.tosca.parser.api.IEntityDetails;
 import org.onap.sdc.tosca.parser.enums.EntityTemplateType;
 import org.onap.sdc.toscaparser.api.EntityTemplate;
 import org.onap.sdc.toscaparser.api.Group;
-import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.onap.sdc.toscaparser.api.elements.Metadata;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class GroupEntityDetails extends EntityDetails {
     private final Group group;
+    private final List<IEntityDetails> memberNodes;
 
-    GroupEntityDetails(EntityTemplate entityTemplate, NodeTemplate parentNode)  {
-        super(entityTemplate,parentNode);
+    GroupEntityDetails(EntityTemplate entityTemplate)  {
+        super(entityTemplate);
         group = (Group)getEntityTemplate();
+        if (group.getMemberNodes() != null) {
+            memberNodes = group.getMemberNodes()
+                    .stream()
+                    .map(m->EntityDetailsFactory.createEntityDetails(EntityTemplateType.NODE_TEMPLATE, m))
+                    .collect(Collectors.toList());
+        }
+        else {
+            memberNodes = Collections.emptyList();
+        }
     }
 
     @Override
@@ -25,10 +35,7 @@ public class GroupEntityDetails extends EntityDetails {
 
     @Override
     public List<IEntityDetails> getMemberNodes() {
-        return group.getMemberNodes()
-                .stream()
-                .map(m->EntityDetailsFactory.createEntityDetails(EntityTemplateType.NODE_TEMPLATE, m, null))
-                .collect(Collectors.toList());
+        return memberNodes;
     }
 
     @Override