Add/remove event log trigger by a container event rather than using a…

… startup bean

CHANGELOG.md

@@ -4,6 +4,8 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+- Event log trigger is now added/removed by a container event rather than using a startup bean
 
 ## [2.4.2] - 2019-11-25
 ### Added

event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/trigger/TriggerLifecycleManager.java

@@ -0,0 +1,41 @@
+package uk.gov.justice.services.eventstore.management.trigger;
+
+import uk.gov.justice.services.eventsourcing.util.sql.triggers.EventLogTriggerManipulator;
+import uk.gov.justice.services.framework.utilities.cdi.CdiInstanceResolver;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeShutdown;
+import javax.enterprise.inject.spi.Extension;
+
+public class TriggerLifecycleManager implements Extension {
+
+    private final CdiInstanceResolver cdiInstanceResolver;
+
+    public TriggerLifecycleManager() {
+        this(new CdiInstanceResolver());
+    }
+
+    public TriggerLifecycleManager(final CdiInstanceResolver cdiInstanceResolver) {
+        this.cdiInstanceResolver = cdiInstanceResolver;
+    }
+
+    public void afterDeploymentValidation(@SuppressWarnings("unused") @Observes final AfterDeploymentValidation event, final BeanManager beanManager) {
+
+        final EventLogTriggerManipulator eventLogTriggerManipulator = cdiInstanceResolver.getInstanceOf(
+                EventLogTriggerManipulator.class,
+                beanManager);
+
+        eventLogTriggerManipulator.addTriggerToEventLogTable();
+    }
+
+    public void beforeShutdown(@SuppressWarnings("unused") @Observes final BeforeShutdown event, final BeanManager beanManager) {
+
+        final EventLogTriggerManipulator eventLogTriggerManipulator = cdiInstanceResolver.getInstanceOf(
+                EventLogTriggerManipulator.class,
+                beanManager);
+
+        eventLogTriggerManipulator.removeTriggerFromEventLogTable();
+    }
+}

event-store-management/event-store-management-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension

@@ -0,0 +1,2 @@
+uk.gov.justice.services.eventstore.management.trigger.TriggerLifecycleManager
+

event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/trigger/TriggerLifecycleManagerTest.java

@@ -0,0 +1,56 @@
+package uk.gov.justice.services.eventstore.management.trigger;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import uk.gov.justice.services.eventsourcing.util.sql.triggers.EventLogTriggerManipulator;
+import uk.gov.justice.services.framework.utilities.cdi.CdiInstanceResolver;
+
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeShutdown;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TriggerLifecycleManagerTest {
+
+    @Mock
+    private CdiInstanceResolver cdiInstanceResolver;
+
+    @InjectMocks
+    private TriggerLifecycleManager triggerLifecycleManager;
+
+    @Test
+    public void shouldAddTheTriggerOnApplicationDeployment() throws Exception {
+
+        final BeanManager beanManager = mock(BeanManager.class);
+        final AfterDeploymentValidation event = mock(AfterDeploymentValidation.class);
+        final EventLogTriggerManipulator eventLogTriggerManipulator = mock(EventLogTriggerManipulator.class);
+
+        when(cdiInstanceResolver.getInstanceOf(EventLogTriggerManipulator.class, beanManager)).thenReturn(eventLogTriggerManipulator);
+
+        triggerLifecycleManager.afterDeploymentValidation(event, beanManager);
+
+        verify(eventLogTriggerManipulator).addTriggerToEventLogTable();
+    }
+
+    @Test
+    public void shouldRemoveTheTriggerOnApplicationShutdown() throws Exception {
+
+        final BeanManager beanManager = mock(BeanManager.class);
+        final BeforeShutdown event = mock(BeforeShutdown.class);
+        final EventLogTriggerManipulator eventLogTriggerManipulator = mock(EventLogTriggerManipulator.class);
+
+        when(cdiInstanceResolver.getInstanceOf(EventLogTriggerManipulator.class, beanManager)).thenReturn(eventLogTriggerManipulator);
+
+        triggerLifecycleManager.beforeShutdown(event, beanManager);
+
+        verify(eventLogTriggerManipulator).removeTriggerFromEventLogTable();
+    }
+}