Fix removal of event log trigger happening after database connections…

… destroyed

CHANGELOG.md

@@ -4,6 +4,10 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+- Changed the removal of the event_log trigger to be called by a 
+ServletContextListener to fix call happening after database 
+connections destroyed
 
 ## [7.0.8] - 2020-08-14
 ### Changed

event-store-management/event-store-management-command-handler-extension/src/main/java/uk/gov/justice/services/eventstore/management/trigger/TriggerManagementStartupBean.java

@@ -3,7 +3,6 @@
 import uk.gov.justice.services.eventsourcing.util.sql.triggers.EventLogTriggerManipulator;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
 import javax.inject.Inject;
@@ -19,9 +18,4 @@ public class TriggerManagementStartupBean {
     public void addPublishingTriggerOnStartup() {
          eventLogTriggerManipulator.addTriggerToEventLogTable();
     }
-
-    @PreDestroy
-    public void dropPublishingTriggerOnShutdown() {
-        eventLogTriggerManipulator.removeTriggerFromEventLogTable();
-    }
 }

event-store-management/event-store-management-command-handler-extension/src/main/java/uk/gov/justice/services/eventstore/management/trigger/TriggerRemovalServletContextListener.java

@@ -0,0 +1,24 @@
+package uk.gov.justice.services.eventstore.management.trigger;
+
+import uk.gov.justice.services.eventsourcing.util.sql.triggers.EventLogTriggerManipulator;
+
+import javax.inject.Inject;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+@WebListener
+public class TriggerRemovalServletContextListener implements ServletContextListener {
+
+    @Inject
+    private EventLogTriggerManipulator eventLogTriggerManipulator;
+
+    @Override
+    public void contextInitialized(final ServletContextEvent ignored) {
+    }
+
+    @Override
+    public void contextDestroyed(final ServletContextEvent servletContextEvent) {
+        eventLogTriggerManipulator.removeTriggerFromEventLogTable();
+    }
+}

event-store-management/event-store-management-command-handler-extension/src/test/java/uk/gov/justice/services/eventstore/management/trigger/TriggerManagementStartupBeanTest.java

@@ -26,12 +26,4 @@ public void shouldAddTriggerOnStartup() throws Exception {
 
         verify(eventLogTriggerManipulator).addTriggerToEventLogTable();
     }
-
-    @Test
-    public void shouldRemoveTriggerOnShutdown() throws Exception {
-
-        triggerManagementStartupBean.dropPublishingTriggerOnShutdown();
-
-        verify(eventLogTriggerManipulator).removeTriggerFromEventLogTable();
-    }
 }

event-store-management/event-store-management-command-handler-extension/src/test/java/uk/gov/justice/services/eventstore/management/trigger/TriggerRemovalServletContextListenerTest.java

@@ -0,0 +1,33 @@
+package uk.gov.justice.services.eventstore.management.trigger;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import uk.gov.justice.services.eventsourcing.util.sql.triggers.EventLogTriggerManipulator;
+
+import javax.servlet.ServletContextEvent;
+
+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 TriggerRemovalServletContextListenerTest {
+
+    @Mock
+    private EventLogTriggerManipulator eventLogTriggerManipulator;
+
+    @InjectMocks
+    private TriggerRemovalServletContextListener triggerRemovalServletContextListener;
+
+    @Test
+    public void shouldRemoveTriggerOnShutdown() throws Exception {
+
+        final ServletContextEvent servletContextEvent = mock(ServletContextEvent.class);
+        triggerRemovalServletContextListener.contextDestroyed(servletContextEvent);
+
+        verify(eventLogTriggerManipulator).removeTriggerFromEventLogTable();
+    }
+}