Moti Asayag has uploaded a new change for review.
Change subject: engine: Standardize CommandEntity
......................................................................
engine: Standardize CommandEntity
* Maintain camelCase
* Remove default values assignment to local variables
* Initialize variable in c'tor
Change-Id: I5969a09137e2e52d903dd8abf5bfe1234844901d
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/RemoveDiskSnapshotsCommandCallback.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/CommandCoordinatorImpl.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTask.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java
10 files changed, 40 insertions(+), 34 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/38694/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 a367d0c..2e23e50 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
@@ -2168,7 +2168,7 @@
}
}
- private CommandEntity buildCommandEntity(Guid parentCommandId, boolean
callBackEnabled) {
+ private CommandEntity buildCommandEntity(Guid parentCommandId, boolean
enableCallback) {
return CommandEntity.buildCommandEntity(getUserId(),
getCommandId(),
parentCommandId,
@@ -2177,7 +2177,7 @@
getActionType(),
getParameters(),
commandStatus,
- callBackEnabled,
+ enableCallback,
getReturnValue());
}
@@ -2215,7 +2215,9 @@
try {
CommandEntity cmdEntity =
CommandCoordinatorUtil.getCommandEntity(getCommandId());
if (cmdEntity != null) {
-
CommandCoordinatorUtil.persistCommand(buildCommandEntity(cmdEntity.getRootCommandId(),
cmdEntity.isCallBackEnabled()), getContext());
+
CommandCoordinatorUtil.persistCommand(buildCommandEntity(cmdEntity.getRootCommandId(),
+ cmdEntity.isCallbackEnabled()),
+ getContext());
CommandCoordinatorUtil.updateCommandExecuted(getCommandId());
}
} finally {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommandCallback.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommandCallback.java
index 5282eb3..349eb82 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommandCallback.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommandCallback.java
@@ -31,7 +31,7 @@
break;
default:
CommandEntity cmdEntity =
CommandCoordinatorUtil.getCommandEntity(childCmdId);
- if (cmdEntity != null && cmdEntity.isCallBackNotified()) {
+ if (cmdEntity != null && cmdEntity.isCallbackNotified()) {
++completedChildren;
break;
} else {
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 1a002be..790a49e 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
@@ -89,7 +89,7 @@
case SUCCEEDED:
CommandEntity cmdEntity =
CommandCoordinatorUtil.getCommandEntity(currentChildId);
- if (!cmdEntity.isCallBackNotified()) {
+ if (!cmdEntity.isCallbackNotified()) {
log.info("Waiting on Live Merge command step '{}' to
finalize",
getParameters().getCommandStep());
return;
@@ -386,7 +386,7 @@
Backend.getInstance().endAction(VdcActionType.DestroyImage,
command.getParameters(),
cloneContextAndDetachFromParent());
-
CommandCoordinatorUtil.getCommandEntity(currentChildId).setCallBackNotified(true);
+
CommandCoordinatorUtil.getCommandEntity(currentChildId).setCallbackNotified(true);
}
}
} else {
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 f9b9902..b8b9496 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
@@ -199,7 +199,7 @@
int retVal =
DbFacade.getInstance().getAsyncTaskDao().remove(taskId);
if (asyncTask != null &&
!Guid.isNullOrEmpty(asyncTask.getCommandId())) {
CommandEntity cmdEntity =
coco.getCommandEntity(asyncTask.getCommandId());
- if (cmdEntity != null && !cmdEntity.isCallBackEnabled()) {
+ if (cmdEntity != null && !cmdEntity.isCallbackEnabled()) {
coco.removeCommand(asyncTask.getCommandId());
if
(!coco.hasCommandEntitiesWithRootCommandId(asyncTask.getRootCommandId())) {
coco.removeCommand(asyncTask.getRootCommandId());
@@ -229,7 +229,7 @@
int retVal =
DbFacade.getInstance().getAsyncTaskDao().removeByVdsmTaskId(vdsmTaskId);
if (asyncTask != null &&
!Guid.isNullOrEmpty(asyncTask.getCommandId())) {
CommandEntity cmdEntity =
coco.getCommandEntity(asyncTask.getCommandId());
- if (cmdEntity != null && !cmdEntity.isCallBackEnabled()) {
+ if (cmdEntity != null && !cmdEntity.isCallbackEnabled()) {
coco.removeCommand(asyncTask.getCommandId());
if
(!coco.hasCommandEntitiesWithRootCommandId(asyncTask.getRootCommandId())) {
coco.removeCommand(asyncTask.getRootCommandId());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java
index 2b28e6b..4403c27 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java
@@ -78,17 +78,17 @@
CommandEntity existingCmdEntity = commandsCache.get(cmdEntity.getId());
if (existingCmdEntity != null) {
cmdEntity.setExecuted(existingCmdEntity.isExecuted());
-
cmdEntity.setCallBackNotified(existingCmdEntity.isCallBackNotified());
+
cmdEntity.setCallbackNotified(existingCmdEntity.isCallbackNotified());
}
commandsCache.put(cmdEntity);
// check if callback is enabled or if parent command has callback
enabled
- if (cmdEntity.isCallBackEnabled() ||
+ if (cmdEntity.isCallbackEnabled() ||
(!Guid.isNullOrEmpty(cmdEntity.getRootCommandId()) &&
commandsCache.get(cmdEntity.getRootCommandId()) !=
null &&
-
commandsCache.get(cmdEntity.getRootCommandId()).isCallBackEnabled()
+
commandsCache.get(cmdEntity.getRootCommandId()).isCallbackEnabled()
)) {
buildCmdHierarchy(cmdEntity);
- if (!cmdEntity.isCallBackNotified()) {
+ if (!cmdEntity.isCallbackNotified()) {
cmdExecutor.addToCallBackMap(cmdEntity);
}
}
@@ -130,7 +130,7 @@
CommandEntity cmdEntity;
for (Guid cmdId : commandsCache.keySet()) {
cmdEntity = commandsCache.get(cmdId);
- if (commandsCache.get(cmdId).isCallBackEnabled()) {
+ if (commandsCache.get(cmdId).isCallbackEnabled()) {
cmdEntities.add(cmdEntity);
}
}
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 b897530..e88a7c2 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
@@ -123,7 +123,7 @@
cmdEntity.getCommandStatus() !=
CommandStatus.FAILED_RESTARTED) {
coco.retrieveCommand(cmdEntity.getId()).setCommandStatus(CommandStatus.FAILED_RESTARTED);
}
- if (!cmdEntity.isCallBackNotified()) {
+ if (!cmdEntity.isCallbackNotified()) {
addToCallBackMap(cmdEntity);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java
index fe3ed89..409f20f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java
@@ -95,7 +95,7 @@
public void updateCallbackNotified(final Guid commandId) {
CommandEntity cmdEntity = get(commandId);
if (cmdEntity != null) {
- cmdEntity.setCallBackNotified(true);
+ cmdEntity.setCallbackNotified(true);
DbFacade.getInstance().getCommandEntityDao().updateNotified(commandId);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTask.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTask.java
index da58284..30e908c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTask.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTask.java
@@ -198,11 +198,11 @@
}
public void setCallBackEnabled(boolean enabled) {
- childCmdEntity.setCallBackEnabled(enabled);
+ childCmdEntity.setCallbackEnabled(enabled);
}
public boolean isCallBackEnabled() {
- return childCmdEntity.isCallBackEnabled();
+ return childCmdEntity.isCallbackEnabled();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java
index da709cf..d6bb30c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java
@@ -21,10 +21,14 @@
private VdcActionParametersBase commandParameters;
private VdcReturnValueBase returnValue;
private Date createdAt;
- private CommandStatus commandStatus = CommandStatus.UNKNOWN;
- private boolean callBackEnabled = false;
- private boolean callBackNotified = false;
- private boolean executed = false;
+ private CommandStatus commandStatus;
+ private boolean callbackEnabled;
+ private boolean callbackNotified;
+ private boolean executed;
+
+ public CommandEntity() {
+ commandStatus = CommandStatus.UNKNOWN;
+ }
@Override
public int hashCode() {
@@ -102,20 +106,20 @@
this.commandStatus = commandStatus;
}
- public boolean isCallBackEnabled() {
- return callBackEnabled;
+ public boolean isCallbackEnabled() {
+ return callbackEnabled;
}
- public void setCallBackEnabled(boolean callBackEnabled) {
- this.callBackEnabled = callBackEnabled;
+ public void setCallbackEnabled(boolean callbackEnabled) {
+ this.callbackEnabled = callbackEnabled;
}
- public boolean isCallBackNotified() {
- return callBackNotified;
+ public boolean isCallbackNotified() {
+ return callbackNotified;
}
- public void setCallBackNotified(boolean callBackNotified) {
- this.callBackNotified = callBackNotified;
+ public void setCallbackNotified(boolean callbackNotified) {
+ this.callbackNotified = callbackNotified;
}
public static CommandEntity buildCommandEntity(Guid userId,
@@ -126,7 +130,7 @@
VdcActionType actionType,
VdcActionParametersBase
params,
CommandStatus status,
- boolean callBackEnabled,
+ boolean callbackEnabled,
VdcReturnValueBase
returnValue) {
CommandEntity entity = new CommandEntity();
entity.setUserId(userId);
@@ -137,7 +141,7 @@
entity.setCommandType(actionType);
entity.setCommandParameters(params);
entity.setCommandStatus(status);
- entity.setCallBackEnabled(callBackEnabled);
+ entity.setCallbackEnabled(callbackEnabled);
entity.setReturnValue(returnValue);
return entity;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java
index 736781c..6ca5b6b 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java
@@ -37,8 +37,8 @@
result.setReturnValue(deserializeReturnValue(resultSet.getString("return_value"),
resultSet.getString("return_value_class")));
result.setCommandStatus(getCommandStatus(resultSet.getString("status")));
result.setExecuted(resultSet.getBoolean("executed"));
-
result.setCallBackEnabled(resultSet.getBoolean("callback_enabled"));
-
result.setCallBackNotified(resultSet.getBoolean("callback_notified"));
+
result.setCallbackEnabled(resultSet.getBoolean("callback_enabled"));
+
result.setCallbackNotified(resultSet.getBoolean("callback_notified"));
return result;
}
};
@@ -68,7 +68,7 @@
.addValue("command_params_class",
entity.getCommandParameters() == null ? null :
entity.getCommandParameters().getClass().getName())
.addValue("status", entity.getCommandStatus().toString())
.addValue("executed", entity.isExecuted())
- .addValue("callback_enabled", entity.isCallBackEnabled())
+ .addValue("callback_enabled", entity.isCallbackEnabled())
.addValue("return_value",
serializeReturnValue(entity.getReturnValue()))
.addValue("return_value_class", entity.getReturnValue() ==
null ? null : entity.getReturnValue().getClass().getName());
}
--
To view, visit https://gerrit.ovirt.org/38694
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5969a09137e2e52d903dd8abf5bfe1234844901d
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
