Move dao code from ConfigurationGroupsAggregator to ConfigurationDaoImpl

Author: abh1sar

engine/schema/src/main/java/com/cloud/upgrade/ConfigurationGroupsAggregator.java

@@ -32,9 +32,6 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.utils.Pair;
-import com.cloud.utils.db.SearchBuilder;
-import com.cloud.utils.db.SearchCriteria;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -57,12 +54,7 @@ public ConfigurationGroupsAggregator() {
 
     public void updateConfigurationGroups() {
         LOG.debug("Updating configuration groups");
-        SearchBuilder<ConfigurationVO> sb = configDao.createSearchBuilder();
-        sb.select("name", SearchCriteria.Func.NATIVE, sb.entity().getName());
-        sb.select("groupId", SearchCriteria.Func.NATIVE, sb.entity().getGroupId());
-        sb.select("subGroupId", SearchCriteria.Func.NATIVE, sb.entity().getSubGroupId());
-        SearchCriteria<ConfigurationVO> sc = sb.create();
-        List<ConfigurationVO> configs =  configDao.searchIncludingRemoved(sc, null, null, false);
+        List<ConfigurationVO> configs =  configDao.searchPartialConfigurations();
         if (CollectionUtils.isEmpty(configs)) {
             return;
         }

framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java

@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.framework.config.dao;
 
+import java.util.List;
 import java.util.Map;
 
 import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
@@ -67,4 +68,6 @@ public interface ConfigurationDao extends GenericDao<ConfigurationVO, String> {
     boolean update(String name, String category, String value);
 
     void invalidateCache();
+
+    List<ConfigurationVO> searchPartialConfigurations();
 }

framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java

@@ -43,6 +43,7 @@ public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String
 
     final SearchBuilder<ConfigurationVO> InstanceSearch;
     final SearchBuilder<ConfigurationVO> NameSearch;
+    final SearchBuilder<ConfigurationVO> PartialSearch;
 
     public static final String UPDATE_CONFIGURATION_SQL = "UPDATE configuration SET value = ? WHERE name = ?";
 
@@ -53,6 +54,11 @@ public ConfigurationDaoImpl() {
         NameSearch = createSearchBuilder();
         NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ);
         setRunLevel(ComponentLifecycle.RUN_LEVEL_SYSTEM_BOOTSTRAP);
+
+        PartialSearch = createSearchBuilder();
+        PartialSearch.select("name", SearchCriteria.Func.NATIVE, PartialSearch.entity().getName());
+        PartialSearch.select("groupId", SearchCriteria.Func.NATIVE, PartialSearch.entity().getGroupId());
+        PartialSearch.select("subGroupId", SearchCriteria.Func.NATIVE, PartialSearch.entity().getSubGroupId());
     }
 
     @Override
@@ -207,4 +213,9 @@ public ConfigurationVO findByName(String name) {
         return findOneIncludingRemovedBy(sc);
     }
 
+    @Override
+    public List<ConfigurationVO> searchPartialConfigurations() {
+        SearchCriteria<ConfigurationVO> sc = PartialSearch.create();
+        return searchIncludingRemoved(sc, null, null, false);
+    }
 }