Refactoring for showUnique templates

Author: davidjumani

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -3508,29 +3508,7 @@ else if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYP
             }
         }
 
-        Integer count = uniqueTmplPair.second();
-        if (count.intValue() == 0) {
-            // empty result
-            return uniqueTmplPair;
-        }
-        List<TemplateJoinVO> uniqueTmpls = uniqueTmplPair.first();
-        int i = 0;
-        List<TemplateJoinVO> vrs = null;
-        if (showUnique) {
-            Long[] tzIds = new Long[uniqueTmpls.size()];
-            for (TemplateJoinVO v : uniqueTmpls) {
-                tzIds[i++] = v.getId();
-            }
-            vrs = _templateJoinDao.findByDistinctIds(tzIds);
-        } else {
-            String[] tzIds = new String[uniqueTmpls.size()];
-            for (TemplateJoinVO v : uniqueTmpls) {
-                tzIds[i++] = v.getTempZonePair();
-            }
-            vrs = _templateJoinDao.searchByTemplateZonePair(showRemovedTmpl, tzIds);
-        }
-
-        return new Pair<List<TemplateJoinVO>, Integer>(vrs, count);
+        return findTemplatesByIdOrTempZonePair(uniqueTmplPair, showRemovedTmpl, showUnique);
 
         // TODO: revisit the special logic for iso search in
         // VMTemplateDaoImpl.searchForTemplates and understand why we need to
@@ -3539,6 +3517,25 @@ else if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYP
 
     }
 
+    // findTemplatesByIdOrTempZonePair returns the templates with the given ids if showUnique is true, or else by the TempZonePair
+    private Pair<List<TemplateJoinVO>, Integer> findTemplatesByIdOrTempZonePair(Pair<List<TemplateJoinVO>, Integer> templateDataPair, boolean showRemoved, boolean showUnique) {
+        Integer count = templateDataPair.second();
+        if (count.intValue() == 0) {
+            // empty result
+            return templateDataPair;
+        }
+        List<TemplateJoinVO> templateData = templateDataPair.first();
+        List<TemplateJoinVO> templates = null;
+        if (showUnique) {
+            Long[] templateIds = templateData.stream().map(template -> template.getId()).toArray(Long[]::new);
+            templates = _templateJoinDao.findByDistinctIds(templateIds);
+        } else {
+            String[] templateZonePairs = templateData.stream().map(template -> template.getTempZonePair()).toArray(String[]::new);
+            templates = _templateJoinDao.searchByTemplateZonePair(showRemoved, templateZonePairs);
+        }
+        return new Pair<List<TemplateJoinVO>, Integer>(templates, count);
+    }
+
     @Override
     public ListResponse<TemplateResponse> listIsos(ListIsosCmd cmd) {
         Pair<List<TemplateJoinVO>, Integer> result = searchForIsosInternal(cmd);

server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java

@@ -490,7 +490,7 @@ public Pair<List<TemplateJoinVO>, Integer> searchIncludingRemovedAndCount(final
 
     @Override
     public List<TemplateJoinVO> findByDistinctIds(Long... ids) {
-        if (ids.length == 0) {
+        if (ids == null || ids.length == 0) {
             return new ArrayList<TemplateJoinVO>();
         }
         SearchCriteria<TemplateJoinVO> sc = tmpltIdsSearch.create();