Mike Kolesnik has uploaded a new change for review. Change subject: engine: Refactor GetAllChildVlanInterfacesQueryParameters ......................................................................
engine: Refactor GetAllChildVlanInterfacesQueryParameters 1. Ordered class. 2. Renamed field to standard name. 3. Changed inheritance to extend IdQueryParameters. Change-Id: Iaf211a53da23f5bc310a123e584beb7e3a2ef87f Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllChildVlanInterfacesQueryParameters.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java 5 files changed, 15 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/10670/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java index 40daef8..e775254 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllChildVlanInterfacesQuery.java @@ -22,7 +22,7 @@ java.util.ArrayList<VdsNetworkInterface> retVal = new java.util.ArrayList<VdsNetworkInterface>(); if (((VdsNetworkInterface) getParameters().getInterface()).getVlanId() == null) { List<VdsNetworkInterface> vdsInterfaces = - getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); + getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); i++) { if (vdsInterfaces.get(i).getVlanId() != null) { if (NetworkUtils.interfaceBasedOn(vdsInterfaces.get(i).getName(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java index 9e8c2b4..7361f04 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java @@ -23,7 +23,7 @@ java.util.ArrayList<VdsNetworkInterface> retVal = new java.util.ArrayList<VdsNetworkInterface>(); if (((VdsNetworkInterface) getParameters().getInterface()).getVlanId() != null) { List<VdsNetworkInterface> vdsInterfaces = - getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); + getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); i++) { if (vdsInterfaces.get(i).getVlanId() != null && !StringUtils.equals(getParameters().getInterface().getName(), vdsInterfaces.get(i) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java index f5d0702..e8a6ec1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java @@ -19,7 +19,7 @@ protected void executeQueryCommand() { if (((VdsNetworkInterface) getParameters().getInterface()).getVlanId() != null) { List<VdsNetworkInterface> vdsInterfaces = - getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); + getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); i++) { if (NetworkUtils.interfaceBasedOn(getParameters().getInterface().getName(), vdsInterfaces.get(i).getName())) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllChildVlanInterfacesQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllChildVlanInterfacesQueryParameters.java index efa74b6..3ae83f8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllChildVlanInterfacesQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllChildVlanInterfacesQueryParameters.java @@ -3,26 +3,20 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkInterface; import org.ovirt.engine.core.compat.Guid; -public class GetAllChildVlanInterfacesQueryParameters extends VdcQueryParametersBase { +public class GetAllChildVlanInterfacesQueryParameters extends IdQueryParameters { private static final long serialVersionUID = 2875732930025180055L; - public GetAllChildVlanInterfacesQueryParameters(Guid vdsId, NetworkInterface<?> iface) { - _vdsId = vdsId; - _interface = iface; - } - - private Guid _vdsId; - - public Guid getVdsId() { - return _vdsId; - } - - private NetworkInterface<?> _interface; - - public NetworkInterface<?> getInterface() { - return _interface; - } + private NetworkInterface<?> iface; public GetAllChildVlanInterfacesQueryParameters() { } + + public GetAllChildVlanInterfacesQueryParameters(Guid vdsId, NetworkInterface<?> iface) { + super(vdsId); + this.iface = iface; + } + + public NetworkInterface<?> getInterface() { + return iface; + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java index ce63fd9..a67c81d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java @@ -229,7 +229,7 @@ vlans.add(vlan); setUpEntityQueryExpectations(VdcQueryType.GetAllChildVlanInterfaces, GetAllChildVlanInterfacesQueryParameters.class, - new String[]{"VdsId", "Interface"}, + new String[]{"Id", "Interface"}, new Object[]{PARENT_GUID, hostNicModel}, vlans); } -- To view, visit http://gerrit.ovirt.org/10670 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf211a53da23f5bc310a123e584beb7e3a2ef87f 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
