Itamar Heim has submitted this change and it was merged. Change subject: tools: notifier: Refactor model and DB mapping of eventNotificationMethods. ...................................................................... tools: notifier: Refactor model and DB mapping of eventNotificationMethods. Main change in this patch set is storing eventNotificationMethods as enum in java objects and as an sql string in the event_subscribers table(and not int). The mapping is easier and the db is human readable. Another side effect of this change is there is no more need for some mapping classes deleted in this patch. They are all replaced by the simpler NotificationMethodsMapper. The table event_notification_methods was dropped since it duplicates the enum eventNotificationMethods and replaced by new an sql CHECK constraint. Change-Id: I8b71c4e78bbdca3d02d2ac4ef419b9d3d7d58761 Signed-off-by: Mooli Tayer <mtayer(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveEventSubscriptionCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/EventNotificationMethods.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventAuditLogSubscriber.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventNotificationMethod.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber_id.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 M backend/manager/modules/dal/src/test/resources/fixtures.xml M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java D backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/methods/EventMethodFiller.java D backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/methods/NotificationMethodFactory.java D backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/methods/NotificationMethodFactoryEmailImpl.java D backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/methods/NotificationMethodMapBuilder.java A backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/NotificationMethodsMapper.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserEventNotifierListModel.java M packaging/dbscripts/create_views.sql M packaging/dbscripts/event_sp.sql M packaging/dbscripts/insert_data.sql A packaging/dbscripts/upgrade/03_04_0600_event_notification_methods.sql 23 files changed, 113 insertions(+), 559 deletions(-) Approvals: Eli Mesika: Looks good to me, approved mooli tayer: Verified -- To view, visit http://gerrit.ovirt.org/24692 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b71c4e78bbdca3d02d2ac4ef419b9d3d7d58761 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com&gt; Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com&gt; Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server