wip

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

server/src/main/java/org/apache/cloudstack/dns/DnsProviderManagerImpl.java

@@ -179,21 +179,18 @@ private Pair<List<DnsServerVO>, Integer> searchForDnsServerInternal(ListDnsServe
         Filter searchFilter = new Filter(DnsServerVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
 
         // Step 2: Search for caller's own DNS servers using standard ACL pattern
-        SearchBuilder<DnsServerVO> sb = dnsServerDao.createSearchBuilder();
-        accountMgr.buildACLSearchBuilder(sb, domainId, isRecursive, permittedAccountIds, listProjectResourcesCriteria);
-        sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
-        sb.done();
+        SearchBuilder<DnsServerVO> ownerSb = dnsServerDao.createSearchBuilder();
+        accountMgr.buildACLSearchBuilder(ownerSb, domainId, isRecursive, permittedAccountIds, listProjectResourcesCriteria);
+        ownerSb.and("state", ownerSb.entity().getState(), SearchCriteria.Op.EQ);
+        ownerSb.done();
 
-        SearchCriteria<DnsServerVO> sc = sb.create();
-        accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccountIds, listProjectResourcesCriteria);
-        sc.setParameters("state", DnsServer.State.Enabled);
-
-        Pair<List<DnsServerVO>, Integer> ownServersPair = dnsServerDao.searchAndCount(sc, searchFilter);
-        List<DnsServerVO> dnsServers = new ArrayList<>(ownServersPair.first());
-        int count = ownServersPair.second();
+        SearchCriteria<DnsServerVO> ownerSc = ownerSb.create();
+        accountMgr.buildACLSearchCriteria(ownerSc, domainId, isRecursive, permittedAccountIds, listProjectResourcesCriteria);
+        ownerSc.setParameters("state", DnsServer.State.Enabled);
 
         // Step 3: Search for public DNS servers from caller's domain and children
         // domains
+        // ToDo: use ViewVO and domainpath
         Long callerDomainId = caller.getDomainId();
         DomainVO callerDomain = domainDao.findById(callerDomainId);
         if (callerDomain != null) {
@@ -204,30 +201,21 @@ private Pair<List<DnsServerVO>, Integer> searchForDnsServerInternal(ListDnsServe
                 domainIds.add(childDomain.getId());
             }
 
-            SearchBuilder<DnsServerVO> publicSb = dnsServerDao.createSearchBuilder();
-            publicSb.and("publicDns", publicSb.entity().isPublicServer(), SearchCriteria.Op.EQ);
-            publicSb.and("publicDomainId", publicSb.entity().getDomainId(), SearchCriteria.Op.IN);
-            publicSb.and("publicState", publicSb.entity().getState(), SearchCriteria.Op.EQ);
-            publicSb.done();
-
-            SearchCriteria<DnsServerVO> publicSc = publicSb.create();
-            publicSc.setParameters("publicDns", 1);
-            publicSc.setParameters("publicDomainId", domainIds.toArray());
-            publicSc.setParameters("publicState", DnsServer.State.Enabled);
-
-            List<DnsServerVO> publicServers = dnsServerDao.search(publicSc, null);
-
-            // Deduplicate: add only public servers not already in the own servers list
-            List<Long> ownServerIds = dnsServers.stream().map(DnsServerVO::getId).collect(Collectors.toList());
-            for (DnsServerVO publicServer : publicServers) {
-                if (!ownServerIds.contains(publicServer.getId())) {
-                    dnsServers.add(publicServer);
-                    count++;
-                }
-            }
-        }
+            SearchBuilder<DnsServerVO> sb = dnsServerDao.createSearchBuilder();
+            sb.and("publicDns", sb.entity().isPublicServer(), SearchCriteria.Op.EQ);
+            sb.and("publicDomainId", sb.entity().getDomainId(), SearchCriteria.Op.IN);
+            sb.and("publicState", sb.entity().getState(), SearchCriteria.Op.EQ);
+            sb.done();
+
+            SearchCriteria<DnsServerVO> sc = sb.create();
+            sc.setParameters("publicDns", 1);
+            sc.setParameters("publicDomainId", domainIds.toArray());
+            sc.setParameters("publicState", DnsServer.State.Enabled);
+            sc.addOr("ownerSc", SearchCriteria.Op.SC, ownerSc);
 
-        return new Pair<>(dnsServers, count);
+            return dnsServerDao.searchAndCount(sc, searchFilter);
+        }
+        return dnsServerDao.searchAndCount(ownerSc, searchFilter);
     }
 
     @Override