apply suggestion

Author: bernardodemarco

api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java

@@ -53,12 +53,12 @@ public class DeleteBackupScheduleCmd extends BaseCmd {
     /////////////////////////////////////////////////////
 
     @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class,
-            description = "ID of the VM from which all backup schedules will be deleted. It has precedence over the 'id' parameter, " +
-                    "i.e., when the 'virtualmachineid' parameter is specified, the 'id' parameter will be ignored.")
+            description = "ID of the VM from which all backup schedules will be deleted.")
     private Long vmId;
 
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = BackupScheduleResponse.class,
-            description = "ID of the backup schedule to be deleted.", since = "4.20.1")
+            since = "4.20.1", description = "ID of the backup schedule to be deleted. It has precedence over the 'virtualmachineid' parameter, " +
+            "i.e., when the 'id' parameter is specified, the 'virtualmachineid' parameter will be ignored.")
     private Long id;
 
     /////////////////////////////////////////////////////

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -520,17 +520,17 @@ public boolean deleteBackupSchedule(DeleteBackupScheduleCmd cmd) {
             throw new InvalidParameterValueException("Either instance ID or ID of backup schedule needs to be specified.");
         }
 
-        if (Objects.nonNull(vmId)) {
-            checkCallerAccessToBackupScheduleVm(vmId);
-            return deleteAllVmBackupSchedules(vmId);
+        if (Objects.nonNull(id)) {
+            BackupSchedule schedule = backupScheduleDao.findById(id);
+            if (schedule == null) {
+                throw new InvalidParameterValueException("Could not find the requested backup schedule.");
+            }
+            checkCallerAccessToBackupScheduleVm(schedule.getVmId());
+            return backupScheduleDao.remove(schedule.getId());
         }
 
-        BackupSchedule schedule = backupScheduleDao.findById(id);
-        if (schedule == null) {
-            throw new InvalidParameterValueException("Could not find the requested backup schedule.");
-        }
-        checkCallerAccessToBackupScheduleVm(schedule.getVmId());
-        return backupScheduleDao.remove(schedule.getId());
+        checkCallerAccessToBackupScheduleVm(vmId);
+        return deleteAllVmBackupSchedules(vmId);
     }
 
     /**

server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java

@@ -735,6 +735,7 @@ public void deleteBackupScheduleTestThrowExceptionWhenVmIdAndScheduleIdAreNull()
     public void deleteBackupScheduleTestDeleteVmSchedulesWhenVmIdIsSpecified() {
         long vmId = 1L;
 
+        when(deleteBackupScheduleCmdMock.getId()).thenReturn(null);
         when(deleteBackupScheduleCmdMock.getVmId()).thenReturn(vmId);
         Mockito.doNothing().when(backupManager).checkCallerAccessToBackupScheduleVm(vmId);
         Mockito.doReturn(true).when(backupManager).deleteAllVmBackupSchedules(vmId);
@@ -747,7 +748,6 @@ public void deleteBackupScheduleTestDeleteVmSchedulesWhenVmIdIsSpecified() {
     public void deleteBackupScheduleTestThrowExceptionWhenSpecificScheduleIsNotFound() {
         long id = 1L;
         when(deleteBackupScheduleCmdMock.getId()).thenReturn(id);
-        when(deleteBackupScheduleCmdMock.getVmId()).thenReturn(null);
         backupManager.deleteBackupSchedule(deleteBackupScheduleCmdMock);
     }