Mike Kolesnik has uploaded a new change for review. Change subject: engine: Delete NetworkIdParameters ......................................................................
engine: Delete NetworkIdParameters These are not needed anymore, only thing using them is another parameters class which was changed to inherit IdQueryParameters. Change-Id: I89f2be937481b84af9d44162f7e1e6b08fc0b9c1 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsAndNetworkInterfacesByNetworkIdParameters.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NetworkIdParameters.java 4 files changed, 4 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/10669/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java index da5aae4..f62be8f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQuery.java @@ -24,9 +24,9 @@ @Override protected void executeQueryCommand() { List<VM> vmList = getDbFacade().getVmDao() - .getAllForNetwork(getParameters().getNetworkId()); + .getAllForNetwork(getParameters().getId()); List<VmNetworkInterface> vmNetworkInterfaceList = getDbFacade().getVmNetworkInterfaceDao() - .getAllForNetwork(getParameters().getNetworkId()); + .getAllForNetwork(getParameters().getId()); final Map<Guid, VM> vmsById = Entities.businessEntitiesById(vmList); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java index 94d433e..90f11d7 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmsAndNetworkInterfacesByNetworkIdQueryTest.java @@ -43,7 +43,7 @@ private void expectAndTestForVmAndInterface() { // Set up the query parameters - when(params.getNetworkId()).thenReturn(networkId); + when(params.getId()).thenReturn(networkId); vm.setId(vmId); vmNetworkInterface.setVmId(vmId); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsAndNetworkInterfacesByNetworkIdParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsAndNetworkInterfacesByNetworkIdParameters.java index c122463..1f1e27e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsAndNetworkInterfacesByNetworkIdParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsAndNetworkInterfacesByNetworkIdParameters.java @@ -2,7 +2,7 @@ import org.ovirt.engine.core.compat.Guid; -public class GetVmsAndNetworkInterfacesByNetworkIdParameters extends NetworkIdParameters { +public class GetVmsAndNetworkInterfacesByNetworkIdParameters extends IdQueryParameters { private static final long serialVersionUID = -3306070454507733795L; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NetworkIdParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NetworkIdParameters.java deleted file mode 100644 index b43ee32..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NetworkIdParameters.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -import javax.validation.constraints.NotNull; - -import org.ovirt.engine.core.compat.Guid; - -/** - * The Parameters class for queries that use only Network Id - */ -public class NetworkIdParameters extends VdcQueryParametersBase { - private static final long serialVersionUID = -5550670672065955312L; - - @NotNull - private Guid networkId; - - public NetworkIdParameters() { - } - - public NetworkIdParameters(Guid networkId) { - this.networkId = networkId; - } - - public Guid getNetworkId() { - return networkId; - } -} -- To view, visit http://gerrit.ovirt.org/10669 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89f2be937481b84af9d44162f7e1e6b08fc0b9c1 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
