Allon Mureinik has uploaded a new change for review. Change subject: core: CommandBase: Extract getAsyncTaskManager() ......................................................................
core: CommandBase: Extract getAsyncTaskManager() Extracted the getAsyncTaskManager() method so it can be used instead of AsyncTaskManager.getInstance(). This is useful for unit testing, since now the AsyncTaskManager can be spied or mocked. Change-Id: Ife9c2713069d14db8afa85eac6f6e3e9e7c9ae21 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/7787/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index abe7912..0aa6b18 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -1081,7 +1081,7 @@ task.setEntityType(entityType); task.setAssociatedEntities(entityIds); AsyncTaskUtils.addOrUpdateTaskInDB(task); - AsyncTaskManager.getInstance().lockAndAddTaskToManager(task); + getAsyncTaskManager().lockAndAddTaskToManager(task); retValue = task.getTaskID(); ExecutionHandler.updateStepExternalId(taskStep, retValue, ExternalSystemType.VDSM); } catch (RuntimeException ex) { @@ -1107,13 +1107,13 @@ protected void UpdateTasksWithActionParameters() { for (Guid taskID : getReturnValue().getTaskIdList()) { - AsyncTaskManager.getInstance().UpdateTaskWithActionParameters(taskID, getParameters()); + getAsyncTaskManager().UpdateTaskWithActionParameters(taskID, getParameters()); } } protected void startPollingAsyncTasks(Collection<Guid> taskIds) { for (Guid taskID : taskIds) { - AsyncTaskManager.getInstance().StartPollingTask(taskID); + getAsyncTaskManager().StartPollingTask(taskID); } } @@ -1146,7 +1146,7 @@ public void run() { log.infoFormat("Rollback for command: {0}.", CommandBase.this.getClass().getName()); try { - AsyncTaskManager.getInstance().CancelTasks(getReturnValue().getTaskIdList()); + getAsyncTaskManager().CancelTasks(getReturnValue().getTaskIdList()); } catch (Exception e) { log.errorFormat("Failed to cancel tasks for command: {0}.", CommandBase.this.getClass().getName()); @@ -1163,7 +1163,7 @@ for (Guid taskId : getParameters().getTaskIds()) { taskIdAsList.add(taskId); - ArrayList<AsyncTaskStatus> tasksStatuses = AsyncTaskManager.getInstance().PollTasks( + ArrayList<AsyncTaskStatus> tasksStatuses = getAsyncTaskManager().PollTasks( taskIdAsList); // call revert task only if ended successfully if (tasksStatuses.get(0).getTaskEndedSuccessfully()) { @@ -1462,4 +1462,8 @@ return QuotaManager.getInstance(); } + protected AsyncTaskManager getAsyncTaskManager() { + return AsyncTaskManager.getInstance(); + } + } -- To view, visit http://gerrit.ovirt.org/7787 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife9c2713069d14db8afa85eac6f6e3e9e7c9ae21 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
