1 files changed, 14 insertions, 13 deletions
diff --git a/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java
index 6fd5ce5..c703e2c 100644
--- a/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java
+++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java
@@ -20,7 +20,10 @@
 
 package org.onap.sdc.tosca.parser.impl;
 
-import com.google.common.collect.Lists;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.onap.sdc.tosca.parser.api.IEntityDetails;
 import org.onap.sdc.tosca.parser.elements.queries.EntityQuery;
 import org.onap.sdc.tosca.parser.elements.queries.TopologyTemplateQuery;
@@ -31,10 +34,6 @@ import org.onap.sdc.toscaparser.api.ToscaTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 /**
  * Performs search for entity templates inside node template according to query criteria
  */
@@ -54,7 +53,7 @@ class QueryProcessor {
     }
 
     List<IEntityDetails> doQuery() {
-        List<IEntityDetails> entityDetailsList = Lists.newArrayList();
+        final List<IEntityDetails> entityDetailsList = Collections.emptyList();
         if (isServiceSearch()) {
             //search for entities inside the service
             if (logger.isDebugEnabled()) {
@@ -113,15 +112,18 @@ class QueryProcessor {
     }
 
     private List<NodeTemplate> getInternalTopologyTemplates(List<NodeTemplate> nodeTemplateList, boolean isRecursive) {
-        return nodeTemplateList
-            .stream()
-            .map(child->getTopologyTemplatesByQuery(child, isRecursive))
-            .flatMap(List::stream)
-            .collect(Collectors.toList());
+        if (nodeTemplateList != null) {
+            return nodeTemplateList
+                .stream()
+                .map(child -> getTopologyTemplatesByQuery(child, isRecursive))
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
+        }
+        return Collections.emptyList();
     }
 
     private List<NodeTemplate> getTopologyTemplatesByQuery(NodeTemplate current, boolean isRecursive) {
-        List<NodeTemplate> topologyTemplateList = Lists.newArrayList();
+        final List<NodeTemplate> topologyTemplateList = Collections.emptyList();
 
         boolean isTopologyTemplateFound = isRecursive ?
                 SdcTypes.isComplex(current.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE))
@@ -145,5 +147,4 @@ class QueryProcessor {
         return topologyTemplateList;
     }
 
-
 }