Replace findDetails with listDetailsKeyPair.

leaseweb · May 7, 2024 · 9fd848c · 9fd848c
1 parent 367c712
commit 9fd848c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java
@@ -27,8 +27,6 @@ public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, Re
 
     boolean isNetworkUsageHidden(long networkId);
 
-    Map<String, String> findDetails(long networkId);
-
     void persist(long networkId, Map<String, String> details);
 
     NetworkDetailVO findDetail(long networkId, String name);

diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDaoImpl.java
@@ -59,18 +59,6 @@ public boolean isNetworkUsageHidden(long networkId) {
         return networkDetail != null && "true".equals(networkDetail.getValue());
     }
 
-    @Override
-    public Map<String, String> findDetails(long networkId) {
-        QueryBuilder<NetworkDetailVO> sc = QueryBuilder.create(NetworkDetailVO.class);
-        sc.and(sc.entity().getResourceId(), Op.EQ, networkId);
-        List<NetworkDetailVO> results = sc.list();
-        Map<String, String> details = new HashMap<String, String>(results.size());
-        for (NetworkDetailVO r : results) {
-            details.put(r.getName(), r.getValue());
-        }
-        return details;
-    }
-
     @Override
     public void persist(long networkId, Map<String, String> details) {
         try(TransactionLegacy txn = TransactionLegacy.currentTxn()) {
@@ -113,7 +101,7 @@ public void deleteDetails(long networkId) {
 
     @Override
     public void update(long networkId, Map<String, String> details) {
-        Map<String, String> oldDetails = findDetails(networkId);
+        Map<String, String> oldDetails = listDetailsKeyPairs(networkId);
         oldDetails.putAll(details);
         persist(networkId, oldDetails);
     }

diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java
@@ -1516,7 +1516,7 @@ public static Map<String, String> getAccountDetails(long accountId) {
     }
 
     public static Map<String, String> getNetworkDetails(long networkId) {
-        Map<String, String> details = s_networkDetailsDao.findDetails(networkId);
+        Map<String, String> details = s_networkDetailsDao.listDetailsKeyPairs(networkId);
         return details.isEmpty() ? null : details;
     }