Allon Mureinik has uploaded a new change for review. Change subject: core: Remove the unused GetNonOperationalVdsQuery ......................................................................
core: Remove the unused GetNonOperationalVdsQuery Remove GetNonOperationalVdsQuery, since it is not used anywhere in the codebase. This patch removes: 1. The GetNonOperationalVdsQuery class. 2. The NetworkNonOperationalQueryParameters only used by the aforementioned class. 3. The corresponding GetNonOperationalVds constant in VdcQueryType. Please enter the commit message for your changes. Lines starting Change-Id: I21bef4c93c3f40ebcbb39182ca18dda55ef0a7b0 Signed-off-by: Allon Mureinik <[email protected]> --- D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNonOperationalVdsQuery.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NetworkNonOperationalQueryParamenters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java 3 files changed, 0 insertions(+), 68 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/13446/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNonOperationalVdsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNonOperationalVdsQuery.java deleted file mode 100644 index 97c3f6b..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNonOperationalVdsQuery.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ovirt.engine.core.bll; - -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.common.businessentities.VdsStatic; -import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.core.common.queries.NetworkNonOperationalQueryParamenters; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.utils.linq.LinqUtils; -import org.ovirt.engine.core.utils.linq.Predicate; - -public class GetNonOperationalVdsQuery<P extends NetworkNonOperationalQueryParamenters> extends QueriesCommandBase<P> { - public GetNonOperationalVdsQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - java.util.ArrayList<VdsStatic> retVal = new java.util.ArrayList<VdsStatic>(); - List<VdsStatic> vdsList = DbFacade.getInstance().getVdsStaticDao().getAllForVdsGroup( - getParameters().getVdsGroupId()); - - for (VdsStatic vds : vdsList) { - List<VdsNetworkInterface> interfaces = DbFacade.getInstance() - .getInterfaceDao().getAllInterfacesForVds(vds.getId()); - if (LinqUtils.firstOrNull(interfaces, new Predicate<VdsNetworkInterface>() { - @Override - public boolean eval(VdsNetworkInterface i) { - return StringUtils.equals(i.getNetworkName(), getParameters().getNetwork().getName()); - } - }) == null) { - retVal.add(vds); - } - } - - getQueryReturnValue().setReturnValue(retVal); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NetworkNonOperationalQueryParamenters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NetworkNonOperationalQueryParamenters.java deleted file mode 100644 index 9d54787..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NetworkNonOperationalQueryParamenters.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -import org.ovirt.engine.core.common.businessentities.network.Network; -import org.ovirt.engine.core.compat.Guid; - -public class NetworkNonOperationalQueryParamenters extends VdcQueryParametersBase { - private static final long serialVersionUID = -5386574130657761284L; - - public NetworkNonOperationalQueryParamenters(Guid vdsgroupid, Network net) { - _vdsgroupid = vdsgroupid; - _network = net; - } - - private Guid _vdsgroupid; - - public Guid getVdsGroupId() { - return _vdsgroupid; - } - - private Network _network; - - public Network getNetwork() { - return _network; - } - - public NetworkNonOperationalQueryParamenters() { - } -} 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 f6253a1..37fb109 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 @@ -41,7 +41,6 @@ GetVdsFreeBondsByVdsId, GetAllNetworks(VdcQueryAuthType.User), GetAllNetworksByClusterId(VdcQueryAuthType.User), - GetNonOperationalVds, GetManagementInterfaceAddressByVmId(VdcQueryAuthType.User), // Vm Network GetVmInterfacesByVmId(VdcQueryAuthType.User), -- To view, visit http://gerrit.ovirt.org/13446 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21bef4c93c3f40ebcbb39182ca18dda55ef0a7b0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
