1 files changed, 37 insertions, 10 deletions

diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java b/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java
index 4e01bd8..b5a7a2e 100644
--- a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java
+++ b/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java
@@ -1,34 +1,61 @@
 package org.onap.sdc.tosca.parser.elements.queries;
 
+import com.google.common.collect.Lists;
+import org.onap.sdc.tosca.parser.api.IEntityDetails;
+import org.onap.sdc.tosca.parser.elements.EntityDetailsFactory;
 import org.onap.sdc.tosca.parser.enums.EntityTemplateType;
 import org.onap.sdc.tosca.parser.enums.SdcTypes;
-import org.onap.sdc.toscaparser.api.EntityTemplate;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.ToscaTemplate;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Implements EntityQuery object for NodeTemplates
  */
 public class NodeTemplateEntityQuery extends EntityQuery {
-    public NodeTemplateEntityQuery() {
+    NodeTemplateEntityQuery() {
         super(EntityTemplateType.NODE_TEMPLATE, null, null);
     }
 
+    NodeTemplateEntityQuery(SdcTypes nodeTemplateType) {
+        super(EntityTemplateType.NODE_TEMPLATE, nodeTemplateType, null);
+    }
+
+    NodeTemplateEntityQuery(String toscaType) {
+        super(EntityTemplateType.NODE_TEMPLATE, null, toscaType);
+    }
+
     @Override
-    public EntityTemplateType getType() {
-        return EntityTemplateType.NODE_TEMPLATE;
+    public List<IEntityDetails> getEntitiesFromTopologyTemplate(NodeTemplate nodeTemplate) {
+        if (nodeTemplate.getSubMappingToscaTemplate() != null) {
+            return convertNodeTemplatesListToEntityDetailsList(filter(nodeTemplate.getSubMappingToscaTemplate()
+                    .getNodeTemplates()));
+        }
+        return Lists.newArrayList();
     }
 
     @Override
-    public List<EntityTemplate> searchByTopologyTemplate(TopologyTemplateQuery topologyTemplateQuery) {
-        return null;
+    public List<IEntityDetails> getEntitiesFromService(ToscaTemplate toscaTemplate) {
+        return convertNodeTemplatesListToEntityDetailsList(filter(toscaTemplate.getNodeTemplates()));
     }
 
-    public NodeTemplateEntityQuery(SdcTypes nodeTemplateType) {
-        super(EntityTemplateType.NODE_TEMPLATE, nodeTemplateType, null);
+    static List<IEntityDetails> convertNodeTemplatesListToEntityDetailsList(Stream<NodeTemplate> nodeTemplates) {
+        return nodeTemplates
+            .map(nt->EntityDetailsFactory.createEntityDetails(EntityTemplateType.NODE_TEMPLATE, nt))
+            .collect(Collectors.toList());
     }
 
-    public NodeTemplateEntityQuery(String toscaType) {
-        super(EntityTemplateType.NODE_TEMPLATE, null, toscaType);
+    private Stream<NodeTemplate> filter(List<NodeTemplate> nodeTemplateList) {
+        return nodeTemplateList.stream()
+                .filter(nt->isSearchCriteriaMatched(nt.getMetaData(), nt.getType()))
+                .filter(nt->getNodeTemplateType() == null ||
+                        isStringMatchingOrNull(nt.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE),
+                                getNodeTemplateType().getValue()));
     }
+
+
 }