Merge remote-tracking branch 'upstream/main' into multi-scope

engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java

@@ -40,8 +40,6 @@
 
 public class ClusterDetailsDaoImpl extends ResourceDetailsDaoBase<ClusterDetailsVO> implements ClusterDetailsDao, ScopedConfigStorage {
 
-public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long> implements ClusterDetailsDao, ScopedConfigStorage {
-
     @Inject
     ClusterDao clusterDao;
 
@@ -198,11 +196,11 @@
     }
 
     @Override
     public Pair<Scope, Long> getParentScope(long id) {
         Cluster cluster = clusterDao.findById(id);
         if (cluster == null) {
             return null;
         }
         return new Pair<>(getScope().getParent(), cluster.getDataCenterId());
     }
 }

engine/schema/src/main/java/com/cloud/user/AccountDetailsDaoImpl.java

@@ -34,8 +34,6 @@
 import com.cloud.domain.dao.DomainDetailsDao;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.Pair;
-import com.cloud.utils.crypt.DBEncryptionUtil;
-import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -160,21 +158,12 @@
         return value;
     }
 
-    @Override
-    public String getActualValue(AccountDetailVO accountDetailVO) {
-        ConfigurationVO configurationVO = _configDao.findByName(accountDetailVO.getName());
-        if (configurationVO != null && configurationVO.isEncrypted()) {
-            return DBEncryptionUtil.decrypt(accountDetailVO.getValue());
-        }
-        return accountDetailVO.getValue();
-    }
-
     @Override
     public Pair<Scope, Long> getParentScope(long id) {
         Account account = _accountDao.findById(id);
         if (account == null) {
             return null;
         }
         return new Pair<>(getScope().getParent(), account.getDomainId());
     }
 }

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDaoImpl.java

@@ -120,7 +120,7 @@
     public String getConfigValue(long id, ConfigKey<?> key) {
         ImageStoreDetailVO vo = findDetail(id, key.key());
         return vo == null ? null : getActualValue(vo);
-        }
+    }
 
     @Override
     public void addDetail(long resourceId, String key, String value, boolean display) {
@@ -128,12 +128,12 @@
     }
 
     @Override
     public Pair<Scope, Long> getParentScope(long id) {
         ImageStore store = imageStoreDao.findById(id);
         if (store == null) {
             return null;
         }
         return new Pair<>(getScope().getParent(), store.getDataCenterId());
     }
 
 }