list all for sync check

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDao.java

@@ -16,13 +16,11 @@
 // under the License.
 package org.apache.cloudstack.framework.extensions.dao;
 
-import java.util.List;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
 
 import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
 
 public interface ExtensionDao extends GenericDao<ExtensionVO, Long> {
 
     ExtensionVO findByName(String name);
-    List<ExtensionVO> listAllEnabled();
 }

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImpl.java

@@ -17,15 +17,12 @@
 
 package org.apache.cloudstack.framework.extensions.dao;
 
-import java.util.List;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
 
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 
-import org.apache.cloudstack.extension.Extension;
-import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
-
 public class ExtensionDaoImpl extends GenericDaoBase<ExtensionVO, Long> implements ExtensionDao {
 
     private final SearchBuilder<ExtensionVO> AllFieldSearch;
@@ -45,11 +42,4 @@ public ExtensionVO findByName(String name) {
 
         return findOneBy(sc);
     }
-
-    @Override
-    public List<ExtensionVO> listAllEnabled() {
-        SearchCriteria<ExtensionVO> sc = AllFieldSearch.create();
-        sc.setParameters("state", Extension.State.Enabled);
-        return listBy(sc);
-    }
 }

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java

@@ -1516,7 +1516,7 @@ protected void runCleanupForLongestRunningManagementServer() {
                     logger.debug("Skipping the extensions entrypoint sync check on this management server");
                     return;
                 }
-                List<ExtensionVO> extensions = extensionDao.listAllEnabled();
+                List<ExtensionVO> extensions = extensionDao.listAll();
                 for (ExtensionVO extension : extensions) {
                     checkExtensionEntryPointSync(extension, msHosts);
                 }

framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImplTest.java

@@ -19,13 +19,9 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-
-import org.apache.cloudstack.extension.Extension;
 import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
 import org.junit.Before;
 import org.junit.Test;
@@ -52,21 +48,4 @@ public void findByNameReturnsCorrectEntity() {
         when(dao.findByName("extensionName")).thenReturn(expected);
         assertEquals(expected, dao.findByName("extensionName"));
     }
-
-    @Test
-    public void listAllEnabledReturnsEmptyListWhenNoEnabledExtensions() {
-        when(dao.listAllEnabled()).thenReturn(List.of());
-        assertTrue(dao.listAllEnabled().isEmpty());
-    }
-
-    @Test
-    public void listAllEnabledReturnsCorrectEntities() {
-        ExtensionVO enabled1 = new ExtensionVO();
-        enabled1.setState(Extension.State.Enabled);
-        ExtensionVO enabled2 = new ExtensionVO();
-        enabled2.setState(Extension.State.Enabled);
-        List<ExtensionVO> expected = List.of(enabled1, enabled2);
-        when(dao.listAllEnabled()).thenReturn(expected);
-        assertEquals(expected, dao.listAllEnabled());
-    }
 }