From e06355e8c5ab91a13d0229d539328ebdb71efcec Mon Sep 17 00:00:00 2001
From: Dan Haywood <dan@haywood-associates.co.uk>
Date: Mon, 5 Feb 2018 21:27:58 +0000
Subject: [PATCH] #69 - allows CommandFetcher to fetch >1, to allow for fact
 that some commands may not be replicated

Also:
- placement of mixins
- fix to wall time of TickingClockService
---
 .../module/command/dom/CommandJdo_retry.java         | 12 +++++++++---
 .../module/command/replay/impl/CommandFetcher.java   | 11 +++++------
 .../command/replay/impl/CommandJdo_exclude.java      |  2 +-
 .../command/replay/impl/ConfigurationKeys.java       |  2 ++
 .../command/replay/impl/SlaveConfiguration.java      | 12 ++++++++++++
 .../command/replay/impl/TickingClockService.java     |  6 ++++--
 .../replay/impl/mixins/CommandJdo_replayNext.java    |  2 +-
 7 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/modules/spi/command/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_retry.java b/modules/spi/command/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_retry.java
index 953c3abab..2c979d948 100644
--- a/modules/spi/command/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_retry.java
+++ b/modules/spi/command/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_retry.java
@@ -44,7 +44,7 @@ public static class ActionDomainEvent extends CommandModule.ActionDomainEvent<Co
     @ActionLayout(
             contributed = Contributed.AS_ACTION
     )
-    @MemberOrder(name = "exception", sequence = "3")
+    @MemberOrder(name = "executeIn", sequence = "1")
     public CommandJdo act(final Mode mode) {
 
         switch (mode) {
@@ -87,8 +87,14 @@ public Mode default0Act() {
         return choices0Act().get(0);
     }
 
-    public boolean hideAct() {
-        return !commandJdo.isComplete();
+    public String disableAct() {
+        if (!commandJdo.isComplete()) {
+            return "Not yet completed";
+        }
+        if (commandJdo.getExecuteIn().isReplayable() && commandJdo.getReplayState() == ReplayState.OK) {
+            return "Replayed OK";
+        }
+        return null;
     }
 
 
diff --git a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/CommandFetcher.java b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/CommandFetcher.java
index 36bc6c11e..51bf387cd 100644
--- a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/CommandFetcher.java
+++ b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/CommandFetcher.java
@@ -51,7 +51,7 @@ public CommandDto fetchCommand(
 
         LOG.debug("finding command on master ...");
 
-        final CommandsDto commandsDto = fetchCommands(previousHwm, 1, slaveConfig);
+        final CommandsDto commandsDto = fetchCommands(previousHwm, slaveConfig);
 
         if (commandsDto == null) {
             return null;
@@ -69,13 +69,12 @@ public CommandDto fetchCommand(
      */
     private CommandsDto fetchCommands(
             final Command previousHwm,
-            final int batchSize,
             final SlaveConfiguration slaveConfig) throws StatusException {
         final UUID transactionId = previousHwm != null ? previousHwm.getTransactionId() : null;
 
         LOG.debug("finding commands on master ...");
 
-        final URI uri = buildUri(transactionId, batchSize, slaveConfig);
+        final URI uri = buildUri(transactionId, slaveConfig);
 
         final JaxRsResponse response = callMaster(slaveConfig, uri);
 
@@ -90,15 +89,15 @@ private CommandsDto fetchCommands(
 
 
 
-    private URI buildUri(final UUID transactionId, final int batchSize, final SlaveConfiguration slaveConfig) {
+    private URI buildUri(final UUID transactionId, final SlaveConfiguration slaveConfig) {
         final UriBuilder uriBuilder = UriBuilder.fromUri(
                 transactionId != null
                         ? String.format(
                         "%s%s?transactionId=%s&batchSize=%d",
-                        slaveConfig.masterBaseUrl, URL_SUFFIX, transactionId, batchSize)
+                        slaveConfig.masterBaseUrl, URL_SUFFIX, transactionId, slaveConfig.masterBatchSize)
                         : String.format(
                         "%s%s?batchSize=%d",
-                        slaveConfig.masterBaseUrl, URL_SUFFIX, batchSize)
+                        slaveConfig.masterBaseUrl, URL_SUFFIX, slaveConfig.masterBatchSize)
         );
         final URI uri = uriBuilder.build();
         LOG.debug("uri = {}", uri);
diff --git a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/CommandJdo_exclude.java b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/CommandJdo_exclude.java
index df1ca3a2e..5c81e1371 100644
--- a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/CommandJdo_exclude.java
+++ b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/CommandJdo_exclude.java
@@ -33,7 +33,7 @@ public static class ActionDomainEvent extends CommandModule.ActionDomainEvent<Co
     @ActionLayout(
             contributed = Contributed.AS_ACTION
     )
-    @MemberOrder(name = "exception", sequence = "2")
+    @MemberOrder(name = "executeIn", sequence = "2")
     public CommandJdo act() {
 
         commandJdo.setReplayState(ReplayState.EXCLUDED);
diff --git a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/ConfigurationKeys.java b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/ConfigurationKeys.java
index b03a34ba7..00199383b 100644
--- a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/ConfigurationKeys.java
+++ b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/ConfigurationKeys.java
@@ -17,4 +17,6 @@ public class ConfigurationKeys {
     public static final String MASTER_PASSWORD_ISIS_KEY              = ISIS_KEY_PREFIX + "master.password";
     public static final String MASTER_USER_ISIS_KEY                  = ISIS_KEY_PREFIX + "master.user";
     public static final String MASTER_BASE_URL_END_USER_URL_ISIS_KEY = ISIS_KEY_PREFIX + "master.baseUrlEndUser";
+    public static final String MASTER_BATCH_SIZE_ISIS_KEY = ISIS_KEY_PREFIX + "master.batchSize";
+    public static final int MASTER_BATCH_SIZE_ISIS_DEFAULT = 10;
 }
diff --git a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/SlaveConfiguration.java b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/SlaveConfiguration.java
index 73825a717..27237dbc3 100644
--- a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/SlaveConfiguration.java
+++ b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/SlaveConfiguration.java
@@ -3,6 +3,8 @@
 import java.util.Map;
 
 import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_BASE_URL_ISIS_KEY;
+import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_BATCH_SIZE_ISIS_DEFAULT;
+import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_BATCH_SIZE_ISIS_KEY;
 import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_PASSWORD_ISIS_KEY;
 import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_USER_ISIS_KEY;
 
@@ -11,6 +13,7 @@ public class SlaveConfiguration {
     final String masterUser;
     final String masterPassword;
     final String masterBaseUrl;
+    final int masterBatchSize;
 
     public SlaveConfiguration(final Map<String, String> map) {
         masterUser = map.get(MASTER_USER_ISIS_KEY);
@@ -20,6 +23,15 @@ public SlaveConfiguration(final Map<String, String> map) {
             masterBaseUrl = masterBaseUrl + "/";
         }
         this.masterBaseUrl= masterBaseUrl;
+        this.masterBatchSize = batchSizeFrom(map);
+    }
+
+    private static int batchSizeFrom(final Map<String, String> map) {
+        try {
+            return Integer.parseInt(map.get(MASTER_BATCH_SIZE_ISIS_KEY));
+        } catch (NumberFormatException e) {
+            return MASTER_BATCH_SIZE_ISIS_DEFAULT;
+        }
     }
 
     boolean isConfigured() {
diff --git a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/TickingClockService.java b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/TickingClockService.java
index 3d8a194a3..a12a9d646 100644
--- a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/TickingClockService.java
+++ b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/TickingClockService.java
@@ -86,12 +86,14 @@ public void at(Timestamp timestamp, Runnable runnable) {
         ensureInitialized();
 
         final TickingFixtureClock instance = (TickingFixtureClock) TickingFixtureClock.getInstance();
-        final Timestamp previous = TickingFixtureClock.getTimeAsJavaSqlTimestamp();
+        final long previous = TickingFixtureClock.getTimeAsMillis();
+        final long wallTime0 = System.currentTimeMillis();
         try {
             instance.setTime(timestamp);
             runnable.run();
         } finally {
-            instance.setTime(previous);
+            final long wallTime1 = System.currentTimeMillis();
+            instance.setTime(previous + wallTime1 - wallTime0);
         }
     }
 
diff --git a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java
index 36575986f..49825c8c9 100644
--- a/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java
+++ b/modules/spi/command/replay/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java
@@ -46,7 +46,7 @@ public static class ActionDomainEvent extends CommandModule.ActionDomainEvent<Co
     @ActionLayout(
             contributed = Contributed.AS_ACTION
     )
-    @MemberOrder(name = "exception", sequence = "1")
+    @MemberOrder(name = "executeIn", sequence = "3")
     public CommandJdo act() throws StatusException {
 
         // double check this is still the HWM