1 files changed, 27 insertions, 19 deletions

diff --git a/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
index f93505d..32a4b10 100644
--- a/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
+++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,17 +21,17 @@
 package org.onap.sdc.tosca.parser.elements.queries;
 
 import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 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.NodeTemplate;
 import org.onap.sdc.toscaparser.api.Policy;
+import org.onap.sdc.toscaparser.api.TopologyTemplate;
 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
  */
@@ -45,28 +45,36 @@ public class PolicyEntityQuery extends EntityQuery {
         super(EntityTemplateType.POLICY, null, toscaType);
     }
 
+    static List<IEntityDetails> convertPolicyLisToEntityDetailsList(final Stream<Policy> policies) {
+        return policies
+            .map(p -> EntityDetailsFactory.createEntityDetails(EntityTemplateType.POLICY, p))
+            .collect(Collectors.toList());
+    }
+
     @Override
-    public List<IEntityDetails> getEntitiesFromTopologyTemplate(NodeTemplate nodeTemplate) {
-        if (nodeTemplate.getOriginComponentTemplate() != null) {
-            return convertPolicyLisToEntityDetailsList(filter(nodeTemplate.getOriginComponentTemplate().getPolicies()));
+    public List<IEntityDetails> getEntitiesFromTopologyTemplate(final NodeTemplate nodeTemplate) {
+        final TopologyTemplate originComponentTemplate = nodeTemplate.getOriginComponentTemplate();
+        if (originComponentTemplate != null) {
+            final List<Policy> policies = originComponentTemplate.getPolicies();
+            if (policies != null) {
+                return convertPolicyLisToEntityDetailsList(filter(policies));
+            }
         }
         return Lists.newArrayList();
     }
 
     @Override
-    public List<IEntityDetails> getEntitiesFromService(ToscaTemplate toscaTemplate) {
-        return convertPolicyLisToEntityDetailsList(filter(toscaTemplate.getPolicies()));
-    }
-
-    static List<IEntityDetails> convertPolicyLisToEntityDetailsList(Stream<Policy> policies) {
-        return policies
-            .map(p->EntityDetailsFactory.createEntityDetails(EntityTemplateType.POLICY, p))
-            .collect(Collectors.toList());
+    public List<IEntityDetails> getEntitiesFromService(final ToscaTemplate toscaTemplate) {
+        final List<Policy> policies = toscaTemplate.getPolicies();
+        if (policies != null) {
+            return convertPolicyLisToEntityDetailsList(filter(policies));
+        }
+        return Lists.newArrayList();
     }
 
-    private Stream<Policy> filter(List<Policy> policyList) {
+    private Stream<Policy> filter(final List<Policy> policyList) {
         return policyList.stream()
-                .filter(p->isSearchCriteriaMatched(p.getMetaDataObj(), p.getType()));
+            .filter(p -> isSearchCriteriaMatched(p.getMetaDataObj(), p.getType()));
     }
 
 }