You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2026/06/20 17:14:22 UTC
(causeway) branch CAUSEWAY-4039 updated (eb2d295255f -> c54cb64b183)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch CAUSEWAY-4039
in repository https://gitbox.apache.org/repos/asf/causeway.git
from eb2d295255f CAUSEWAY-4039: adds guards for 'replayOrRetryNext'
new 8e10f1d68cb CAUSEWAY-4039: reverts syncing of the result/exception, that was invalid. Cosmetic improvements in UI
new c54cb64b183 CAUSEWAY-4039: fixes unit tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commandlog/applib/dom/CommandLogEntry.java | 6 +++---
... => CommandManager#excluded.columnOrder.fallback.txt} | 0
...mandManager#pendingOrFailed.columnOrder.fallback.txt} | 0
...dManager#recordedOrReplayed.columnOrder.fallback.txt} | 0
.../commandlog/applib/dom/replay/CommandManager.java | 4 ++--
.../applib/dom/replay/CommandManager.layout.fallback.xml | 6 +++---
.../applib/dom/replay/CommandManagerMovementSupport.java | 11 +++++------
.../applib/dom/replay/CommandManager_deleteCommands.java | 6 +++---
.../dom/replay/CommandManager_excludeCommands.java | 10 +++++-----
.../applib/dom/replay/CommandManager_exportSelected.java | 8 ++++----
.../applib/dom/replay/CommandManager_moveCommands.java | 2 +-
.../applib/dom/replay/CommandManager_nextPage.java | 6 +++---
.../applib/dom/replay/CommandManager_previousPage.java | 4 ++--
.../dom/replay/CommandManager_replayOrRetryNext.java | 2 +-
.../dom/replay/CommandManager_unexcludeCommands.java | 6 +++---
.../commandlog/applib/dom/CommandLogEntrySyncTest.java | 4 ++--
.../applib/dom/replay/CommandManager_commands_Test.java | 12 ++++++------
.../replay/CommandManager_known_participants_Test.java | 4 ++--
.../dom/replay/CommandManager_moveCommands_Test.java | 16 ++++++++--------
19 files changed, 53 insertions(+), 54 deletions(-)
copy extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/{ReplayableCommand.columnOrder.fallback.txt => CommandManager#excluded.columnOrder.fallback.txt} (100%)
copy extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/{ReplayableCommand.columnOrder.fallback.txt => CommandManager#pendingOrFailed.columnOrder.fallback.txt} (100%)
copy extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/{ReplayableCommand.columnOrder.fallback.txt => CommandManager#recordedOrReplayed.columnOrder.fallback.txt} (100%)
(causeway) 02/02: CAUSEWAY-4039: fixes unit tests
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-4039
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit c54cb64b183afb03259a63d105325ab26f3156ea
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jun 20 18:14:14 2026 +0100
CAUSEWAY-4039: fixes unit tests
---
.../commandlog/applib/dom/CommandLogEntrySyncTest.java | 4 ++--
.../dom/replay/CommandManager_moveCommands_Test.java | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntrySyncTest.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntrySyncTest.java
index ae01908b8ae..ce0888707ec 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntrySyncTest.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntrySyncTest.java
@@ -55,8 +55,8 @@ void sync_execution_metadata_preserves_recorded_outcome_for_replay_entries() {
verify(commandLogEntry).setStartedAt(STARTED_AT);
verify(commandLogEntry).setCompletedAt(COMPLETED_AT);
- verify(commandLogEntry).setResult(RESULT);
- verify(commandLogEntry).setException((Throwable) null);
+ verify(commandLogEntry, never()).setResult(RESULT);
+ verify(commandLogEntry, never()).setException((Throwable) null);
}
@Test
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_moveCommands_Test.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_moveCommands_Test.java
index 9de6187980a..1666706ff49 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_moveCommands_Test.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_moveCommands_Test.java
@@ -171,8 +171,8 @@ void moves_multiple_commands_preserving_original_internal_gaps() {
fixture.moveAction.act(fixture.commands(b, c), fixture.command(a), false);
- assertThat(b.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:00.510Z"));
- assertThat(c.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:00.760Z"));
+ assertThat(b.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:01.500Z"));
+ assertThat(c.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:02.500Z"));
assertThat(a.getTimestamp()).isEqualTo(T0);
}
@@ -203,8 +203,8 @@ void moves_multiple_commands_with_minimum_gap_when_original_gap_is_not_positive(
fixture.moveAction.act(fixture.commands(b, c), fixture.command(a), false);
- assertThat(b.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:00.510Z"));
- assertThat(c.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:00.520Z"));
+ assertThat(b.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:01.500Z"));
+ assertThat(c.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:02.500Z"));
}
@Test
@@ -274,8 +274,8 @@ void down_moves_multiple_commands_preserving_original_internal_gaps() {
fixture.moveAction.act(fixture.commands(a, b), fixture.command(c), false);
- assertThat(a.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:05.010Z"));
- assertThat(b.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:05.260Z"));
+ assertThat(a.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:06.000Z"));
+ assertThat(b.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:07.000Z"));
assertThat(c.getTimestamp()).isEqualTo(T5);
}
@@ -306,8 +306,8 @@ void down_moves_multiple_commands_with_minimum_gap_when_original_gap_is_not_posi
fixture.moveAction.act(fixture.commands(a, b), fixture.command(c), false);
- assertThat(a.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:05.010Z"));
- assertThat(b.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:05.020Z"));
+ assertThat(a.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:06.000Z"));
+ assertThat(b.getTimestamp()).isEqualTo(timestamp("2026-06-07T10:00:07.000Z"));
}
@Test
(causeway) 01/02: CAUSEWAY-4039: reverts syncing of the result/exception, that was invalid. Cosmetic improvements in UI
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-4039
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 8e10f1d68cb259ca3047067011d2433383731853
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jun 20 18:10:52 2026 +0100
CAUSEWAY-4039: reverts syncing of the result/exception, that was invalid. Cosmetic improvements in UI
---
.../extensions/commandlog/applib/dom/CommandLogEntry.java | 6 +++---
.../replay/CommandManager#excluded.columnOrder.fallback.txt | 7 +++++++
.../CommandManager#pendingOrFailed.columnOrder.fallback.txt | 7 +++++++
...ommandManager#recordedOrReplayed.columnOrder.fallback.txt | 7 +++++++
.../commandlog/applib/dom/replay/CommandManager.java | 4 ++--
.../applib/dom/replay/CommandManager.layout.fallback.xml | 6 +++---
.../applib/dom/replay/CommandManagerMovementSupport.java | 11 +++++------
.../applib/dom/replay/CommandManager_deleteCommands.java | 6 +++---
.../applib/dom/replay/CommandManager_excludeCommands.java | 10 +++++-----
.../applib/dom/replay/CommandManager_exportSelected.java | 8 ++++----
.../applib/dom/replay/CommandManager_moveCommands.java | 2 +-
.../applib/dom/replay/CommandManager_nextPage.java | 6 +++---
.../applib/dom/replay/CommandManager_previousPage.java | 4 ++--
.../applib/dom/replay/CommandManager_replayOrRetryNext.java | 2 +-
.../applib/dom/replay/CommandManager_unexcludeCommands.java | 6 +++---
.../applib/dom/replay/CommandManager_commands_Test.java | 12 ++++++------
.../dom/replay/CommandManager_known_participants_Test.java | 4 ++--
17 files changed, 64 insertions(+), 44 deletions(-)
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
index d7fa48e7c27..6eb2c41af75 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
@@ -169,9 +169,6 @@ public void sync(final Command command) {
setStartedAt(command.getStartedAt());
setCompletedAt(command.getCompletedAt());
- setResult(command.getResult());
- setException(command.getException());
-
if (isReplayOrRetryEnabled(getReplayState())) {
// we DON'T overwrite remained if we're replaying.
return;
@@ -185,6 +182,9 @@ public void sync(final Command command) {
setTarget(command.getTarget());
setLogicalMemberIdentifier(command.getLogicalMemberIdentifier());
+ setResult(command.getResult());
+ setException(command.getException());
+
}
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#excluded.columnOrder.fallback.txt b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#excluded.columnOrder.fallback.txt
new file mode 100644
index 00000000000..ad3b55fd9dd
--- /dev/null
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#excluded.columnOrder.fallback.txt
@@ -0,0 +1,7 @@
+#interactionId
+timestamp
+target
+member
+replayState
+hasResult
+knownParticipants
\ No newline at end of file
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#pendingOrFailed.columnOrder.fallback.txt b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#pendingOrFailed.columnOrder.fallback.txt
new file mode 100644
index 00000000000..ad3b55fd9dd
--- /dev/null
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#pendingOrFailed.columnOrder.fallback.txt
@@ -0,0 +1,7 @@
+#interactionId
+timestamp
+target
+member
+replayState
+hasResult
+knownParticipants
\ No newline at end of file
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#recordedOrReplayed.columnOrder.fallback.txt b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#recordedOrReplayed.columnOrder.fallback.txt
new file mode 100644
index 00000000000..ad3b55fd9dd
--- /dev/null
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager#recordedOrReplayed.columnOrder.fallback.txt
@@ -0,0 +1,7 @@
+#interactionId
+timestamp
+target
+member
+replayState
+hasResult
+knownParticipants
\ No newline at end of file
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager.java
index 6b8c58c4f0a..5ee356ed747 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager.java
@@ -130,7 +130,7 @@ public CommandManager withLimit(final int limit) {
@CollectionLayout(
describedAs = "Commands since the baseline (except those that have been excluded)."
)
- public List<ReplayableCommand> getCommandsForExport() {
+ public List<ReplayableCommand> getCommandsInSequence() {
ReplayableCommandParticipantTracker.putTrackerOnScratchpad(this, replayContext.scratchpad());
return commandLogEntries().stream()
.filter(this::isDoOp)
@@ -144,7 +144,7 @@ public List<ReplayableCommand> getCommandsForExport() {
sequence = "2",
describedAs = "Commands since the baseline that have been excluded"
)
- public List<ReplayableCommand> getExcludedCommands() {
+ public List<ReplayableCommand> getExcluded() {
return commandLogEntryRepository().findForegroundSinceTimestampAndWithReplayExcluded(baseline)
.stream()
.filter(this::isDoOp)
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager.layout.fallback.xml b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager.layout.fallback.xml
index 30fb7661a5f..8ca12e215f2 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager.layout.fallback.xml
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager.layout.fallback.xml
@@ -64,12 +64,12 @@
</bs:col>
</bs:row>
</bs:tab>
- <bs:tab name="Export">
+ <bs:tab name="Sequence">
<bs:row>
<bs:col span="12">
<bs:row>
<bs:col span="12" size="MD">
- <cpt:collection defaultView="table" paged="15" id="commandsForExport">
+ <cpt:collection defaultView="table" paged="15" id="commandsInSequence">
<cpt:action id="exportSelected"/>
<cpt:action id="moveCommands"/>
<cpt:action id="excludeCommands"/>
@@ -78,7 +78,7 @@
</bs:row>
<bs:row>
<bs:col span="12" size="MD">
- <cpt:collection defaultView="hidden" paged="15" id="excludedCommands">
+ <cpt:collection defaultView="hidden" paged="15" id="excluded">
<cpt:action id="unexcludeCommands"/>
<cpt:action id="deleteCommands"/>
</cpt:collection>
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManagerMovementSupport.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManagerMovementSupport.java
index ece19d65f8c..7238197b322 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManagerMovementSupport.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManagerMovementSupport.java
@@ -19,7 +19,6 @@
package org.apache.causeway.extensions.commandlog.applib.dom.replay;
import java.sql.Timestamp;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
@@ -34,7 +33,7 @@
class CommandManagerMovementSupport {
- static final long MINIMUM_GAP_MILLIS = 10L;
+ static final long MINIMUM_GAP_MILLIS = 1000L;
static final long SQUASH_GAP_MILLIS = 1000L;
private final CommandManager commandManager;
@@ -51,7 +50,7 @@ String disableAct() {
if (!isRecordingSupportEnabled()) {
return "Command movement requires command-log recording support to be enabled";
}
- return commandManager.getCommandsForExport().isEmpty() ? "No commands in collection" : null;
+ return commandManager.getCommandsInSequence().isEmpty() ? "No commands in collection" : null;
}
String validateAct(
@@ -69,7 +68,7 @@ String validateAct(
return "Cannot move commands after one of the selected commands";
}
- final List<ReplayableCommand> availableCommands = commandManager.getCommandsForExport();
+ final List<ReplayableCommand> availableCommands = commandManager.getCommandsInSequence();
final Set<UUID> availableIds = interactionIds(availableCommands);
if (!availableIds.contains(target.interactionId())) {
return "Target command is not available for export from the current baseline";
@@ -81,11 +80,11 @@ String validateAct(
}
List<ReplayableCommand> choicesSelected() {
- return commandManager.getCommandsForExport();
+ return commandManager.getCommandsInSequence();
}
List<ReplayableCommand> choicesTarget(final List<ReplayableCommand> selected) {
- return choicesTarget(selected, commandManager.getCommandsForExport());
+ return choicesTarget(selected, commandManager.getCommandsInSequence());
}
private List<ReplayableCommand> choicesTarget(
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_deleteCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_deleteCommands.java
index 28656ccbd98..2b13bd1dc38 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_deleteCommands.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_deleteCommands.java
@@ -51,7 +51,7 @@ public CommandManager act(final List<ReplayableCommand> selected) {
@MemberSupport
public String disableAct() {
- return commandManager.getExcludedCommands().isEmpty()
+ return commandManager.getExcluded().isEmpty()
? "No excluded commands in collection"
: null;
}
@@ -62,7 +62,7 @@ public String validateAct(final List<ReplayableCommand> selected) {
if (selectedValidation != null) {
return selectedValidation;
}
- final Set<UUID> excludedIds = interactionIds(commandManager.getExcludedCommands());
+ final Set<UUID> excludedIds = interactionIds(commandManager.getExcluded());
final Set<UUID> selectedIds = interactionIds(selected);
if (!excludedIds.containsAll(selectedIds)) {
return "Selected commands must be excluded commands from the current baseline";
@@ -78,7 +78,7 @@ public String validateSelected(final List<ReplayableCommand> selected) {
// TODO: shouldn't be required because of 'choicesFrom', but in v2 there seems to be a MM validation error due to a missing choicesFacet
@MemberSupport
public List<ReplayableCommand> choicesSelected() {
- return commandManager.getExcludedCommands();
+ return commandManager.getExcluded();
}
private static Set<UUID> interactionIds(final List<ReplayableCommand> commands) {
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_excludeCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_excludeCommands.java
index 3f6b55ecda0..80c44cca158 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_excludeCommands.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_excludeCommands.java
@@ -19,7 +19,7 @@
@Action(
restrictTo = RestrictTo.PROTOTYPING,
- choicesFrom = "commandsForExport",
+ choicesFrom = "commandsInSequence",
commandPublishing = Publishing.DISABLED,
semantics = SemanticsOf.NON_IDEMPOTENT,
domainEvent = CommandManager_excludeCommands.DomainEvent.class,
@@ -62,7 +62,7 @@ public String disableAct() {
if (!replayContext.isRecordingSupportEnabled()) {
return "Command exclusion requires command-log recording support to be enabled";
}
- return commandManager.getCommandsForExport().isEmpty() ? "No commands in collection" : null;
+ return commandManager.getCommandsInSequence().isEmpty() ? "No commands in collection" : null;
}
@MemberSupport
@@ -74,7 +74,7 @@ public String validateAct(final List<ReplayableCommand> selected) {
if (selectedValidation != null) {
return selectedValidation;
}
- final Set<UUID> activeIds = interactionIds(commandManager.getCommandsForExport());
+ final Set<UUID> activeIds = interactionIds(commandManager.getCommandsInSequence());
final Set<UUID> selectedIds = interactionIds(selected);
if (!activeIds.containsAll(selectedIds)) {
return "Selected commands must be active commands from the current baseline";
@@ -89,7 +89,7 @@ public String validateSelected(final List<ReplayableCommand> selected) {
@MemberSupport
public List<ReplayableCommand> defaultSelected() {
- return commandManager.getCommandsForExport().stream()
+ return commandManager.getCommandsInSequence().stream()
.filter(command -> !command.isKnownParticipants())
.collect(Collectors.toList());
}
@@ -97,7 +97,7 @@ public List<ReplayableCommand> defaultSelected() {
// TODO: shouldn't be required because of 'choicesFrom', but in v2 there seems to be a MM validation error due to a missing choicesFacet
@MemberSupport
public List<ReplayableCommand> choicesSelected() {
- return commandManager.getCommandsForExport();
+ return commandManager.getCommandsInSequence();
}
private static Set<UUID> interactionIds(final List<ReplayableCommand> commands) {
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_exportSelected.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_exportSelected.java
index 1569f999946..587bbc83707 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_exportSelected.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_exportSelected.java
@@ -18,7 +18,7 @@
@Action(
restrictTo = RestrictTo.PROTOTYPING,
- choicesFrom = "commandsForExport",
+ choicesFrom = "commandsInSequence",
semantics = SemanticsOf.NON_IDEMPOTENT,
commandPublishing = Publishing.DISABLED,
domainEvent = CommandManager_exportSelected.DomainEvent.class,
@@ -74,7 +74,7 @@ public Clob act(
@MemberSupport
public String disableAct() {
- return commandManager.getCommandsForExport().isEmpty() ? "No commands in collection" : null;
+ return commandManager.getCommandsInSequence().isEmpty() ? "No commands in collection" : null;
}
@MemberSupport
@@ -89,7 +89,7 @@ public boolean defaultFilenameTimestamp() {
@MemberSupport
public List<ReplayableCommand> defaultSelected() {
- return commandManager.getCommandsForExport().stream()
+ return commandManager.getCommandsInSequence().stream()
.filter(ReplayableCommand::isKnownParticipants)
.collect(Collectors.toList());
}
@@ -124,6 +124,6 @@ private Optional<CommandKnownParticipantsValidator.Failure> validateKnownTargets
// TODO: shouldn't be required because of 'choicesFrom', but in v2 there seems to be a MM validation error due to a missing choicesFacet
@MemberSupport
public List<ReplayableCommand> choicesSelected() {
- return commandManager.getCommandsForExport();
+ return commandManager.getCommandsInSequence();
}
}
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_moveCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_moveCommands.java
index b6ea797654c..3d06a014fb9 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_moveCommands.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_moveCommands.java
@@ -35,7 +35,7 @@
@Action(
restrictTo = RestrictTo.PROTOTYPING,
- choicesFrom = "commandsForExport",
+ choicesFrom = "commandsInSequence",
commandPublishing = Publishing.DISABLED,
semantics = SemanticsOf.NON_IDEMPOTENT,
domainEvent = CommandManager_moveCommands.DomainEvent.class,
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_nextPage.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_nextPage.java
index 18346f46330..1de27d4b5f4 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_nextPage.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_nextPage.java
@@ -25,7 +25,7 @@ public static class DomainEvent extends CommandManager.ActionDomainEvent<Command
@MemberSupport
public CommandManager act() {
- final var commands = commandManager.getCommandsForExport();
+ final var commands = commandManager.getCommandsInSequence();
final var size = commands.size();
if (size == 0) {
return commandManager;
@@ -36,13 +36,13 @@ public CommandManager act() {
@MemberSupport
public String disableAct() {
- final var commands = commandManager.getCommandsForExport();
+ final var commands = commandManager.getCommandsInSequence();
final var size = commands.size();
if (size == 0) {
return "Empty";
}
final var lastReplayable = commands.get(size - 1);
- return commandManager(lastReplayable).getCommandsForExport().isEmpty() ? "No more commands" : null;
+ return commandManager(lastReplayable).getCommandsInSequence().isEmpty() ? "No more commands" : null;
}
private CommandManager commandManager(final ReplayableCommand replayableCommand) {
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_previousPage.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_previousPage.java
index 83607c055c7..affa4929577 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_previousPage.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_previousPage.java
@@ -25,7 +25,7 @@ public static class DomainEvent extends CommandManager.ActionDomainEvent<Command
@MemberSupport
public CommandManager act() {
- final var commands = commandManager.getCommandsForExport(); // returns descending, latest (youngest) first
+ final var commands = commandManager.getCommandsInSequence(); // returns descending, latest (youngest) first
final var size = commands.size();
if (size == 0) {
return commandManager;
@@ -36,7 +36,7 @@ public CommandManager act() {
@MemberSupport
public String disableAct() {
- final var commands = commandManager.getCommandsForExport();
+ final var commands = commandManager.getCommandsInSequence();
final var size = commands.size();
return size == 0 ? "No commands" : null;
}
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_replayOrRetryNext.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_replayOrRetryNext.java
index c7846943c8a..08f814ee72c 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_replayOrRetryNext.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_replayOrRetryNext.java
@@ -46,7 +46,7 @@ public CommandManager act() {
* because we need to check isKnownParticipants
*/
private @NonNull Optional<ReplayableCommand> commandInSequence(Optional<ReplayableCommand> nextIfAny) {
- final var allCommands = commandManager.getCommandsForExport();
+ final var allCommands = commandManager.getCommandsInSequence();
return nextIfAny.stream()
.flatMap(next -> allCommands.stream().filter(command -> command.getInteractionId().equals(next.getInteractionId())))
.findFirst();
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_unexcludeCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_unexcludeCommands.java
index a9535ab2971..e8d7d49d08c 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_unexcludeCommands.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_unexcludeCommands.java
@@ -66,7 +66,7 @@ public String disableAct() {
if (!replayContext.isRecordingSupportEnabled()) {
return "Command restoration requires command-log recording support to be enabled";
}
- return commandManager.getExcludedCommands().isEmpty() ? "No excluded commands in collection" : null;
+ return commandManager.getExcluded().isEmpty() ? "No excluded commands in collection" : null;
}
@MemberSupport
@@ -74,7 +74,7 @@ public String validateSelected(final List<ReplayableCommand> selected) {
if (selected == null || selected.isEmpty()) {
return "Select at least one command to restore";
}
- final Set<UUID> excludedIds = interactionIds(commandManager.getExcludedCommands());
+ final Set<UUID> excludedIds = interactionIds(commandManager.getExcluded());
final Set<UUID> selectedIds = interactionIds(selected);
if (!excludedIds.containsAll(selectedIds)) {
return "Selected commands must be excluded commands from the current baseline";
@@ -85,7 +85,7 @@ public String validateSelected(final List<ReplayableCommand> selected) {
// TODO: shouldn't be required because of 'choicesFrom', but in v2 there seems to be a MM validation error due to a missing choicesFacet
@MemberSupport
public List<ReplayableCommand> choicesSelected() {
- return commandManager.getExcludedCommands();
+ return commandManager.getExcluded();
}
private static Set<UUID> interactionIds(final List<ReplayableCommand> commands) {
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_commands_Test.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_commands_Test.java
index 940e360657a..0de253f9a52 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_commands_Test.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_commands_Test.java
@@ -62,7 +62,7 @@ void commands_collection_includes_undefined_replay_states_since_baseline() {
final var replayContext = ReplayContext.builder().commandLogEntryRepository(repository).specificationLoader(null).build();
final var manager = new CommandManager(new CommandManager.State(BASELINE, 50), replayContext);
- final var commands = manager.getCommandsForExport();
+ final var commands = manager.getCommandsInSequence();
assertThat(interactionIds(commands))
.containsExactly(undefined.getInteractionId(), exported.getInteractionId());
@@ -85,7 +85,7 @@ void commands_collection_omits_excluded_and_replay_execution_states_since_baseli
.build();
final var manager = new CommandManager(new CommandManager.State(BASELINE, 50), replayContext);
- final var commands = manager.getCommandsForExport();
+ final var commands = manager.getCommandsInSequence();
assertThat(interactionIds(commands))
.containsExactly(undefined.getInteractionId(), undefined2.getInteractionId(), ok.getInteractionId());
@@ -101,7 +101,7 @@ void excluded_commands_collection_includes_only_excluded_replay_states_since_bas
final var replayContext = ReplayContext.builder().commandLogEntryRepository(repository).specificationLoader(null).build();
final var manager = new CommandManager(new CommandManager.State(BASELINE, 50), replayContext);
- final var commands = manager.getExcludedCommands();
+ final var commands = manager.getExcluded();
assertThat(interactionIds(commands))
.containsExactly(excluded.getInteractionId());
@@ -115,7 +115,7 @@ void commands_collection_includes_safe_action_with_single_result() {
final var replayContext = ReplayContext.builder().commandLogEntryRepository(repository).specificationLoader(specificationLoader).build();
final var manager = new CommandManager(new CommandManager.State(BASELINE, 50), replayContext);
- final var commands = manager.getCommandsForExport();
+ final var commands = manager.getCommandsInSequence();
assertThat(interactionIds(commands))
.containsExactly(safeAction.getInteractionId());
@@ -129,7 +129,7 @@ void commands_collection_omits_safe_action_without_result_but_entry_remains_avai
final var replayContext = ReplayContext.builder().commandLogEntryRepository(repository).specificationLoader(specificationLoader).build();
final var manager = new CommandManager(new CommandManager.State(BASELINE, 50), replayContext);
- final var commands = manager.getCommandsForExport();
+ final var commands = manager.getCommandsInSequence();
assertThat(commands).isEmpty();
assertThat(repository.findForegroundSinceTimestamp(BASELINE, 50)).containsExactly(safeAction);
@@ -143,7 +143,7 @@ void previous_page_uses_unified_unfiltered_query() {
final var replayContext = ReplayContext.builder().commandLogEntryRepository(repository).specificationLoader(null).build();
final var manager = new CommandManager(new CommandManager.State(BASELINE, 50), replayContext);
- final var commands = manager.getCommandsForExport();
+ final var commands = manager.getCommandsInSequence();
assertThat(interactionIds(commands))
.containsExactly(exported.getInteractionId(), excluded.getInteractionId());
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_known_participants_Test.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_known_participants_Test.java
index c0b9d8aa9e2..10438eeae42 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_known_participants_Test.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandManager_known_participants_Test.java
@@ -247,7 +247,7 @@ void exportable_is_false_when_recording_support_is_disabled() {
.causewayConfiguration(causewayConfigurationWith(RecordingSupport.DISABLED))
.build();
final var manager = new CommandManager(new CommandManager.State(BASELINE, 50), replayContext);
- final var commands = manager.getCommandsForExport();
+ final var commands = manager.getCommandsInSequence();
assertThat(commands.get(0).isKnownParticipants()).isFalse();
}
@@ -360,7 +360,7 @@ private static List<ReplayableCommand> exportManagerCommandsWith(final CommandLo
.causewayConfiguration(causewayConfigurationWith(RecordingSupport.ENABLED))
.build();
final var manager = new CommandManager(new CommandManager.State(BASELINE, 50), replayContext);
- return manager.getCommandsForExport();
+ return manager.getCommandsInSequence();
}
private static Fixture fixtureWithRecordingSupport(