Merge c18163f into 9635829

CJSCommonPlatform · Nov 8, 2019 · 116a79c · 116a79c
2 parents 9635829 + c18163f
commit 116a79c
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 58 deletions.
diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml
@@ -185,6 +185,12 @@
             <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>event-store-management-commands</artifactId>
+            <version>${event-store.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java b/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java
@@ -8,6 +8,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
+import static uk.gov.justice.services.eventstore.management.commands.EventCatchupCommand.CATCHUP;
 import static uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder.jmxParameters;
 import static uk.gov.justice.services.test.utils.common.host.TestHostProvider.getHost;
 
@@ -18,7 +19,6 @@
 import uk.gov.justice.services.example.cakeshop.it.helpers.PositionInStreamIterator;
 import uk.gov.justice.services.example.cakeshop.it.helpers.ProcessedEventCounter;
 import uk.gov.justice.services.example.cakeshop.it.helpers.RestEasyClientFactory;
-import uk.gov.justice.services.jmx.api.command.EventCatchupCommand;
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient;
 import uk.gov.justice.services.jmx.system.command.client.TestSystemCommanderClientFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
@@ -96,28 +96,20 @@ public void shouldReplayAndFindRecipesInViewStore() throws Exception {
 
         System.out.println("Inserted " + totalEvents + " events into event_log");
         System.out.println("Waiting for events to publish...");
-        cleanViewstoreTables();
 
-        longPoller.pollUntilFound(() -> {
+        final Optional<Integer> processedEventCount = longPoller.pollUntilFound(() -> {
             final int eventCount = processedEventCounter.countProcessedEvents();
-            if (eventCount == 0) {
+            if (eventCount == totalEvents) {
                 return of(eventCount);
             }
 
             return empty();
         });
 
-        try (final Connection connection = eventStoreDataSource.getConnection();
-             final PreparedStatement preparedStatement = connection.prepareStatement("SELECT COUNT (*) FROM publish_queue");
-             final ResultSet resultSet = preparedStatement.executeQuery()) {
+        assertThat(processedEventCount, is(of(totalEvents)));
 
-            int eventCount = -1;
-            if (resultSet.next()) {
-                eventCount = resultSet.getInt(1);
-            }
 
-            assertThat(eventCount, is(0));
-        }
+        cleanViewstoreTables();
 
         System.out.println("Running catchup...");
         runCatchup();
@@ -180,7 +172,7 @@ private void runCatchup() throws Exception {
 
         try (final SystemCommanderClient systemCommanderClient = systemCommanderClientFactory.create(jmxParameters)) {
 
-            systemCommanderClient.getRemote(CONTEXT_NAME).call(new EventCatchupCommand());
+            systemCommanderClient.getRemote(CONTEXT_NAME).call(CATCHUP);
         }
     }
 

diff --git a/.../example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventHealingIT.java b/.../example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventHealingIT.java
@@ -10,6 +10,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
+import static uk.gov.justice.services.eventstore.management.commands.EventCatchupCommand.CATCHUP;
 import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopMediaTypes.ADD_RECIPE_MEDIA_TYPE;
 import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopUris.RECIPES_RESOURCE_URI;
 import static uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder.jmxParameters;
@@ -24,7 +25,6 @@
 import uk.gov.justice.services.example.cakeshop.it.helpers.DatabaseManager;
 import uk.gov.justice.services.example.cakeshop.it.helpers.ProcessedEventCounter;
 import uk.gov.justice.services.example.cakeshop.it.helpers.RestEasyClientFactory;
-import uk.gov.justice.services.jmx.api.command.EventCatchupCommand;
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient;
 import uk.gov.justice.services.jmx.system.command.client.TestSystemCommanderClientFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
@@ -176,7 +176,7 @@ private void runCatchup() throws Exception {
 
         try (final SystemCommanderClient systemCommanderClient = systemCommanderClientFactory.create(jmxParameters)) {
 
-            systemCommanderClient.getRemote(CONTEXT_NAME).call(new EventCatchupCommand());
+            systemCommanderClient.getRemote(CONTEXT_NAME).call(CATCHUP);
         }
     }
 

diff --git a/...ample-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java b/...ample-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java
@@ -14,13 +14,13 @@
 import static uk.gov.justice.services.test.utils.common.host.TestHostProvider.getHost;
 
 import uk.gov.justice.services.eventsourcing.repository.jdbc.event.Event;
+import uk.gov.justice.services.eventstore.management.commands.ValidatePublishedEventsCommand;
 import uk.gov.justice.services.example.cakeshop.it.helpers.BatchEventInserter;
 import uk.gov.justice.services.example.cakeshop.it.helpers.CakeshopEventGenerator;
 import uk.gov.justice.services.example.cakeshop.it.helpers.DatabaseManager;
 import uk.gov.justice.services.example.cakeshop.it.helpers.PositionInStreamIterator;
 import uk.gov.justice.services.example.cakeshop.it.helpers.PublishedEventCounter;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
-import uk.gov.justice.services.jmx.api.command.ValidatePublishedEventsCommand;
 import uk.gov.justice.services.jmx.api.domain.CommandState;
 import uk.gov.justice.services.jmx.api.domain.SystemCommandStatus;
 import uk.gov.justice.services.jmx.api.mbean.SystemCommanderMBean;
@@ -151,7 +151,7 @@ private Optional<SystemCommandStatus> runCommand(final JmxParameters jmxParamete
 
             final SystemCommanderMBean systemCommanderMBean = systemCommanderClient.getRemote(CONTEXT_NAME);
             final UUID commandId = systemCommanderMBean
-                    .call(systemCommand);
+                    .call(systemCommand.getName());
 
             return poller.pollUntilFound(() -> commandNoLongerInProgress(systemCommanderMBean, commandId));
         }

diff --git a/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java b/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java
@@ -2,30 +2,45 @@
 
 import static java.lang.Integer.parseInt;
 import static java.lang.System.getProperty;
+import static java.util.stream.Collectors.toMap;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
+import static uk.gov.justice.services.eventstore.management.commands.AddTriggerCommand.ADD_TRIGGER;
+import static uk.gov.justice.services.eventstore.management.commands.DisablePublishingCommand.DISABLE_PUBLISHING;
+import static uk.gov.justice.services.eventstore.management.commands.EnablePublishingCommand.ENABLE_PUBLISHING;
+import static uk.gov.justice.services.eventstore.management.commands.EventCatchupCommand.CATCHUP;
+import static uk.gov.justice.services.eventstore.management.commands.IndexerCatchupCommand.INDEXER_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.commands.RebuildCommand.REBUILD;
+import static uk.gov.justice.services.eventstore.management.commands.RemoveTriggerCommand.REMOVE_TRIGGER;
+import static uk.gov.justice.services.eventstore.management.commands.ValidatePublishedEventsCommand.VALIDATE_EVENTS;
+import static uk.gov.justice.services.eventstore.management.commands.VerifyCatchupCommand.VERIFY_CATCHUP;
 import static uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder.jmxParameters;
+import static uk.gov.justice.services.management.ping.commands.PingCommand.PING;
+import static uk.gov.justice.services.management.shuttering.commands.ShutterCommand.SHUTTER;
+import static uk.gov.justice.services.management.shuttering.commands.UnshutterCommand.UNSHUTTER;
 import static uk.gov.justice.services.test.utils.common.host.TestHostProvider.getHost;
 
-import uk.gov.justice.services.jmx.api.command.AddTriggerCommand;
-import uk.gov.justice.services.jmx.api.command.DisablePublishingCommand;
-import uk.gov.justice.services.jmx.api.command.EnablePublishingCommand;
-import uk.gov.justice.services.jmx.api.command.EventCatchupCommand;
-import uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand;
-import uk.gov.justice.services.jmx.api.command.PingCommand;
-import uk.gov.justice.services.jmx.api.command.RebuildCommand;
-import uk.gov.justice.services.jmx.api.command.RemoveTriggerCommand;
-import uk.gov.justice.services.jmx.api.command.ShutterCommand;
-import uk.gov.justice.services.jmx.api.command.SystemCommand;
-import uk.gov.justice.services.jmx.api.command.UnshutterCommand;
-import uk.gov.justice.services.jmx.api.command.ValidatePublishedEventsCommand;
-import uk.gov.justice.services.jmx.api.command.VerifyCatchupCommand;
+import uk.gov.justice.services.eventstore.management.commands.AddTriggerCommand;
+import uk.gov.justice.services.eventstore.management.commands.DisablePublishingCommand;
+import uk.gov.justice.services.eventstore.management.commands.EnablePublishingCommand;
+import uk.gov.justice.services.eventstore.management.commands.EventCatchupCommand;
+import uk.gov.justice.services.eventstore.management.commands.IndexerCatchupCommand;
+import uk.gov.justice.services.eventstore.management.commands.RebuildCommand;
+import uk.gov.justice.services.eventstore.management.commands.RemoveTriggerCommand;
+import uk.gov.justice.services.eventstore.management.commands.ValidatePublishedEventsCommand;
+import uk.gov.justice.services.eventstore.management.commands.VerifyCatchupCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommandDetails;
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient;
 import uk.gov.justice.services.jmx.system.command.client.TestSystemCommanderClientFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
+import uk.gov.justice.services.management.ping.commands.PingCommand;
+import uk.gov.justice.services.management.shuttering.commands.ShutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.UnshutterCommand;
 
 import java.util.List;
+import java.util.Map;
 
 import org.junit.Test;
 
@@ -47,21 +62,28 @@ public void shouldListAllSystemCommands() throws Exception {
 
         try (final SystemCommanderClient systemCommanderClient = testSystemCommanderClientFactory.create(jmxParameters)) {
 
-            final List<SystemCommand> systemCommands = systemCommanderClient.getRemote(CONTEXT_NAME).listCommands();
+            final List<SystemCommandDetails> systemCommandDetailsList = systemCommanderClient
+                    .getRemote(CONTEXT_NAME)
+                    .listCommands();
 
-            assertThat(systemCommands.size(), is(12));
-            assertThat(systemCommands, hasItem(new AddTriggerCommand()));
-            assertThat(systemCommands, hasItem(new DisablePublishingCommand()));
-            assertThat(systemCommands, hasItem(new EnablePublishingCommand()));
-            assertThat(systemCommands, hasItem(new EventCatchupCommand()));
-            assertThat(systemCommands, hasItem(new IndexerCatchupCommand()));
-            assertThat(systemCommands, hasItem(new PingCommand()));
-            assertThat(systemCommands, hasItem(new RebuildCommand()));
-            assertThat(systemCommands, hasItem(new RemoveTriggerCommand()));
-            assertThat(systemCommands, hasItem(new ShutterCommand()));
-            assertThat(systemCommands, hasItem(new UnshutterCommand()));
-            assertThat(systemCommands, hasItem(new ValidatePublishedEventsCommand()));
-            assertThat(systemCommands, hasItem(new VerifyCatchupCommand()));
+            assertThat(systemCommandDetailsList.size(), is(12));
+
+            final Map<String, SystemCommandDetails> systemCommandDetailsMap = systemCommandDetailsList
+                    .stream()
+                    .collect(toMap(SystemCommandDetails::getName, systemCommandDetails -> systemCommandDetails));
+
+            assertThat(systemCommandDetailsMap.get(ADD_TRIGGER), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(DISABLE_PUBLISHING), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(ENABLE_PUBLISHING), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(CATCHUP), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(INDEXER_CATCHUP), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(PING), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(REBUILD), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(REMOVE_TRIGGER), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(SHUTTER), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(UNSHUTTER), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(VALIDATE_EVENTS), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(VERIFY_CATCHUP), is(notNullValue()));
         }
     }
 }
diff --git a/...rvice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java b/...rvice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java
@@ -10,6 +10,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
+import static uk.gov.justice.services.eventstore.management.commands.RebuildCommand.REBUILD;
 import static uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder.jmxParameters;
 import static uk.gov.justice.services.test.utils.common.host.TestHostProvider.getHost;
 
@@ -19,7 +20,6 @@
 import uk.gov.justice.services.example.cakeshop.it.helpers.DatabaseManager;
 import uk.gov.justice.services.example.cakeshop.it.helpers.EventFactory;
 import uk.gov.justice.services.example.cakeshop.it.helpers.RestEasyClientFactory;
-import uk.gov.justice.services.jmx.api.command.RebuildCommand;
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient;
 import uk.gov.justice.services.jmx.system.command.client.TestSystemCommanderClientFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
@@ -114,7 +114,7 @@ private void invokeRebuild() throws Exception {
                 .build();
 
         try(final SystemCommanderClient systemCommanderClient = testSystemCommanderClientFactory.create(jmxParameters)) {
-            systemCommanderClient.getRemote(CONTEXT_NAME).call(new RebuildCommand());
+            systemCommanderClient.getRemote(CONTEXT_NAME).call(REBUILD);
         }
     }
 

diff --git a/...ce/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ShutteringIT.java b/...ce/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ShutteringIT.java
@@ -16,6 +16,8 @@
 import static org.slf4j.LoggerFactory.getLogger;
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_COMPLETE;
 import static uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder.jmxParameters;
+import static uk.gov.justice.services.management.shuttering.commands.ShutterCommand.SHUTTER;
+import static uk.gov.justice.services.management.shuttering.commands.UnshutterCommand.UNSHUTTER;
 import static uk.gov.justice.services.test.utils.common.host.TestHostProvider.getHost;
 import static uk.gov.justice.services.test.utils.core.matchers.HttpStatusCodeMatcher.isStatus;
 
@@ -24,8 +26,6 @@
 import uk.gov.justice.services.example.cakeshop.it.helpers.EventFactory;
 import uk.gov.justice.services.example.cakeshop.it.helpers.Querier;
 import uk.gov.justice.services.example.cakeshop.it.helpers.RestEasyClientFactory;
-import uk.gov.justice.services.jmx.api.command.ShutterCommand;
-import uk.gov.justice.services.jmx.api.command.UnshutterCommand;
 import uk.gov.justice.services.jmx.api.domain.SystemCommandStatus;
 import uk.gov.justice.services.jmx.api.mbean.SystemCommanderMBean;
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient;
@@ -90,7 +90,7 @@ public void cleanup() throws Exception {
 
             final SystemCommanderMBean systemCommanderMBean = systemCommanderClient.getRemote(CONTEXT_NAME);
 
-            final UUID commandId = systemCommanderMBean.call(new UnshutterCommand());
+            final UUID commandId = systemCommanderMBean.call(UNSHUTTER);
 
             final Optional<SystemCommandStatus> unshutterStatus = poller.pollUntilFound(() -> {
                 final SystemCommandStatus commandStatus = systemCommanderMBean.getCommandStatus(commandId);
@@ -117,7 +117,7 @@ public void shouldNotReturnRecipesAfterShuttering() throws Exception {
                 .build();
         try (final SystemCommanderClient systemCommanderClient = testSystemCommanderClientFactory.create(jmxParameters)) {
             final SystemCommanderMBean systemCommanderMBean = systemCommanderClient.getRemote(CONTEXT_NAME);
-            final UUID commandId = systemCommanderMBean.call(new ShutterCommand());
+            final UUID commandId = systemCommanderMBean.call(SHUTTER);
 
             final Optional<SystemCommandStatus> shutterStatus = poller.pollUntilFound(() -> {
                 final SystemCommandStatus commandStatus = systemCommanderMBean.getCommandStatus(commandId);
@@ -156,7 +156,7 @@ public void shouldQueryForRecipesAfterUnShuttering() throws Exception {
             final SystemCommanderMBean systemCommanderMBean = systemCommanderClient.getRemote(CONTEXT_NAME);
 
             //invoke shuttering
-            final UUID shutterCommandId = systemCommanderMBean.call(new ShutterCommand());
+            final UUID shutterCommandId = systemCommanderMBean.call(SHUTTER);
 
             final Optional<SystemCommandStatus> shutterStatus = poller.pollUntilFound(() -> {
                 final SystemCommandStatus commandStatus = systemCommanderMBean.getCommandStatus(shutterCommandId);
@@ -182,7 +182,7 @@ public void shouldQueryForRecipesAfterUnShuttering() throws Exception {
             verifyRecipeAdded(recipeId, recipeId2, null, null, false, NOT_FOUND);
 
             //invoke unshuttering
-            final UUID unshutterCommandId = systemCommanderMBean.call(new UnshutterCommand());
+            final UUID unshutterCommandId = systemCommanderMBean.call(UNSHUTTER);
 
             final Optional<SystemCommandStatus> unshutterStatus = poller.pollUntilFound(() -> {
                 final SystemCommandStatus commandStatus = systemCommanderMBean.getCommandStatus(unshutterCommandId);

diff --git a/...-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/UnifiedSearchIndexerIT.java b/...-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/UnifiedSearchIndexerIT.java
@@ -68,8 +68,6 @@ public void shouldIndexData() {
 
         final ApiResponse queryResponse = querier.queryForIndex(recipeId.toString());
 
-        System.out.println(queryResponse.body());
-
         with(queryResponse.body())
                 .assertThat("$.indexId", equalTo(recipeId.toString()))
                 .assertThat("$.deliveryDate", equalTo("2016-01-21T16:42:03.522Z"));

diff --git a/example-context/example-service/example-single/pom.xml b/example-context/example-service/example-single/pom.xml
@@ -80,6 +80,11 @@
             <artifactId>jmx-api</artifactId>
             <version>${framework.version}</version>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>event-store-management-commands</artifactId>
+            <version>${event-store.version}</version>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -32,9 +32,9 @@
         <cpp.repo.name>cake-shop</cpp.repo.name>
 
         <framework-api.version>4.1.0</framework-api.version>
-        <framework.version>6.2.5</framework.version>
-        <event-store.version>2.2.7</event-store.version>
-        <framework-generators.version>2.2.3</framework-generators.version>
+        <framework.version>6.3.0</framework.version>
+        <event-store.version>2.3.0</event-store.version>
+        <framework-generators.version>2.3.0</framework-generators.version>
         <file.service.version>1.17.12</file.service.version>
 
         <common-bom.version>2.4.0</common-bom.version>