Moti Asayag has uploaded a new change for review.
Change subject: engine: Maintain camelCase naming convention
......................................................................
engine: Maintain camelCase naming convention
Change-Id: I58e14d02d0036733de28b1c737b03ecd2e66fe00
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
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/MergeCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java
8 files changed, 15 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/38577/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 fedcfc1..77e7ca9 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
@@ -551,12 +551,12 @@
boolean exceptionOccurred = false;
try {
if (isEndSuccessfully()) {
- if (getCallBack() == null) {
+ if (getCallback() == null) {
setCommandStatus(CommandStatus.SUCCEEDED);
}
internalEndSuccessfully();
} else {
- if (getCallBack() == null) {
+ if (getCallback() == null) {
setCommandStatus(CommandStatus.FAILED);
}
internalEndWithFailure();
@@ -1202,7 +1202,7 @@
// set the status to SUCCEEDED if the status is ACTIVE
if (getTaskType() == AsyncTaskType.notSupported &&
getReturnValue().getVdsmTaskIdList().isEmpty() &&
- getCallBack() == null &&
+ getCallback() == null &&
commandStatus == CommandStatus.ACTIVE) {
setCommandStatus(CommandStatus.SUCCEEDED);
}
@@ -1323,7 +1323,7 @@
protected final void execute() {
setCommandStatus(CommandStatus.ACTIVE);
- if (getCallBack() != null) {
+ if (getCallback() != null) {
persistCommand(getParameters().getParentCommand(), true);
}
getReturnValue().setCanDoAction(true);
@@ -2230,7 +2230,7 @@
return commandStatus;
}
- public CommandCallBack getCallBack() {
+ public CommandCallBack getCallback() {
return null;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java
index 0f3251c..b996f54 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java
@@ -84,7 +84,7 @@
}
@Override
- public CommandCallBack getCallBack() {
+ public CommandCallBack getCallback() {
return new MergeCommandCallback();
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
index bfa5325..503aaea 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
@@ -178,7 +178,7 @@
}
@Override
- public CommandCallBack getCallBack() {
+ public CommandCallBack getCallback() {
return new MergeStatusCommandCallback();
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommand.java
index 55a1c5e..dc4e6c4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommand.java
@@ -233,7 +233,7 @@
}
@Override
- public CommandCallBack getCallBack() {
+ public CommandCallBack getCallback() {
// Handle first execution based on vm status, and recovery based on
isLiveMerge (VM may be down)
if (isLiveMerge()) {
return new RemoveDiskSnapshotsCommandCallback();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java
index 8c42fa8..3db4866 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java
@@ -453,7 +453,7 @@
}
@Override
- public CommandCallBack getCallBack() {
+ public CommandCallBack getCallback() {
return getVm().isQualifiedForLiveSnapshotMerge() ? new
RemoveSnapshotCommandCallback() : null;
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
index e991504..e36bb98 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
@@ -450,7 +450,7 @@
}
@Override
- public CommandCallBack getCallBack() {
+ public CommandCallBack getCallback() {
return new RemoveSnapshotSingleDiskLiveCommandCallback();
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java
index 4ab0356..f7077da7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java
@@ -313,7 +313,7 @@
private CommandEntity getChildCommandEntity(CommandBase<?> command,
VdcActionType parentCommand) {
CommandEntity cmdEntity =
coco.getCommandEntity(command.getCommandId());
if (cmdEntity == null) {
- command.persistCommand(parentCommand, command.getCallBack() !=
null);
+ command.persistCommand(parentCommand, command.getCallback() !=
null);
}
return coco.getCommandEntity(command.getCommandId());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java
index 9ac05e7..7d0aa93 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java
@@ -133,8 +133,8 @@
public void addToCallBackMap(CommandEntity cmdEntity) {
if (!cmdCallBackMap.containsKey(cmdEntity.getId())) {
CommandBase<?> cmd = coco.retrieveCommand(cmdEntity.getId());
- if (cmd != null && cmd.getCallBack() != null) {
- cmdCallBackMap.put(cmdEntity.getId(), cmd.getCallBack());
+ if (cmd != null && cmd.getCallback() != null) {
+ cmdCallBackMap.put(cmdEntity.getId(), cmd.getCallback());
}
}
}
@@ -143,7 +143,7 @@
final
VdcActionParametersBase parameters,
final CommandContext
cmdContext) {
final CommandBase<?> command =
CommandsFactory.createCommand(actionType, parameters, cmdContext);
- CommandCallBack callBack = command.getCallBack();
+ CommandCallBack callBack = command.getCallback();
command.persistCommand(command.getParameters().getParentCommand(),
cmdContext, callBack != null);
if (callBack != null) {
cmdCallBackMap.put(command.getCommandId(), callBack);
@@ -167,7 +167,7 @@
}
private VdcReturnValueBase executeCommand(final CommandBase<?> command,
final CommandContext cmdContext) {
- CommandCallBack callBack = command.getCallBack();
+ CommandCallBack callBack = command.getCallback();
VdcReturnValueBase result =
BackendUtils.getBackendCommandObjectsHandler(log).runAction(command, null);
updateCommand(command, result);
if (callBack != null) {
--
To view, visit https://gerrit.ovirt.org/38577
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58e14d02d0036733de28b1c737b03ecd2e66fe00
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
