Move saveDetails method to UserVmDetailsDaoImpl

BartJM · BartJM · commit b76e698e5cf9 · 2024-09-27T11:28:54.000+02:00
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDao.java
@@ -29,10 +29,6 @@ public interface ConsoleProxyDao extends GenericDao<ConsoleProxyVO, Long> {
 
     public void update(long id, int activeSession, Date updateTime, byte[] sessionDetails);
 
-    public void saveDetails(ConsoleProxyVO vm);
-
-    public void saveDetails(ConsoleProxyVO vm, List<String> hiddenDetails);
-
     public List<ConsoleProxyVO> getProxyListInStates(long dataCenterId, State... states);
 
     public List<ConsoleProxyVO> getProxyListInStates(State... states);
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java
@@ -22,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 
 import org.springframework.stereotype.Component;
@@ -37,9 +36,6 @@
 import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.UserVmDetailVO;
-
-import javax.inject.Inject;
 
 @Component
 public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> implements ConsoleProxyDao {
@@ -95,9 +91,6 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im
 
     protected final Attribute _updateTimeAttr;
 
-    @Inject
-    protected UserVmDetailsDao _detailsDao;
-
     public ConsoleProxyDaoImpl() {
         DataCenterStatusSearch = createSearchBuilder();
         DataCenterStatusSearch.and("dc", DataCenterStatusSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
@@ -338,27 +331,4 @@ public List<ConsoleProxyVO> listByLastHostId(long hostId) {
         sc.setParameters("state", State.Stopped);
         return listBy(sc);
     }
-
-    @Override
-    public void saveDetails(ConsoleProxyVO vm) {
-        saveDetails(vm, new ArrayList<String>());
-    }
-
-    @Override
-    public void saveDetails(ConsoleProxyVO vm, List<String> hiddenDetails) {
-        Map<String, String> detailsStr = vm.getDetails();
-        if (detailsStr == null) {
-            return;
-        }
-
-        final Map<String, Boolean> visibilityMap = _detailsDao.listDetailsVisibility(vm.getId());
-
-        List<UserVmDetailVO> details = new ArrayList<UserVmDetailVO>();
-        for (Map.Entry<String, String> entry : detailsStr.entrySet()) {
-            boolean display = !hiddenDetails.contains(entry.getKey()) && visibilityMap.getOrDefault(entry.getKey(), true);
-            details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
-        }
-
-        _detailsDao.saveDetails(details);
-    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDao.java
@@ -96,11 +96,6 @@ public interface DomainRouterDao extends GenericDao<DomainRouterVO, Long> {
      */
     public List<DomainRouterVO> listRunningByDomain(Long id);
 
-
-    public void saveDetails(DomainRouterVO vm);
-
-    public void saveDetails(DomainRouterVO vm, List<String> hiddenDetails);
-
     /**
      * gets the total count by role
      * @Param role Router role
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDaoImpl.java
@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -49,7 +48,6 @@
 import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.UserVmDetailVO;
 
 @Component
 @DB
@@ -73,9 +71,6 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
     NetworkOfferingDao _offDao;
     protected SearchBuilder<DomainRouterVO> VpcSearch;
 
-    @Inject
-    protected UserVmDetailsDao _detailsDao;
-
     public DomainRouterDaoImpl() {
     }
 
@@ -455,27 +450,4 @@ public List<DomainRouterVO> listIncludingRemovedByVpcId(long vpcId) {
         sc.setParameters("role", Role.VIRTUAL_ROUTER);
         return listIncludingRemovedBy(sc);
     }
-
-    @Override
-    public void saveDetails(DomainRouterVO vm) {
-        saveDetails(vm, new ArrayList<String>());
-    }
-
-    @Override
-    public void saveDetails(DomainRouterVO vm, List<String> hiddenDetails) {
-        Map<String, String> detailsStr = vm.getDetails();
-        if (detailsStr == null) {
-            return;
-        }
-
-        final Map<String, Boolean> visibilityMap = _detailsDao.listDetailsVisibility(vm.getId());
-
-        List<UserVmDetailVO> details = new ArrayList<UserVmDetailVO>();
-        for (Map.Entry<String, String> entry : detailsStr.entrySet()) {
-            boolean display = !hiddenDetails.contains(entry.getKey()) && visibilityMap.getOrDefault(entry.getKey(), true);
-            details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
-        }
-
-        _detailsDao.saveDetails(details);
-    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/SecondaryStorageVmDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/SecondaryStorageVmDao.java
@@ -25,10 +25,6 @@
 
 public interface SecondaryStorageVmDao extends GenericDao<SecondaryStorageVmVO, Long> {
 
-    public void saveDetails(SecondaryStorageVmVO vm);
-
-    public void saveDetails(SecondaryStorageVmVO vm, List<String> hiddenDetails);
-
     public List<SecondaryStorageVmVO> getSecStorageVmListInStates(SecondaryStorageVm.Role role, long dataCenterId, State... states);
 
     public List<SecondaryStorageVmVO> getSecStorageVmListInStates(SecondaryStorageVm.Role role, State... states);
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java
@@ -21,7 +21,6 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 
 import org.springframework.stereotype.Component;
@@ -35,9 +34,6 @@
 import com.cloud.vm.SecondaryStorageVm;
 import com.cloud.vm.SecondaryStorageVmVO;
 import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.UserVmDetailVO;
-
-import javax.inject.Inject;
 
 @Component
 public class SecondaryStorageVmDaoImpl extends GenericDaoBase<SecondaryStorageVmVO, Long> implements SecondaryStorageVmDao {
@@ -53,9 +49,6 @@ public class SecondaryStorageVmDaoImpl extends GenericDaoBase<SecondaryStorageVm
 
     protected final Attribute _updateTimeAttr;
 
-    @Inject
-    protected UserVmDetailsDao _detailsDao;
-
     public SecondaryStorageVmDaoImpl() {
         DataCenterStatusSearch = createSearchBuilder();
         DataCenterStatusSearch.and("dc", DataCenterStatusSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
@@ -273,27 +266,4 @@ public List<Long> listRunningSecStorageOrderByLoad(SecondaryStorageVm.Role role,
 
         return l;
     }
-
-    @Override
-    public void saveDetails(SecondaryStorageVmVO vm) {
-        saveDetails(vm, new ArrayList<String>());
-    }
-
-    @Override
-    public void saveDetails(SecondaryStorageVmVO vm, List<String> hiddenDetails) {
-        Map<String, String> detailsStr = vm.getDetails();
-        if (detailsStr == null) {
-            return;
-        }
-
-        final Map<String, Boolean> visibilityMap = _detailsDao.listDetailsVisibility(vm.getId());
-
-        List<UserVmDetailVO> details = new ArrayList<UserVmDetailVO>();
-        for (Map.Entry<String, String> entry : detailsStr.entrySet()) {
-            boolean display = !hiddenDetails.contains(entry.getKey()) && visibilityMap.getOrDefault(entry.getKey(), true);
-            details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
-        }
-
-        _detailsDao.saveDetails(details);
-    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java
@@ -20,6 +20,14 @@
 
 import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceVO;
+
+import java.util.List;
 
 public interface UserVmDetailsDao extends GenericDao<UserVmDetailVO, Long>, ResourceDetailsDao<UserVmDetailVO> {
+
+    public void saveDetails(VMInstanceVO vm);
+
+    public void saveDetails(VMInstanceVO vm, List<String> hiddenDetails);
+
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
@@ -22,6 +22,11 @@
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
 
 import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceVO;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class UserVmDetailsDaoImpl extends ResourceDetailsDaoBase<UserVmDetailVO> implements UserVmDetailsDao {
@@ -31,4 +36,26 @@ public void addDetail(long resourceId, String key, String value, boolean display
         super.addDetail(new UserVmDetailVO(resourceId, key, value, display));
     }
 
+    @Override
+    public void saveDetails(VMInstanceVO vm) {
+        saveDetails(vm, new ArrayList<String>());
+    }
+
+    @Override
+    public void saveDetails(VMInstanceVO vm, List<String> hiddenDetails) {
+        Map<String, String> detailsStr = vm.getDetails();
+        if (detailsStr == null) {
+            return;
+        }
+
+        final Map<String, Boolean> visibilityMap = listDetailsVisibility(vm.getId());
+
+        List<UserVmDetailVO> details = new ArrayList<UserVmDetailVO>();
+        for (Map.Entry<String, String> entry : detailsStr.entrySet()) {
+            boolean display = !hiddenDetails.contains(entry.getKey()) && visibilityMap.getOrDefault(entry.getKey(), true);
+            details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
+        }
+
+        saveDetails(details);
+    }
 }
diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -720,7 +720,7 @@ protected Map<String, Object> createProxyInstance(long dataCenterId, VMTemplateV
         proxy.setLimitCpuUse(serviceOffering.getLimitCpuUse());
         proxy = consoleProxyDao.persist(proxy);
         proxy.setDetails(template.getDetails());
-        consoleProxyDao.saveDetails(proxy);
+        userVmDetailsDao.saveDetails(proxy);
         try {
             virtualMachineManager.allocate(name, template, serviceOffering, networks, plan, null);
         } catch (InsufficientCapacityException e) {
diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
@@ -30,6 +30,7 @@
 
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.utils.validation.ChecksumUtil;
+import com.cloud.vm.dao.UserVmDetailsDao;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -176,6 +177,8 @@ public class NetworkHelperImpl implements NetworkHelper {
     CapacityManager capacityMgr;
     @Inject
     VpcDao vpcDao;
+    @Inject
+    private UserVmDetailsDao userVmDetailsDao;
 
     protected final Map<HypervisorType, ConfigKey<String>> hypervisorsMap = new HashMap<>();
 
@@ -557,7 +560,7 @@ public DomainRouterVO deployRouter(final RouterDeploymentDefinition routerDeploy
                 router = _routerDao.persist(router);
 
                 router.setDetails(template.getDetails());
-                _routerDao.saveDetails(router);
+                userVmDetailsDao.saveDetails(router);
 
                 reallocateRouterNetworks(routerDeploymentDefinition, router, template, null);
                 router = _routerDao.findById(router.getId());
diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -672,7 +672,7 @@ protected Map<String, Object> createSecStorageVmInstance(long dataCenterId, Seco
         secStorageVm.setLimitCpuUse(serviceOffering.getLimitCpuUse());
         secStorageVm = _secStorageVmDao.persist(secStorageVm);
         secStorageVm.setDetails(template.getDetails());
-        _secStorageVmDao.saveDetails(secStorageVm);
+        _vmDetailsDao.saveDetails(secStorageVm);
         try {
             _itMgr.allocate(name, template, serviceOffering, networks, plan, null);
             secStorageVm = _secStorageVmDao.findById(secStorageVm.getId());
