Arik Hadas has uploaded a new change for review. Change subject: core: [cleanup] tiny cleanups ......................................................................
core: [cleanup] tiny cleanups This patch contains: 1. change the indentation in HibernateVmCommand#getAuditLogTypeValue to make it more readable 2. simplified AsyncTaskManager#hasTasksForEntityIdAndAction structure 3. replace ArrayList with List in VdsActionParameterBase public methods signatures Change-Id: I7bbfc040e06ff1cfd48ba02a5992d0d533d9e75f Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java 4 files changed, 13 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/14532/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java index 187f0a7..48fba43 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java @@ -72,7 +72,7 @@ private void removeVmImages() { // Remove vm images, in case they were not already removed by child commands - ArrayList<VdcActionParametersBase> imageParams = getParameters().getImagesParameters(); + List<VdcActionParametersBase> imageParams = getParameters().getImagesParameters(); if (imageParams != null) { for (VdcActionParametersBase param : imageParams) { DiskImage diskImage = getDiskImageToRemoveByParam((MoveOrCopyImageGroupParameters) param); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java index 3e1317e..7d465f0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java @@ -159,17 +159,15 @@ } public synchronized boolean hasTasksForEntityIdAndAction(Guid id, VdcActionType type) { - boolean retVal = false; if (_tasks != null) { for (SPMAsyncTask task : _tasks.values()) { if (isCurrentTaskLookedFor(id, task) && type.equals(task.getParameters().getDbAsyncTask().getaction_type())) { - retVal = true; - break; + return true; } } } - return retVal; + return false; } private boolean isCurrentTaskLookedFor(Guid id, SPMAsyncTask task) { 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 9d04ff1..aa05590 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 @@ -214,9 +214,9 @@ public AuditLogType getAuditLogTypeValue() { switch (getActionState()) { case EXECUTE: - return getHibernateVmParams().getAutomaticSuspend() ? getSucceeded() ? AuditLogType.AUTO_SUSPEND_VM - : AuditLogType.AUTO_FAILED_SUSPEND_VM : getSucceeded() ? AuditLogType.USER_SUSPEND_VM - : AuditLogType.USER_FAILED_SUSPEND_VM; + return getHibernateVmParams().getAutomaticSuspend() ? + getSucceeded() ? AuditLogType.AUTO_SUSPEND_VM : AuditLogType.AUTO_FAILED_SUSPEND_VM + : getSucceeded() ? AuditLogType.USER_SUSPEND_VM : AuditLogType.USER_FAILED_SUSPEND_VM; case END_SUCCESS: case END_FAILURE: diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java index a284ca4..2d9f032 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.common.action; -import java.util.ArrayList; +import java.util.List; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -41,11 +41,11 @@ private Object entityId; - private ArrayList<VdcActionParametersBase> imagesParameters; + private List<VdcActionParametersBase> imagesParameters; private boolean taskGroupSuccess = true; - private ArrayList<Guid> taskIds; + private List<Guid> taskIds; private int executionIndex = 0; @@ -156,11 +156,11 @@ multipleAction = value; } - public ArrayList<VdcActionParametersBase> getImagesParameters() { + public List<VdcActionParametersBase> getImagesParameters() { return imagesParameters; } - public void setImagesParameters(ArrayList<VdcActionParametersBase> value) { + public void setImagesParameters(List<VdcActionParametersBase> value) { imagesParameters = value; } @@ -191,11 +191,11 @@ entityId = value; } - public ArrayList<Guid> getTaskIds() { + public List<Guid> getTaskIds() { return taskIds; } - public void setTaskIds(ArrayList<Guid> value) { + public void setTaskIds(List<Guid> value) { taskIds = value; } -- To view, visit http://gerrit.ovirt.org/14532 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bbfc040e06ff1cfd48ba02a5992d0d533d9e75f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
