Martin Mucha has uploaded a new change for review. Change subject: core: IdParameters should contain @NotNull validation ......................................................................
core: IdParameters should contain @NotNull validation as requested in CR, IdParameters should contain @NotNull validation - removed RemoveMacPoolCommand which is rendered redundant by this change. Change-Id: I4cda909ffc16aa3b844faa7c2e7cd323a0769db1 Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveMacPoolByIdParameters.java 3 files changed, 10 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/30569/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java index e402249..6734794 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java @@ -6,16 +6,16 @@ import org.ovirt.engine.core.bll.network.macpoolmanager.MacPoolPerDcSingleton; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; -import org.ovirt.engine.core.common.action.RemoveMacPoolByIdParameters; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.businessentities.MacPool; import org.ovirt.engine.core.common.errors.VdcBllMessages; -public class RemoveMacPoolCommand extends MacPoolCommandBase<RemoveMacPoolByIdParameters> { +public class RemoveMacPoolCommand extends MacPoolCommandBase<IdParameters> { private MacPool oldMacPool; - public RemoveMacPoolCommand(RemoveMacPoolByIdParameters parameters) { + public RemoveMacPoolCommand(IdParameters parameters) { super(parameters); } @@ -28,8 +28,8 @@ @Override protected void executeCommand() { - getMacPoolDao().remove(getParameters().getMacPoolId()); - MacPoolPerDcSingleton.getInstance().removePool(getParameters().getMacPoolId()); + getMacPoolDao().remove(getParameters().getId()); + MacPoolPerDcSingleton.getInstance().removePool(getParameters().getId()); getReturnValue().setSucceeded(true); } @@ -40,7 +40,7 @@ return false; } - oldMacPool = getMacPoolDao().get(getParameters().getMacPoolId()); + oldMacPool = getMacPoolDao().get(getParameters().getId()); final MacPoolValidator validator = new MacPoolValidator(oldMacPool); return validate(validator.macPoolExists()) && diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.java index 0d39a6e..a5119d0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.java @@ -1,10 +1,14 @@ package org.ovirt.engine.core.common.action; +import javax.validation.constraints.NotNull; + +import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.compat.Guid; public class IdParameters extends VdcActionParametersBase { private static final long serialVersionUID = -8078914032408357639L; + @NotNull(groups = { UpdateEntity.class }) private Guid id; public IdParameters() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveMacPoolByIdParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveMacPoolByIdParameters.java deleted file mode 100644 index aed293e..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveMacPoolByIdParameters.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.ovirt.engine.core.common.action; - -import javax.validation.constraints.NotNull; - -import org.ovirt.engine.core.common.validation.group.UpdateEntity; -import org.ovirt.engine.core.compat.Guid; - -public class RemoveMacPoolByIdParameters extends VdcActionParametersBase { - - @NotNull(groups = {UpdateEntity.class }) - private Guid macPoolId; - - public RemoveMacPoolByIdParameters() { - } - - public RemoveMacPoolByIdParameters(Guid macPoolId) { - this.macPoolId = macPoolId; - } - - public Guid getMacPoolId() { - return macPoolId; - } -} - -- To view, visit http://gerrit.ovirt.org/30569 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4cda909ffc16aa3b844faa7c2e7cd323a0769db1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
