Alissa Bonas has uploaded a new change for review. Change subject: core: rename methods in Backend to lowercase ......................................................................
core: rename methods in Backend to lowercase Fix findbugs warnings, comply with java standards. Change-Id: I61f7957bdf038fdd98a3e3b0ce54e4aa70c18497 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.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/ExportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java 19 files changed, 43 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/20882/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index e4f22bc..776f602 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -98,7 +98,7 @@ public AddVmCommand(T parameters) { super(parameters); - // if we came from EndAction the VmId is not null + // if we came from endAction the VmId is not null setVmId((parameters.getVmId().equals(Guid.Empty)) ? Guid.newGuid() : parameters.getVmId()); setVmName(parameters.getVm().getName()); parameters.setVmId(getVmId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index a9a5aba..bab232e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -478,7 +478,7 @@ getVmStaticDAO().incrementDbGeneration(getVmTemplateId()); for (VdcActionParametersBase p : getParameters().getImagesParameters()) { - Backend.getInstance().EndAction(VdcActionType.CreateImageTemplate, p); + Backend.getInstance().endAction(VdcActionType.CreateImageTemplate, p); } if (reloadVmTemplateFromDB() != null) { endDefaultOperations(); @@ -533,7 +533,7 @@ for (VdcActionParametersBase p : getParameters().getImagesParameters()) { p.setTaskGroupSuccess(false); - Backend.getInstance().EndAction(VdcActionType.CreateImageTemplate, p); + Backend.getInstance().endAction(VdcActionType.CreateImageTemplate, p); } // if template exist in db remove it diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java index 691a980..22cc83c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java @@ -250,7 +250,7 @@ getParameters().getImagesParameters().get(0), new CommandContext(getCompensationContext())).getSucceeded()); if (!getSucceeded()) { - log.warn("EndSuccessfully: EndAction of RunVm failed, detaching user from Vm"); + log.warn("EndSuccessfully: endAction of RunVm failed, detaching user from Vm"); detachUserFromVmFromPool(); // just in case. getReturnValue().setEndActionTryAgain(false); } @@ -258,7 +258,7 @@ else // Pool-snapshot is gone (probably due to ProcessVmPoolOnStopVm // treatment) -> - // no point in running the VM or trying to run again the EndAction + // no point in running the VM or trying to run again the endAction // method: { log.warn("EndSuccessfully: No images were created for Vm, detaching user from Vm"); @@ -267,7 +267,7 @@ } } else { setCommandShouldBeLogged(false); - log.warn("AttachUserToVmFromPoolAndRunCommand::EndSuccessfully: Vm is null - not performing full EndAction"); + log.warn("AttachUserToVmFromPoolAndRunCommand::EndSuccessfully: Vm is null - not performing full endAction"); setSucceeded(true); } } @@ -278,7 +278,7 @@ getParameters().getImagesParameters().get(0), new CommandContext(getCompensationContext())).getSucceeded()); if (!getSucceeded()) { - log.warn("AttachUserToVmFromPoolAndRunCommand::EndWitFailure: EndAction of RunVm Failed"); + log.warn("AttachUserToVmFromPoolAndRunCommand::EndWitFailure: endAction of RunVm Failed"); } detachUserFromVmFromPool(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 0a35d61..44f10c6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -104,7 +104,7 @@ return EjbUtils.findBean(BeanType.BACKEND, BeanProxyType.LOCAL); } - private void InitHandlers() { + private void initHandlers() { mTagsHandler = HandlersFactory.createTagsHandler(); BaseConditionFieldAutoCompleter.TagsHandler = mTagsHandler; VmHandler.Init(); @@ -197,7 +197,7 @@ initOsRepository(); initSearchDependencies(); - InitHandlers(); + initHandlers(); final String AppErrorsFileName = "bundles/AppErrors.properties"; final String VdsErrorsFileName = "bundles/VdsmErrors.properties"; @@ -436,7 +436,7 @@ @Override - public VdcReturnValueBase EndAction(VdcActionType actionType, VdcActionParametersBase parameters) { + public VdcReturnValueBase endAction(VdcActionType actionType, VdcActionParametersBase parameters) { return endAction(actionType, parameters, null); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java index 8ac3f9e..b641277 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java @@ -90,11 +90,11 @@ else if (entityInfo.ShouldEndAction()) { log.infoFormat( - "CommandAsyncTask::EndActionIfNecessary: All tasks of command '{0}' has ended -> executing 'EndAction'", + "CommandAsyncTask::EndActionIfNecessary: All tasks of command '{0}' has ended -> executing 'endAction'", getCommandId()); log.infoFormat( - "CommandAsyncTask::EndAction: Ending action for {0} tasks (command ID: '{1}'): calling EndAction '.", + "CommandAsyncTask::endAction: Ending action for {0} tasks (command ID: '{1}'): calling endAction '.", entityInfo.getTasksCountCurrentActionType(), entityInfo.getCommandId()); @@ -131,7 +131,7 @@ dbAsyncTask.getActionParameters().setImagesParameters(imagesParameters); try { - log.infoFormat("CommandAsyncTask::EndCommandAction [within thread] context: Attempting to EndAction '{0}', executionIndex: '{1}'", + log.infoFormat("CommandAsyncTask::EndCommandAction [within thread] context: Attempting to endAction '{0}', executionIndex: '{1}'", dbAsyncTask.getActionParameters().getCommandType(), dbAsyncTask.getActionParameters().getExecutionIndex()); @@ -160,7 +160,7 @@ catch (RuntimeException Ex2) { log.error( - "CommandAsyncTask::EndCommandAction [within thread]: An exception has been thrown (not related to 'EndAction' itself)", + "CommandAsyncTask::EndCommandAction [within thread]: An exception has been thrown (not related to 'endAction' itself)", Ex2); endActionRuntimeException = true; } @@ -185,7 +185,7 @@ } private String getErrorMessage() { - return String.format("[within thread]: EndAction for action type %1$s threw an exception.", + return String.format("[within thread]: endAction for action type %1$s threw an exception.", getParameters().getDbAsyncTask().getActionParameters().getCommandType()); } @@ -193,7 +193,7 @@ try { VdcActionType actionType = getParameters().getDbAsyncTask().getaction_type(); log.infoFormat( - "CommandAsyncTask::HandleEndActionResult: EndAction for action type '{0}' threw an unrecoverable RuntimeException the task will be cleared.", + "CommandAsyncTask::HandleEndActionResult: endAction for action type '{0}' threw an unrecoverable RuntimeException the task will be cleared.", actionType); commandInfo.clearTaskByVdsmTaskId(dbAsyncTask.getVdsmTaskId()); RemoveTaskFromDB(); @@ -218,12 +218,12 @@ try { VdcActionType actionType = getParameters().getDbAsyncTask().getaction_type(); log.infoFormat( - "CommandAsyncTask::HandleEndActionResult [within thread]: EndAction for action type '{0}' completed, handling the result.", + "CommandAsyncTask::HandleEndActionResult [within thread]: endAction for action type '{0}' completed, handling the result.", actionType); if (vdcReturnValue == null || (!vdcReturnValue.getSucceeded() && vdcReturnValue.getEndActionTryAgain())) { log.infoFormat( - "CommandAsyncTask::HandleEndActionResult [within thread]: EndAction for action type {0} hasn't succeeded, not clearing tasks, will attempt again next polling.", + "CommandAsyncTask::HandleEndActionResult [within thread]: endAction for action type {0} hasn't succeeded, not clearing tasks, will attempt again next polling.", actionType); commandInfo.Repoll(); @@ -231,12 +231,12 @@ else { log.infoFormat( - "CommandAsyncTask::HandleEndActionResult [within thread]: EndAction for action type {0} {1}succeeded, clearing tasks.", + "CommandAsyncTask::HandleEndActionResult [within thread]: endAction for action type {0} {1}succeeded, clearing tasks.", actionType, (vdcReturnValue.getSucceeded() ? "" : "hasn't ")); /** - * Terminate the job by the return value of EndAction. + * Terminate the job by the return value of endAction. * The operation will end also the FINALIZING step. */ if (context != null) { 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 a5b3399..c7d6414 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 @@ -493,7 +493,7 @@ handleTransactivity(); TransactionSupport.executeInScope(endActionScope, this); } catch (TransactionRolledbackLocalException e) { - log.infoFormat("EndAction: Transaction was aborted in {0}", this.getClass().getName()); + log.infoFormat("endAction: Transaction was aborted in {0}", this.getClass().getName()); } finally { freeLockEndAction(); if (getCommandShouldBeLogged()) { @@ -1446,7 +1446,7 @@ * @param asyncTaskCreationInfo * info to send to AsyncTaskManager when creating the task. * @param parentCommand - * VdcActionType of the command that its EndAction we want to invoke when tasks are finished. + * VdcActionType of the command that its endAction we want to invoke when tasks are finished. * @param entityType * type of entities that are associated with the task * @param entityIds @@ -1486,7 +1486,7 @@ * @param asyncTaskCreationInfo * info to send to AsyncTaskManager when creating the task. * @param parentCommand - * VdcActionType of the command that its EndAction we want to invoke when tasks are finished. + * VdcActionType of the command that its endAction we want to invoke when tasks are finished. * @param entityType * type of entities that are associated with the task * @param entityIds @@ -1530,7 +1530,7 @@ * @param asyncTaskCreationInfo * info to send to AsyncTaskManager when creating the task. * @param parentCommand - * VdcActionType of the command that its EndAction we want to invoke when tasks are finished. + * VdcActionType of the command that its endAction we want to invoke when tasks are finished. * @param description * A message which describes the task * @param entitiesMap - map of entities diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java index 0f416a6..c4fdd35 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java @@ -190,7 +190,7 @@ protected void endActionOnAllImageGroups() { for (VdcActionParametersBase p : getParameters().getImagesParameters()) { p.setTaskGroupSuccess(getParameters().getTaskGroupSuccess()); - getBackend().EndAction(getImagesActionType(), p); + getBackend().endAction(getImagesActionType(), p); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index f524c04..d9239f5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -332,7 +332,7 @@ } else { - log.warn("HibernateVmCommand::EndSuccessfully: Vm is null - not performing full EndAction."); + log.warn("HibernateVmCommand::EndSuccessfully: Vm is null - not performing full endAction."); setSucceeded(true); } } @@ -366,7 +366,7 @@ else { setCommandShouldBeLogged(false); - log.warn("HibernateVmCommand::endWithFailure: Vm is null - not performing full EndAction."); + log.warn("HibernateVmCommand::endWithFailure: Vm is null - not performing full endAction."); setSucceeded(true); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 898a356..d3314e2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -1086,7 +1086,7 @@ protected void endActionOnAllImageGroups() { for (VdcActionParametersBase p : getParameters().getImagesParameters()) { p.setTaskGroupSuccess(getParameters().getTaskGroupSuccess()); - getBackend().EndAction(getImagesActionType(), p); + getBackend().endAction(getImagesActionType(), p); } } @@ -1152,7 +1152,7 @@ else { setCommandShouldBeLogged(false); - log.warn("ImportVmCommand::EndImportCommand: Vm is null - not performing full EndAction"); + log.warn("ImportVmCommand::EndImportCommand: Vm is null - not performing full endAction"); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index 1ad424a..ce0eaac 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -423,7 +423,7 @@ protected void endActionOnAllImageGroups() { for (VdcActionParametersBase p : getParameters().getImagesParameters()) { p.setTaskGroupSuccess(getParameters().getTaskGroupSuccess()); - getBackend().EndAction(getImagesActionType(), p); + getBackend().endAction(getImagesActionType(), p); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java index 8f1cd77..b9154eb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java @@ -280,7 +280,7 @@ } private void endCommandActions() { - getBackend().EndAction(getImagesActionType(), getParameters()); + getBackend().endAction(getImagesActionType(), getParameters()); setSucceeded(true); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index 4122491..d798f57 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -277,7 +277,7 @@ } else { setCommandShouldBeLogged(false); - log.warn("MoveOrCopyTemplateCommand::EndMoveOrCopyCommand: VmTemplate is null, not performing full EndAction"); + log.warn("MoveOrCopyTemplateCommand::EndMoveOrCopyCommand: VmTemplate is null, not performing full endAction"); } } @@ -297,7 +297,7 @@ protected void endActionOnAllImageGroups() { for (VdcActionParametersBase p : getParameters().getImagesParameters()) { - getBackend().EndAction(getImagesActionType(), p); + getBackend().endAction(getImagesActionType(), p); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java index 7613916..c3428b8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java @@ -207,7 +207,7 @@ else { setCommandShouldBeLogged(false); - log.warn("MoveVmCommand::EndMoveVmCommand: Vm is null - not performing full EndAction"); + log.warn("MoveVmCommand::EndMoveVmCommand: Vm is null - not performing full endAction"); } setSucceeded(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 03a351d..8f80d76 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -379,7 +379,7 @@ getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); // save RunVmParams so we'll know how to run - // the stateless VM in the EndAction part. + // the stateless VM in the endAction part. VmHandler.updateDisksFromDb(getVm()); } else { if (areDisksLocked(vdcReturnValue)) { @@ -849,7 +849,7 @@ if (isVmRunningStateless()) { CreateAllSnapshotsFromVmParameters createSnapshotParameters = buildCreateSnapshotParameters(); createSnapshotParameters.setImagesParameters(getParameters().getImagesParameters()); - getBackend().EndAction(VdcActionType.CreateAllSnapshotsFromVm, createSnapshotParameters); + getBackend().endAction(VdcActionType.CreateAllSnapshotsFromVm, createSnapshotParameters); getParameters().setShouldBeLogged(false); getParameters().setRunAsStateless(false); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java index f0a0eb4..af40379 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java @@ -198,7 +198,7 @@ } else { - log.warn("StopVmCommandBase::EndVmCommand: Vm is null - not performing full EndAction"); + log.warn("StopVmCommandBase::EndVmCommand: Vm is null - not performing full endAction"); } setSucceeded(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java index 02b5cff..485d486 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java @@ -96,7 +96,7 @@ restoreVmConfigFromSnapshot(); } else { setCommandShouldBeLogged(false); - log.warn("VmCommand::EndVmCommand: Vm is null - not performing EndAction on Vm"); + log.warn("VmCommand::EndVmCommand: Vm is null - not performing endAction on Vm"); } setSucceeded(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index c48df2e..14b83a5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -366,7 +366,7 @@ @Override protected void endSuccessfully() { - VdcReturnValueBase ret = getBackend().EndAction(VdcActionType.ExtendImageSize, + VdcReturnValueBase ret = getBackend().endAction(VdcActionType.ExtendImageSize, createExtendImageSizeParameters()); if (ret.getSucceeded()) { @@ -408,7 +408,7 @@ private void endInternalCommandWithFailure() { ExtendImageSizeParameters params = createExtendImageSizeParameters(); params.setTaskGroupSuccess(false); - getBackend().EndAction(VdcActionType.ExtendImageSize, params); + getBackend().endAction(VdcActionType.ExtendImageSize, params); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index b77f1f3..a8043c7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -213,7 +213,7 @@ p.setTaskGroupSuccess(getParameters().getTaskGroupSuccess()); } - getBackend().EndAction( + getBackend().endAction( p.getCommandType() == VdcActionType.Unknown ? getChildActionType() : p.getCommandType(), p); } } @@ -229,7 +229,7 @@ } } else { setLoggingForCommand(); - log.warn("VmCommand::EndVmCommand: Vm is null - not performing EndAction on Vm"); + log.warn("VmCommand::EndVmCommand: Vm is null - not performing endAction on Vm"); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java index 4a69b0f..866e3f1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java @@ -16,7 +16,7 @@ VdcQueryReturnValue RunQuery(VdcQueryType actionType, VdcQueryParametersBase parameters); - public VdcReturnValueBase EndAction(VdcActionType actionType, VdcActionParametersBase parameters); + public VdcReturnValueBase endAction(VdcActionType actionType, VdcActionParametersBase parameters); ErrorTranslator getErrorsTranslator(); -- To view, visit http://gerrit.ovirt.org/20882 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61f7957bdf038fdd98a3e3b0ce54e4aa70c18497 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
