1 files changed, 30 insertions, 8 deletions

diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java b/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
index 8ab5e4c..2a0a0ab 100644
--- a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
+++ b/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
@@ -1,30 +1,52 @@
 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.toscaparser.api.EntityTemplate;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.Policy;
+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 Policies
  */
 public class PolicyEntityQuery extends EntityQuery {
 
-    public PolicyEntityQuery() {
+    PolicyEntityQuery() {
         super(EntityTemplateType.POLICY, null, null);
     }
 
+    PolicyEntityQuery(String toscaType) {
+        super(EntityTemplateType.POLICY, null, toscaType);
+    }
+
     @Override
-    public List<EntityTemplate> searchByTopologyTemplate(TopologyTemplateQuery topologyTemplateQuery) {
-        return null;
+    public List<IEntityDetails> getEntitiesFromTopologyTemplate(NodeTemplate nodeTemplate) {
+        if (nodeTemplate.getOriginComponentTemplate() != null) {
+            return convertPolicyLisToEntityDetailsList(filter(nodeTemplate.getOriginComponentTemplate().getPolicies()));
+        }
+        return Lists.newArrayList();
     }
 
     @Override
-    public EntityTemplateType getType() {
-        return EntityTemplateType.POLICY;
+    public List<IEntityDetails> getEntitiesFromService(ToscaTemplate toscaTemplate) {
+        return convertPolicyLisToEntityDetailsList(filter(toscaTemplate.getPolicies()));
     }
 
-    public PolicyEntityQuery(String toscaType) {
-        super(EntityTemplateType.POLICY, null, toscaType);
+    static List<IEntityDetails> convertPolicyLisToEntityDetailsList(Stream<Policy> policies) {
+        return policies
+            .map(p->EntityDetailsFactory.createEntityDetails(EntityTemplateType.POLICY, p))
+            .collect(Collectors.toList());
     }
+
+    private Stream<Policy> filter(List<Policy> policyList) {
+        return policyList.stream()
+                .filter(p->isSearchCriteriaMatched(p.getMetaDataObj(), p.getType()));
+    }
+
 }