This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch ISIS-2222 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 32b87764167c555d3785dbd0b5d5ad3b8b7a124e Author: danhaywood <[email protected]> AuthorDate: Sun Aug 30 14:21:53 2020 +0100 ISIS-2222: command-replay fixes --- extensions/core/command-log/impl/pom.xml | 4 ++++ extensions/core/command-replay/impl/pom.xml | 4 ++++ .../RunBackgroundCommandsWithReplicationAndReplayJob.java | 15 +++++++-------- .../command/replay/impl/mixins/CommandJdo_replayNext.java | 6 +++--- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/extensions/core/command-log/impl/pom.xml b/extensions/core/command-log/impl/pom.xml index 2647f5a..b6d4d18 100644 --- a/extensions/core/command-log/impl/pom.xml +++ b/extensions/core/command-log/impl/pom.xml @@ -48,6 +48,10 @@ <groupId>org.apache.isis.testing</groupId> <artifactId>isis-testing-fixtures-applib</artifactId> </dependency> + <dependency> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis-core-runtimeservices</artifactId> + </dependency> </dependencies> diff --git a/extensions/core/command-replay/impl/pom.xml b/extensions/core/command-replay/impl/pom.xml index 3a0a792..e58de94 100644 --- a/extensions/core/command-replay/impl/pom.xml +++ b/extensions/core/command-replay/impl/pom.xml @@ -40,6 +40,10 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-config</artifactId> </dependency> + <dependency> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis-core-runtime</artifactId> + </dependency> <dependency> <groupId>org.apache.isis.core</groupId> diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java b/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java index 814f92d..2a6b8be 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java +++ b/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java @@ -1,7 +1,5 @@ package org.isisaddons.module.command.replay.impl; -import java.util.Map; - import javax.inject.Inject; import com.google.common.base.Splitter; @@ -42,8 +40,8 @@ public class RunBackgroundCommandsWithReplicationAndReplayJob implements Job { // figure out if this instance is configured to run as master or slave authSession = new SimpleSessionFromQuartz(quartzContext); - final Map<String, String> isisConfigAsMap = lookupIsisConfigurationAsMap(authSession); - slaveConfig = new SlaveConfiguration(isisConfigAsMap); + final IsisConfiguration isisConfiguration = lookupIsisConfiguration(authSession); + slaveConfig = new SlaveConfiguration(isisConfiguration); if(!slaveConfig.isConfigured()) { runBackgroundCommandsOnMaster(); @@ -54,7 +52,8 @@ public class RunBackgroundCommandsWithReplicationAndReplayJob implements Job { private void runBackgroundCommandsOnMaster() { // same as the original RunBackgroundCommandsJob - new BackgroundCommandExecutionFromBackgroundCommandServiceJdo().execute(authSession, null); + val executionService = new BackgroundCommandExecutionFromBackgroundCommandServiceJdo(); + executionService.execute(authSession, null); } private void runBackgroundCommandsOnSlave(final JobExecutionContext quartzContext) { @@ -96,13 +95,13 @@ public class RunBackgroundCommandsWithReplicationAndReplayJob implements Job { } - private Map<String,String> lookupIsisConfigurationAsMap(final AuthenticationSession authSession) { + private IsisConfiguration lookupIsisConfiguration(final AuthenticationSession authSession) { - final Holder<Map<String,String>> holder = new Holder<>(); + final Holder<IsisConfiguration> holder = new Holder<>(); new AbstractIsisInteractionTemplate() { @Override protected void doExecuteWithTransaction(final Object unused) { - holder.setObject(isisConfiguration.getAsMap()); + holder.setObject(isisConfiguration); } @Inject diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java b/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java index 258b92d..cb80f01 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java +++ b/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java @@ -59,7 +59,7 @@ public class CommandJdo_replayNext { private CommandJdo fetchNext() throws StatusException { - final CommandDto commandDto = commandFetcher.fetchCommand(this.commandJdo, getSlaveConfig()); + final CommandDto commandDto = commandFetcher.fetchCommand(this.commandJdo, slaveConfiguration); return commandDto == null ? null : commandServiceJdoRepository.saveForReplay(commandDto); @@ -99,14 +99,14 @@ public class CommandJdo_replayNext { } public boolean hideAct() { - return !getSlaveConfig().isConfigured(); + return !slaveConfiguration.isConfigured(); } @Inject CommandServiceJdoRepository commandServiceJdoRepository; @Inject CommandFetcher commandFetcher; @Inject CommandExecutorService commandExecutorService; - @Inject IsisConfiguration isisConfiguration; + @Inject SlaveConfiguration slaveConfiguration; @Inject MessageService messageService; @Inject CommandReplayAnalysisService analysisService; }
