Greg Padgett has uploaded a new change for review. Change subject: [WIP] core: rename SPMAsyncTaskHandler to AsyncTaskHandler ......................................................................
[WIP] core: rename SPMAsyncTaskHandler to AsyncTaskHandler Also rename abstract class implementation AbstractSPMAsyncTaskHandler and remove the "SPM". Change-Id: Iec1b1f36a730681396baa3f7b4f17c8dfdf27bb8 Bug-Url: https://bugzilla.redhat.com/1058160 Signed-off-by: Greg Padgett <[email protected]> --- R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractAsyncTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskHandler.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java 14 files changed, 38 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/27748/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractAsyncTaskHandler.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractAsyncTaskHandler.java index 7fe62a4..c35689f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractAsyncTaskHandler.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; @@ -13,13 +13,13 @@ import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; -public abstract class AbstractSPMAsyncTaskHandler<C extends TaskHandlerCommand<?>> implements SPMAsyncTaskHandler { +public abstract class AbstractAsyncTaskHandler<C extends TaskHandlerCommand<?>> implements AsyncTaskHandler { protected Log log = LogFactory.getLog(getClass()); private final C cmd; - public AbstractSPMAsyncTaskHandler(C cmd) { + public AbstractAsyncTaskHandler(C cmd) { this.cmd = cmd; } 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 7e92b02..6cafd3b 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 @@ -35,7 +35,7 @@ import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; import org.ovirt.engine.core.bll.quota.QuotaVdsDependent; import org.ovirt.engine.core.bll.session.SessionDataContainer; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; import org.ovirt.engine.core.bll.tasks.interfaces.AsyncTask; import org.ovirt.engine.core.bll.tasks.interfaces.Command; @@ -128,7 +128,7 @@ protected Map<String, String> jobProperties; /** Handlers for performing the logical parts of the command */ - private List<SPMAsyncTaskHandler> taskHandlers; + private List<AsyncTaskHandler> taskHandlers; private Map<Guid, CommandBase<?>> childCommandsMap = new HashMap<>(); private Map<Guid, Pair<VdcActionType, VdcActionParametersBase>> childCommandInfoMap = new HashMap<>(); @@ -212,7 +212,7 @@ } } - protected List<SPMAsyncTaskHandler> initTaskHandlers() { + protected List<AsyncTaskHandler> initTaskHandlers() { return null; } @@ -2002,7 +2002,7 @@ return QuotaManager.getInstance(); } - protected List<SPMAsyncTaskHandler> getTaskHandlers() { + protected List<AsyncTaskHandler> getTaskHandlers() { return taskHandlers; } @@ -2010,7 +2010,7 @@ return getTaskHandlers() != null; } - public SPMAsyncTaskHandler getCurrentTaskHandler() { + public AsyncTaskHandler getCurrentTaskHandler() { return getTaskHandlers().get(getExecutionIndex()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java index 8529c9d..5530454 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter; import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; import org.ovirt.engine.core.bll.storage.StoragePoolValidator; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; @@ -54,8 +54,8 @@ } @Override - protected List<SPMAsyncTaskHandler> initTaskHandlers() { - return Arrays.<SPMAsyncTaskHandler> asList( + protected List<AsyncTaskHandler> initTaskHandlers() { + return Arrays.<AsyncTaskHandler> asList( new ImportRepoImageCreateTaskHandler(this), new ImportRepoImageCopyTaskHandler(this) ); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java index 1b59c3a..5320876 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java @@ -30,7 +30,7 @@ public class ImportRepoImageCopyTaskHandler - extends AbstractSPMAsyncTaskHandler<TaskHandlerCommand<? extends ImportRepoImageParameters>> { + extends AbstractAsyncTaskHandler<TaskHandlerCommand<? extends ImportRepoImageParameters>> { private OpenStackImageProviderProxy providerProxy; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java index 47adab8..9556e9e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddImageFromScratchParameters; import org.ovirt.engine.core.common.action.ImportRepoImageParameters; @@ -23,7 +23,7 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public class ImportRepoImageCreateTaskHandler implements SPMAsyncTaskHandler { +public class ImportRepoImageCreateTaskHandler implements AsyncTaskHandler { private final CommandBase<? extends ImportRepoImageParameters> enclosingCommand; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java index a3cb7ef..87d6865 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll.lsm; -import org.ovirt.engine.core.bll.AbstractSPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.AbstractAsyncTaskHandler; import org.ovirt.engine.core.bll.ImagesHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.common.VdcObjectType; @@ -14,7 +14,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public class CreateImagePlaceholderTaskHandler extends AbstractSPMAsyncTaskHandler<TaskHandlerCommand<? extends LiveMigrateDiskParameters>> { +public class CreateImagePlaceholderTaskHandler extends AbstractAsyncTaskHandler<TaskHandlerCommand<? extends LiveMigrateDiskParameters>> { public CreateImagePlaceholderTaskHandler(TaskHandlerCommand<? extends LiveMigrateDiskParameters> cmd) { super(cmd); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java index 4cd85b2..5e01441 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java @@ -10,7 +10,7 @@ import org.ovirt.engine.core.bll.MoveOrCopyDiskCommand; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.bll.validator.DiskValidator; import org.ovirt.engine.core.common.AuditLogType; @@ -50,8 +50,8 @@ /* Overridden CommandBase Methods */ @Override - protected List<SPMAsyncTaskHandler> initTaskHandlers() { - return Arrays.<SPMAsyncTaskHandler> asList( + protected List<AsyncTaskHandler> initTaskHandlers() { + return Arrays.<AsyncTaskHandler> asList( new CreateImagePlaceholderTaskHandler(this), new VmReplicateDiskStartTaskHandler(this), new VmReplicateDiskFinishTaskHandler(this) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java index 5bb205a..4861515 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java @@ -4,7 +4,7 @@ import org.ovirt.engine.core.bll.ImagesHandler; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.common.action.LiveMigrateDiskParameters; import org.ovirt.engine.core.common.action.LiveMigrateVmDisksParameters; @@ -20,7 +20,7 @@ import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; -public class LiveMigrateDisksTaskHandler implements SPMAsyncTaskHandler { +public class LiveMigrateDisksTaskHandler implements AsyncTaskHandler { private final TaskHandlerCommand<? extends LiveMigrateVmDisksParameters> enclosingCommand; private static final Log log = LogFactory.getLog(LiveMigrateDisksTaskHandler.class); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java index f32e34e..84bd106 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java @@ -17,7 +17,7 @@ import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter; import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.validator.DiskImagesValidator; @@ -66,8 +66,8 @@ } @Override - protected List<SPMAsyncTaskHandler> initTaskHandlers() { - return Arrays.<SPMAsyncTaskHandler> asList( + protected List<AsyncTaskHandler> initTaskHandlers() { + return Arrays.<AsyncTaskHandler> asList( new LiveSnapshotTaskHandler(this), new LiveMigrateDisksTaskHandler(this) ); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java index 6f2dd35..eb0de2b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.ImagesHandler; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.common.action.CreateAllSnapshotsFromVmParameters; import org.ovirt.engine.core.common.action.LiveMigrateDiskParameters; @@ -22,7 +22,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public class LiveSnapshotTaskHandler implements SPMAsyncTaskHandler { +public class LiveSnapshotTaskHandler implements AsyncTaskHandler { private final TaskHandlerCommand<? extends LiveMigrateVmDisksParameters> enclosingCommand; private LinkedHashSet<Guid> movedVmDiskIds; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java index ac11763..d9f20d3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll.lsm; -import org.ovirt.engine.core.bll.AbstractSPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.AbstractAsyncTaskHandler; import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.ImagesHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; @@ -28,7 +28,7 @@ import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; -public class VmReplicateDiskFinishTaskHandler extends AbstractSPMAsyncTaskHandler<TaskHandlerCommand<? extends LiveMigrateDiskParameters>> { +public class VmReplicateDiskFinishTaskHandler extends AbstractAsyncTaskHandler<TaskHandlerCommand<? extends LiveMigrateDiskParameters>> { public VmReplicateDiskFinishTaskHandler(TaskHandlerCommand<? extends LiveMigrateDiskParameters> cmd) { super(cmd); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java index bc2d3fc..5eb96dd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll.lsm; -import org.ovirt.engine.core.bll.AbstractSPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.AbstractAsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.LiveMigrateDiskParameters; @@ -15,7 +15,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.vdsbroker.ResourceManager; -public class VmReplicateDiskStartTaskHandler extends AbstractSPMAsyncTaskHandler<TaskHandlerCommand<? extends LiveMigrateDiskParameters>> { +public class VmReplicateDiskStartTaskHandler extends AbstractAsyncTaskHandler<TaskHandlerCommand<? extends LiveMigrateDiskParameters>> { public VmReplicateDiskStartTaskHandler(TaskHandlerCommand<? extends LiveMigrateDiskParameters> cmd) { super(cmd); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskHandler.java similarity index 96% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTaskHandler.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskHandler.java index 2140daa..af99131 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskHandler.java @@ -7,7 +7,7 @@ * It contains callbacks that can be fired before/after a task's state changes * (e.g., the task is created, finished, receives an error, etc.) */ -public interface SPMAsyncTaskHandler { +public interface AsyncTaskHandler { /** The execution carried out on the engine side before firing an async task. */ public void execute(); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java index de448d7..f072cff 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java @@ -22,7 +22,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.ovirt.engine.core.bll.session.SessionDataContainer; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; +import org.ovirt.engine.core.bll.tasks.AsyncTaskHandler; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.businessentities.DbUser; @@ -134,10 +134,10 @@ @Test public void testHandlersInEndSuccessful() { - SPMAsyncTaskHandler handler1 = mock(SPMAsyncTaskHandler.class); - SPMAsyncTaskHandler handler2 = mock(SPMAsyncTaskHandler.class); + AsyncTaskHandler handler1 = mock(AsyncTaskHandler.class); + AsyncTaskHandler handler2 = mock(AsyncTaskHandler.class); CommandBase<VdcActionParametersBase> command = spy(new CommandBaseDummy(new VdcActionParametersBase())); - when(command.getTaskHandlers()).thenReturn(Arrays.<SPMAsyncTaskHandler> asList(handler1, handler2)); + when(command.getTaskHandlers()).thenReturn(Arrays.<AsyncTaskHandler> asList(handler1, handler2)); command.getReturnValue().setSucceeded(true); command.endActionInTransactionScope(); @@ -158,10 +158,10 @@ @Test public void testHandlersInEndWithFailure() { - SPMAsyncTaskHandler handler1 = mock(SPMAsyncTaskHandler.class); - SPMAsyncTaskHandler handler2 = mock(SPMAsyncTaskHandler.class); + AsyncTaskHandler handler1 = mock(AsyncTaskHandler.class); + AsyncTaskHandler handler2 = mock(AsyncTaskHandler.class); CommandBase<VdcActionParametersBase> command = spy(new CommandBaseDummy(new VdcActionParametersBase())); - when(command.getTaskHandlers()).thenReturn(Arrays.<SPMAsyncTaskHandler> asList(handler1, handler2)); + when(command.getTaskHandlers()).thenReturn(Arrays.<AsyncTaskHandler> asList(handler1, handler2)); command.getParameters().setTaskGroupSuccess(false); command.getParameters().setExecutionIndex(1); -- To view, visit http://gerrit.ovirt.org/27748 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec1b1f36a730681396baa3f7b4f17c8dfdf27bb8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
