Moti Asayag has uploaded a new change for review. Change subject: engine: Remove unnecessary abstraction ......................................................................
engine: Remove unnecessary abstraction Assuming same parameters command of InterfaceAndIdQueryParameters maybe shared between vms and hosts is incorrect, as it is designed for host only. Change-Id: Ie8ed487f9ffbc52c11627736209c8d1d7b1434ac Signed-off-by: Moti Asayag <[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/InterfaceAndIdQueryParameters.java 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/22785/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 bc5eda0..8ce9962 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 @@ -20,7 +20,7 @@ @Override protected void executeQueryCommand() { java.util.ArrayList<VdsNetworkInterface> retVal = new java.util.ArrayList<VdsNetworkInterface>(); - if (((VdsNetworkInterface) getParameters().getInterface()).getVlanId() == null) { + if ((getParameters().getInterface()).getVlanId() == null) { List<VdsNetworkInterface> vdsInterfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); i++) { 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 bc36c9c..b394458 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 @@ -21,7 +21,7 @@ @Override protected void executeQueryCommand() { java.util.ArrayList<VdsNetworkInterface> retVal = new java.util.ArrayList<VdsNetworkInterface>(); - if (((VdsNetworkInterface) getParameters().getInterface()).getVlanId() != null) { + if ((getParameters().getInterface()).getVlanId() != null) { List<VdsNetworkInterface> vdsInterfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); 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 55d581c..3e99e4a 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 @@ -17,7 +17,7 @@ @Override protected void executeQueryCommand() { - if (((VdsNetworkInterface) getParameters().getInterface()).getVlanId() != null) { + if ((getParameters().getInterface()).getVlanId() != null) { List<VdsNetworkInterface> vdsInterfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getId()); for (int i = 0; i < vdsInterfaces.size(); i++) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/InterfaceAndIdQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/InterfaceAndIdQueryParameters.java index 705f6e4..63c64a2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/InterfaceAndIdQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/InterfaceAndIdQueryParameters.java @@ -1,22 +1,22 @@ package org.ovirt.engine.core.common.queries; -import org.ovirt.engine.core.common.businessentities.network.NetworkInterface; +import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.compat.Guid; public class InterfaceAndIdQueryParameters extends IdQueryParameters { private static final long serialVersionUID = 2875732930025180055L; - private NetworkInterface<?> iface; + private VdsNetworkInterface iface; public InterfaceAndIdQueryParameters() { } - public InterfaceAndIdQueryParameters(Guid vdsId, NetworkInterface<?> iface) { + public InterfaceAndIdQueryParameters(Guid vdsId, VdsNetworkInterface iface) { super(vdsId); this.iface = iface; } - public NetworkInterface<?> getInterface() { + public VdsNetworkInterface getInterface() { return iface; } } -- To view, visit http://gerrit.ovirt.org/22785 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8ed487f9ffbc52c11627736209c8d1d7b1434ac Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
