Mike Kolesnik has uploaded a new change for review. Change subject: core: Delete GetNetworkDisplayByClusterIdQuery ......................................................................
core: Delete GetNetworkDisplayByClusterIdQuery This query is unused so deleting it and the parameters class which is no longer necessary. Change-Id: I3dd9caf6f010cce8fe2c86889ba3feca7c39f380 Signed-off-by: Mike Kolesnik <[email protected]> --- D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdsGroupQueryParamenters.java 3 files changed, 0 insertions(+), 60 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/10659/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java deleted file mode 100644 index 5e1bbf6..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ovirt.engine.core.bll.network.cluster; - -import java.util.List; - -import org.ovirt.engine.core.bll.QueriesCommandBase; -import org.ovirt.engine.core.common.businessentities.network.Network; -import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; -import org.ovirt.engine.core.common.queries.VdsGroupQueryParamenters; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.linq.LinqUtils; -import org.ovirt.engine.core.utils.linq.Predicate; - -public class GetNetworkDisplayByClusterIdQuery<P extends VdsGroupQueryParamenters> extends QueriesCommandBase<P> { - public GetNetworkDisplayByClusterIdQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - Guid vdsgroupid = getParameters().getVdsGroupId(); - List<NetworkCluster> all = getDbFacade().getNetworkClusterDao().getAllForCluster(vdsgroupid); - final NetworkCluster nc = LinqUtils.firstOrNull(all, new Predicate<NetworkCluster>() { - @Override - public boolean eval(NetworkCluster networkCluster) { - return networkCluster.isDisplay(); - } - }); - if (nc != null) { - getQueryReturnValue().setReturnValue( - LinqUtils.firstOrNull(getDbFacade().getNetworkDao().getAllForCluster(vdsgroupid), - new Predicate<Network>() { - @Override - public boolean eval(Network network) { - return network.getId().equals(nc.getNetworkId()); - } - })); - } - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index cce9bbb..b9a9ebf7 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -43,7 +43,6 @@ GetVdsFreeBondsByVdsId, GetAllNetworks(VdcQueryAuthType.User), GetAllNetworksByClusterId(VdcQueryAuthType.User), - GetNetworkDisplayByClusterId, GetNonOperationalVds, GetManagementInterfaceAddressByVmId(VdcQueryAuthType.User), // Vm Network diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdsGroupQueryParamenters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdsGroupQueryParamenters.java deleted file mode 100644 index 8ee9ab2..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdsGroupQueryParamenters.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -import org.ovirt.engine.core.compat.*; - -public class VdsGroupQueryParamenters extends VdcQueryParametersBase { - private static final long serialVersionUID = 1936229921452072377L; - - public VdsGroupQueryParamenters(Guid vdsgroupid) { - _vdsgroupid = vdsgroupid; - } - - private Guid _vdsgroupid; - - public Guid getVdsGroupId() { - return _vdsgroupid; - } - - public VdsGroupQueryParamenters() { - } -} -- To view, visit http://gerrit.ovirt.org/10659 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3dd9caf6f010cce8fe2c86889ba3feca7c39f380 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
