Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetAdGroupsAttechedToTimeLeaseVmPool
......................................................................
core: Remove GetAdGroupsAttechedToTimeLeaseVmPool
GetAdGroupsAttechedToTimeLeaseVmPoolQuery is not used anywhere in the
code, and thus should be removed.
This patch removes the following:
1. The GetAdGroupsAttechedToTimeLeaseVmPoolQuery class.
2. The GetAdGroupsAttechedToTimeLeaseVmPoolParameters class only
used by the aforementioned query class.
3. The GetAdGroupsAttechedToTimeLeaseVmPool constant in VdcQueryType
corresponding to the aforementioned query class.
4. The getAllTimeLeasedForPool(int) method from AdGroupDAO and its
implementation. Note that the underlying stored procedure called
from this method no longer exists, so it could not have worked
anyway.
Change-Id: Idd4265f3f979a76f70d9dcabf5b69e05fc9a0708
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAdGroupsAttachedToTimeLeasedVmPoolQuery.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAdGroupsAttachedToTimeLeasedVmPoolParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
5 files changed, 0 insertions(+), 52 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/13287/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAdGroupsAttachedToTimeLeasedVmPoolQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAdGroupsAttachedToTimeLeasedVmPoolQuery.java
deleted file mode 100644
index 6dda05f..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAdGroupsAttachedToTimeLeasedVmPoolQuery.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import
org.ovirt.engine.core.common.queries.GetAdGroupsAttachedToTimeLeasedVmPoolParameters;
-
-public class GetAdGroupsAttachedToTimeLeasedVmPoolQuery<P extends
GetAdGroupsAttachedToTimeLeasedVmPoolParameters>
- extends QueriesCommandBase<P> {
- public GetAdGroupsAttachedToTimeLeasedVmPoolQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- getQueryReturnValue().setReturnValue(
-
getDbFacade().getAdGroupDao().getAllTimeLeasedForPool(getParameters().getId()));
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAdGroupsAttachedToTimeLeasedVmPoolParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAdGroupsAttachedToTimeLeasedVmPoolParameters.java
deleted file mode 100644
index 4c41698..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAdGroupsAttachedToTimeLeasedVmPoolParameters.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetAdGroupsAttachedToTimeLeasedVmPoolParameters extends
VdcQueryParametersBase {
- private static final long serialVersionUID = 2696702562297712449L;
-
- public GetAdGroupsAttachedToTimeLeasedVmPoolParameters(int id) {
- _id = id;
- }
-
- private int _id;
-
- public int getId() {
- return _id;
- }
-
- public GetAdGroupsAttachedToTimeLeasedVmPoolParameters() {
- }
-}
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 7c6fda4..0f21bd5 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
@@ -106,7 +106,6 @@
// AdGroups queries
GetAllAdGroups,
- GetAdGroupsAttachedToTimeLeasedVmPool,
GetAdGroupById,
// VM pools queries
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAO.java
index 64177fb..738f0aa 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAO.java
@@ -37,15 +37,6 @@
List<LdapGroup> getAll();
/**
- * Retrieves all time leased groups for the specified pool.
- *
- * @param id
- * the pool
- * @return the list of groups
- */
- List<LdapGroup> getAllTimeLeasedForPool(int id);
-
- /**
* Saves the supplied group.
*
* @param group
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
index df5c425..be93bda 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
@@ -42,14 +42,6 @@
}
@Override
- public List<LdapGroup> getAllTimeLeasedForPool(int id) {
- return
getCallsHandler().executeReadList("Gettime_leasedad_groups_by_vm_pool_id",
- ADGroupRowMapper.instance,
- getCustomMapSqlParameterSource()
- .addValue("vmPoolId", id));
- }
-
- @Override
public void save(LdapGroup group) {
insertOrUpdate(group, "Insertad_groups");
}
--
To view, visit http://gerrit.ovirt.org/13287
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd4265f3f979a76f70d9dcabf5b69e05fc9a0708
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
