Mike Kolesnik has uploaded a new change for review. Change subject: engine: Change validation in network common ......................................................................
engine: Change validation in network common Changed to use ValidationResult style which is more concise and readable. Change-Id: I77e70605d19187e5ced6389941e401d21bbd421a Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 3 files changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/10471/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java index 8fbdc32..b3f74ea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java @@ -4,6 +4,7 @@ import java.util.List; import org.ovirt.engine.core.bll.CommandBase; +import org.ovirt.engine.core.bll.ValidationResult; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters; @@ -92,13 +93,9 @@ return true; } - protected boolean networkNotAttachedToCluster(final Network network) { - if (!getNetworkClusterDAO().getAllForNetwork(network.getId()).isEmpty()) { - addCanDoActionMessage(VdcBllMessages.NETWORK_CLUSTER_NETWORK_IN_USE); - return false; - } - - return true; + protected ValidationResult networkNotAttachedToCluster(final Network network) { + return getNetworkClusterDAO().getAllForNetwork(network.getId()).isEmpty() + ? ValidationResult.VALID : new ValidationResult(VdcBllMessages.NETWORK_CLUSTER_NETWORK_IN_USE); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java index 7203425..d419dd5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java @@ -25,7 +25,7 @@ @Override protected boolean canDoAction() { - return networkNotAttachedToCluster(getParameters().getNetwork()); + return validate(networkNotAttachedToCluster(getParameters().getNetwork())); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 09c6625..67802ec 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -116,7 +116,7 @@ } } - return networkNotAttachedToCluster(oldNetwork); + return validate(networkNotAttachedToCluster(oldNetwork)); } @Override -- To view, visit http://gerrit.ovirt.org/10471 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77e70605d19187e5ced6389941e401d21bbd421a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
