Merge pull request #214 from CJSCommonPlatform/extract-command-handle…

…r-suspenders Exctract the process suspenders for command handler into their own jar
CJSCommonPlatform · Jan 24, 2020 · d664759 · d664759
2 parents a0a8556 + db127ba
commit d664759
Show file tree

Hide file tree

Showing 47 changed files with 77 additions and 307 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+## [2.4.7] - 2020-01-24
+### Changed
+- Event store now works with multiple event sources
+- Event store now compatible with contexts that do not have a command pillar
+- Extracted all command pillar SystemCommands into their own module
 
 ## [2.4.6] - 2020-01-21
 ### Added

diff --git a/event-store-management/event-store-management-command-handler-extension/pom.xml b/event-store-management/event-store-management-command-handler-extension/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>event-store-management</artifactId>
+        <groupId>uk.gov.justice.event-store</groupId>
+        <version>2.4.7-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>event-store-management-command-handler-extension</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>framework-management</artifactId>
+            <version>${framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>event-store-management-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>event-store-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>event-publisher-timer</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...anagement/commands/AddTriggerCommand.java → ...anagement/commands/AddTriggerCommand.java b/...anagement/commands/AddTriggerCommand.java → ...anagement/commands/AddTriggerCommand.java
diff --git a/...nt/commands/DisablePublishingCommand.java → ...nt/commands/DisablePublishingCommand.java b/...nt/commands/DisablePublishingCommand.java → ...nt/commands/DisablePublishingCommand.java
diff --git a/...ent/commands/EnablePublishingCommand.java → ...ent/commands/EnablePublishingCommand.java b/...ent/commands/EnablePublishingCommand.java → ...ent/commands/EnablePublishingCommand.java
diff --git a/...gement/commands/RemoveTriggerCommand.java → ...gement/commands/RemoveTriggerCommand.java b/...gement/commands/RemoveTriggerCommand.java → ...gement/commands/RemoveTriggerCommand.java
diff --git a/...mands/ValidatePublishedEventsCommand.java → ...mands/ValidatePublishedEventsCommand.java b/...mands/ValidatePublishedEventsCommand.java → ...mands/ValidatePublishedEventsCommand.java
diff --git a/...observers/CommandHandlerQueueDrainer.java → ...uspension/CommandHandlerQueueDrainer.java b/...observers/CommandHandlerQueueDrainer.java → ...uspension/CommandHandlerQueueDrainer.java
@@ -1,11 +1,10 @@
-package uk.gov.justice.services.eventstore.management.shuttering.observers;
+package uk.gov.justice.services.eventstore.management.extension.suspension;
 
 import static java.lang.String.format;
 import static uk.gov.justice.services.management.suspension.api.SuspensionResult.suspensionFailed;
 import static uk.gov.justice.services.management.suspension.api.SuspensionResult.suspensionSucceeded;
 
 import uk.gov.justice.services.eventsourcing.util.jee.timer.StopWatchFactory;
-import uk.gov.justice.services.eventstore.management.shuttering.process.CommandHandlerQueueInterrogator;
 import uk.gov.justice.services.management.suspension.api.Suspendable;
 import uk.gov.justice.services.management.suspension.api.SuspensionResult;
 import uk.gov.justice.services.management.suspension.commands.SuspensionCommand;

diff --git a/...cess/CommandHandlerQueueInterrogator.java → ...sion/CommandHandlerQueueInterrogator.java b/...cess/CommandHandlerQueueInterrogator.java → ...sion/CommandHandlerQueueInterrogator.java
@@ -1,4 +1,4 @@
-package uk.gov.justice.services.eventstore.management.shuttering.process;
+package uk.gov.justice.services.eventstore.management.extension.suspension;
 
 import uk.gov.justice.services.common.polling.MultiIteratingPoller;
 import uk.gov.justice.services.common.polling.MultiIteratingPollerFactory;

diff --git a/...s/CommandHandlerQueueSupplierFactory.java → ...n/CommandHandlerQueueSupplierFactory.java b/...s/CommandHandlerQueueSupplierFactory.java → ...n/CommandHandlerQueueSupplierFactory.java
@@ -1,4 +1,4 @@
-package uk.gov.justice.services.eventstore.management.shuttering.process;
+package uk.gov.justice.services.eventstore.management.extension.suspension;
 
 import uk.gov.justice.services.messaging.jms.JmsCommandHandlerDestinationNameProvider;
 import uk.gov.justice.services.messaging.jms.JmsQueueBrowser;

diff --git a/...shing/EnablePublishingCommandHandler.java → ...shing/EnablePublishingCommandHandler.java b/...shing/EnablePublishingCommandHandler.java → ...shing/EnablePublishingCommandHandler.java
diff --git a/...publishing/EnablePublishingProcessor.java → ...publishing/EnablePublishingProcessor.java b/...publishing/EnablePublishingProcessor.java → ...publishing/EnablePublishingProcessor.java
diff --git a/...agement/publishing/PublishingEnabler.java → ...agement/publishing/PublishingEnabler.java b/...agement/publishing/PublishingEnabler.java → ...agement/publishing/PublishingEnabler.java
diff --git a/...trigger/TriggerManagementStartupBean.java → ...trigger/TriggerManagementStartupBean.java b/...trigger/TriggerManagementStartupBean.java → ...trigger/TriggerManagementStartupBean.java
diff --git a/...mands/AddRemoveTriggerCommandHandler.java → ...mands/AddRemoveTriggerCommandHandler.java b/...mands/AddRemoveTriggerCommandHandler.java → ...mands/AddRemoveTriggerCommandHandler.java
diff --git a/...ValidatePublishedEventCommandHandler.java → ...ValidatePublishedEventCommandHandler.java b/...ValidatePublishedEventCommandHandler.java → ...ValidatePublishedEventCommandHandler.java
diff --git a/...ation/process/EventValidationProcess.java → ...ation/process/EventValidationProcess.java b/...ation/process/EventValidationProcess.java → ...ation/process/EventValidationProcess.java
diff --git a/...nt/validation/process/EventValidator.java → ...nt/validation/process/EventValidator.java b/...nt/validation/process/EventValidator.java → ...nt/validation/process/EventValidator.java
diff --git a/...lidation/process/JsonStringConverter.java → ...lidation/process/JsonStringConverter.java b/...lidation/process/JsonStringConverter.java → ...lidation/process/JsonStringConverter.java
diff --git a/...ation/process/MissingSchemaException.java → ...ation/process/MissingSchemaException.java b/...ation/process/MissingSchemaException.java → ...ation/process/MissingSchemaException.java
diff --git a/...ion/process/MissingSchemaIdException.java → ...ion/process/MissingSchemaIdException.java b/...ion/process/MissingSchemaIdException.java → ...ion/process/MissingSchemaIdException.java
diff --git a/...nt/validation/process/SchemaIdFinder.java → ...nt/validation/process/SchemaIdFinder.java b/...nt/validation/process/SchemaIdFinder.java → ...nt/validation/process/SchemaIdFinder.java
diff --git a/...tion/process/SchemaIdMappingProvider.java → ...tion/process/SchemaIdMappingProvider.java b/...tion/process/SchemaIdMappingProvider.java → ...tion/process/SchemaIdMappingProvider.java
diff --git a/...nt/validation/process/SchemaProvider.java → ...nt/validation/process/SchemaProvider.java b/...nt/validation/process/SchemaProvider.java → ...nt/validation/process/SchemaProvider.java
diff --git a/...idation/process/SingleEventValidator.java → ...idation/process/SingleEventValidator.java b/...idation/process/SingleEventValidator.java → ...idation/process/SingleEventValidator.java
diff --git a/...t/validation/process/ValidationError.java → ...t/validation/process/ValidationError.java b/...t/validation/process/ValidationError.java → ...t/validation/process/ValidationError.java
diff --git a/...nt/event-store-management-command-handler-extension/src/main/resources/META-INF/beans.xml b/...nt/event-store-management-command-handler-extension/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,8 @@
+<!-- Marker file indicating CDI should be enabled -->
+
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xsi:schemaLocation="
+      http://xmlns.jcp.org/xml/ns/javaee
+      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
+</beans>
diff --git a/...rvers/CommandHandlerQueueDrainerTest.java → ...nsion/CommandHandlerQueueDrainerTest.java b/...rvers/CommandHandlerQueueDrainerTest.java → ...nsion/CommandHandlerQueueDrainerTest.java
@@ -1,6 +1,7 @@
-package uk.gov.justice.services.eventstore.management.shuttering.observers;
+package uk.gov.justice.services.eventstore.management.extension.suspension;
 
 import static java.util.Optional.empty;
+import static java.util.UUID.randomUUID;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.inOrder;
@@ -10,7 +11,6 @@
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_FAILED;
 
 import uk.gov.justice.services.eventsourcing.util.jee.timer.StopWatchFactory;
-import uk.gov.justice.services.eventstore.management.shuttering.process.CommandHandlerQueueInterrogator;
 import uk.gov.justice.services.management.suspension.api.SuspensionResult;
 import uk.gov.justice.services.management.suspension.commands.SuspensionCommand;
 
@@ -50,7 +50,7 @@ public void shouldSuspendButNotUnsuspend() throws Exception {
     @Test
     public void shouldWaitForCommandHandlerQueueToDrainAndReturnSuccess() throws Exception {
 
-        final UUID commandId = UUID.randomUUID();
+        final UUID commandId = randomUUID();
         final StopWatch stopWatch = mock(StopWatch.class);
         final SuspensionCommand suspensionCommand = mock(SuspensionCommand.class);
 
@@ -79,7 +79,7 @@ public void shouldWaitForCommandHandlerQueueToDrainAndReturnSuccess() throws Exc
     @Test
     public void shouldReturnFailureIfQueueDoesNotDrainInTime() throws Exception {
 
-        final UUID commandId = UUID.randomUUID();
+        final UUID commandId = randomUUID();
         final StopWatch stopWatch = mock(StopWatch.class);
         final SuspensionCommand applicationShutteringCommand = mock(SuspensionCommand.class);
 

diff --git a/.../CommandHandlerQueueInterrogatorTest.java → .../CommandHandlerQueueInterrogatorTest.java b/.../CommandHandlerQueueInterrogatorTest.java → .../CommandHandlerQueueInterrogatorTest.java
@@ -1,4 +1,4 @@
-package uk.gov.justice.services.eventstore.management.shuttering.process;
+package uk.gov.justice.services.eventstore.management.extension.suspension;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;

diff --git a/...mmandHandlerQueueSupplierFactoryTest.java → ...mmandHandlerQueueSupplierFactoryTest.java b/...mmandHandlerQueueSupplierFactoryTest.java → ...mmandHandlerQueueSupplierFactoryTest.java
@@ -1,4 +1,4 @@
-package uk.gov.justice.services.eventstore.management.shuttering.process;
+package uk.gov.justice.services.eventstore.management.extension.suspension;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;

diff --git a/...g/EnablePublishingCommandHandlerTest.java → ...g/EnablePublishingCommandHandlerTest.java b/...g/EnablePublishingCommandHandlerTest.java → ...g/EnablePublishingCommandHandlerTest.java
diff --git a/...ishing/EnablePublishingProcessorTest.java → ...ishing/EnablePublishingProcessorTest.java b/...ishing/EnablePublishingProcessorTest.java → ...ishing/EnablePublishingProcessorTest.java
diff --git a/...ent/publishing/PublishingEnablerTest.java → ...ent/publishing/PublishingEnablerTest.java b/...ent/publishing/PublishingEnablerTest.java → ...ent/publishing/PublishingEnablerTest.java
diff --git a/...ger/TriggerManagementStartupBeanTest.java → ...ger/TriggerManagementStartupBeanTest.java b/...ger/TriggerManagementStartupBeanTest.java → ...ger/TriggerManagementStartupBeanTest.java
diff --git a/...s/AddRemoveTriggerCommandHandlerTest.java → ...s/AddRemoveTriggerCommandHandlerTest.java b/...s/AddRemoveTriggerCommandHandlerTest.java → ...s/AddRemoveTriggerCommandHandlerTest.java
diff --git a/...datePublishedEventCommandHandlerTest.java → ...datePublishedEventCommandHandlerTest.java b/...datePublishedEventCommandHandlerTest.java → ...datePublishedEventCommandHandlerTest.java
diff --git a/...n/process/EventValidationProcessTest.java → ...n/process/EventValidationProcessTest.java b/...n/process/EventValidationProcessTest.java → ...n/process/EventValidationProcessTest.java
diff --git a/...alidation/process/EventValidatorTest.java → ...alidation/process/EventValidatorTest.java b/...alidation/process/EventValidatorTest.java → ...alidation/process/EventValidatorTest.java
diff --git a/...tion/process/JsonStringConverterTest.java → ...tion/process/JsonStringConverterTest.java b/...tion/process/JsonStringConverterTest.java → ...tion/process/JsonStringConverterTest.java
diff --git a/...alidation/process/SchemaIdFinderTest.java → ...alidation/process/SchemaIdFinderTest.java b/...alidation/process/SchemaIdFinderTest.java → ...alidation/process/SchemaIdFinderTest.java
diff --git a/.../process/SchemaIdMappingProviderTest.java → .../process/SchemaIdMappingProviderTest.java b/.../process/SchemaIdMappingProviderTest.java → .../process/SchemaIdMappingProviderTest.java
diff --git a/...alidation/process/SchemaProviderTest.java → ...alidation/process/SchemaProviderTest.java b/...alidation/process/SchemaProviderTest.java → ...alidation/process/SchemaProviderTest.java
diff --git a/...ion/process/SingleEventValidatorTest.java → ...ion/process/SingleEventValidatorTest.java b/...ion/process/SingleEventValidatorTest.java → ...ion/process/SingleEventValidatorTest.java
diff --git a/event-store-management/event-store-management-core/pom.xml b/event-store-management/event-store-management-core/pom.xml
@@ -54,11 +54,6 @@
             <artifactId>event-store-management-events</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>event-publisher-timer</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-tracking-service</artifactId>

diff --git a/event-store-management/pom.xml b/event-store-management/pom.xml
@@ -16,6 +16,7 @@
         <module>event-store-management-core</module>
         <module>event-store-management-events</module>
         <module>event-store-management-commands</module>
+        <module>event-store-management-command-handler-extension</module>
     </modules>
 
 </project>
diff --git a/...t/src/main/java/uk/gov/justice/services/test/utils/jmx/EventStoreSystemCommandCaller.java b/...t/src/main/java/uk/gov/justice/services/test/utils/jmx/EventStoreSystemCommandCaller.java