Fix type parameter in listBackupServiceJobs API (#13940)

Author: JoaoJandre

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDao.java

@@ -32,7 +32,7 @@ public interface InternalBackupServiceJobDao extends GenericDao<InternalBackupSe
 
     List<InternalBackupServiceJobVO> listExecutingJobsByHostsAndStartTimeBeforeAndTypeIn(Object[] hostIds, Date date, InternalBackupServiceJobType... jobTypes);
 
-    Pair<List<InternalBackupServiceJobVO>, Integer> searchAndCountForListApi(Long id, Long backupId, Long hostId, Long zoneId, InternalBackupServiceJobType type, boolean executing,
+    Pair<List<InternalBackupServiceJobVO>, Integer> searchAndCountForListApi(Long id, Long backupId, Long hostId, Long zoneId, String type, boolean executing,
             boolean scheduled, Long startIndex, Long pageSize);
 
     void update(InternalBackupServiceJobVO job);

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDaoImpl.java

@@ -98,7 +98,7 @@ public List<InternalBackupServiceJobVO> listExecutingJobsByHostsAndStartTimeBefo
     }
 
     @Override
-    public Pair<List<InternalBackupServiceJobVO>, Integer> searchAndCountForListApi(Long id, Long backupId, Long hostId, Long zoneId, InternalBackupServiceJobType type, boolean executing,
+    public Pair<List<InternalBackupServiceJobVO>, Integer> searchAndCountForListApi(Long id, Long backupId, Long hostId, Long zoneId, String type, boolean executing,
             boolean scheduled, Long startIndex, Long pageSize) {
         SearchBuilder<InternalBackupServiceJobVO> sb = createSearchBuilder();
 
@@ -122,7 +122,7 @@ public Pair<List<InternalBackupServiceJobVO>, Integer> searchAndCountForListApi(
         sc.setParametersIfNotNull(HOST_ID, hostId);
         sc.setParametersIfNotNull(ZONE_ID, zoneId);
         if (type != null) {
-            sc.setParameters(TYPE, type);
+            sc.setParameters(TYPE, InternalBackupServiceJobType.valueOf(type));
         }
 
         Filter filter = new Filter(InternalBackupServiceJobVO.class, "created", false, startIndex, pageSize);

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -158,7 +158,6 @@
 import org.apache.cloudstack.api.response.VirtualMachineResponse;
 import org.apache.cloudstack.api.response.VolumeResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.cloudstack.backup.InternalBackupServiceJobType;
 import org.apache.cloudstack.backup.InternalBackupServiceJobVO;
 import org.apache.cloudstack.backup.BackupOfferingVO;
 import org.apache.cloudstack.backup.BackupVO;
@@ -6436,7 +6435,7 @@ private List<BucketVO> searchForBucketsInternal(ListBucketsCmd cmd) {
     public ListResponse<BackupServiceJobResponse> listBackupServiceJobs(ListBackupServiceJobsCmd cmd) {
         ListResponse<BackupServiceJobResponse> responses = new ListResponse<>();
         Pair<List<InternalBackupServiceJobVO>, Integer> result = listBackupServiceJobsInternal(cmd);
-        List<BackupServiceJobResponse> compressionJobResponses = new ArrayList<>();
+        List<BackupServiceJobResponse> backupServiceJobResponses = new ArrayList<>();
 
         for (InternalBackupServiceJobVO jobVO : result.first()) {
             BackupVO backup = backupDao.findByIdIncludingRemoved(jobVO.getBackupId());
@@ -6448,16 +6447,16 @@ public ListResponse<BackupServiceJobResponse> listBackupServiceJobs(ListBackupSe
             if (jobVO.getHostId() != null) {
                 response.setHostId(hostDao.findByIdIncludingRemoved(jobVO.getHostId()).getUuid());
             }
-            compressionJobResponses.add(response);
+            backupServiceJobResponses.add(response);
         }
 
-        responses.setResponses(compressionJobResponses, result.second());
+        responses.setResponses(backupServiceJobResponses, result.second());
         return responses;
     }
 
     private Pair<List<InternalBackupServiceJobVO>, Integer> listBackupServiceJobsInternal(ListBackupServiceJobsCmd cmd) {
         return internalBackupServiceJobDao.searchAndCountForListApi(cmd.getId(), cmd.getBackupId(), cmd.getHostId(), cmd.getZoneId(),
-                InternalBackupServiceJobType.valueOf(cmd.getType()), cmd.getExecuting(), cmd.getScheduled(), cmd.getStartIndex(), cmd.getPageSizeVal());
+                cmd.getType(), cmd.getExecuting(), cmd.getScheduled(), cmd.getStartIndex(), cmd.getPageSizeVal());
     }
 
     @Override