Allon Mureinik has uploaded a new change for review. Change subject: core: Remove GetAllEventSubsribers ......................................................................
core: Remove GetAllEventSubsribers GetAllEventSubsribersQuery is not used anywhere in the code, and hence should be removed. This patch removes the following: 1. The GetAllEventSubsribersQuery class. 2. The GetAllEventSubsribers constant representing it in VdcQueryType. 3. The getAll() method in EvetDAO, its implementation, test and underlying stored procedure, as this method was only used by the aforementioned query. Change-Id: Ic49e45cfdec1b08d2688d1e33f62a32176510547 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/dbscripts/event_sp.sql D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventSubscribersQuery.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/EventDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java 6 files changed, 0 insertions(+), 59 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/13604/1 diff --git a/backend/manager/dbscripts/event_sp.sql b/backend/manager/dbscripts/event_sp.sql index f2e0839..3df36d3 100644 --- a/backend/manager/dbscripts/event_sp.sql +++ b/backend/manager/dbscripts/event_sp.sql @@ -71,20 +71,6 @@ -Create or replace FUNCTION GetAllFromevent_subscriber() -RETURNS SETOF event_subscriber - AS $procedure$ -BEGIN - RETURN QUERY SELECT * - FROM event_subscriber; - -END; $procedure$ -LANGUAGE plpgsql; - - - - - Create or replace FUNCTION Getevent_subscriberBysubscriber_id(v_subscriber_id UUID) RETURNS SETOF event_subscriber AS $procedure$ diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventSubscribersQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventSubscribersQuery.java deleted file mode 100644 index 8700019..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventSubscribersQuery.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.ovirt.engine.core.bll; - -import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; - -public class GetAllEventSubscribersQuery<P extends VdcQueryParametersBase> - extends QueriesCommandBase<P> { - public GetAllEventSubscribersQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue( - DbFacade.getInstance().getEventDao().getAll()); - } -} 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 21d99e4..9fc6471 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 @@ -197,7 +197,6 @@ GetPermittedStorageDomainsByStoragePoolId(VdcQueryAuthType.User), // Event Notification - GetAllEventSubscribers, GetEventSubscribersBySubscriberId, GetEventSubscribersBySubscriberIdGrouped, diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java index 9b9648a..761d32f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java @@ -14,13 +14,6 @@ */ public interface EventDAO extends DAO { /** - * Returns all event subscribers. - * - * @return the list of all event subscribers - */ - List<event_subscriber> getAll(); - - /** * Retrieves all event subscriptions for the given subscriber id. * * @param id diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java index 85814ed..4dacfb1 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java @@ -61,15 +61,6 @@ @SuppressWarnings("unchecked") @Override - public List<event_subscriber> getAll() { - MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource(); - return getCallsHandler().executeReadList("GetAllFromevent_subscriber", - EventSubscriberRowMapper.instance, - parameterSource); - } - - @SuppressWarnings("unchecked") - @Override public List<event_subscriber> getAllForSubscriber(Guid id) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("subscriber_id", id); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java index f1e3177..2014ec1 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java @@ -47,17 +47,6 @@ } /** - * Ensures that retrieving all subscribers works as expected. - */ - @Test - public void testGetAll() { - List<event_subscriber> result = dao.getAll(); - - assertNotNull(result); - assertFalse(result.isEmpty()); - } - - /** * Ensures an empty collection is returned when the user has no subscriptions. */ @Test -- To view, visit http://gerrit.ovirt.org/13604 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic49e45cfdec1b08d2688d1e33f62a32176510547 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
