Merge pull request #3542 from apache/CAUSEWAY-3998

Causeway 3998

Author: danhaywood

api/applib/src/test/java/org/apache/causeway/applib/util/schema/CommandDtoUtils_fromYaml_Test.java

@@ -51,6 +51,13 @@ public void scalarValuesAsMultiDocument() throws IOException {
         assertScalarCommands(commandDtos);
     }
 
+    @Test
+    public void scalarValuesAsMultiDocumentWithTrailingEmptyDocument() throws IOException {
+        var commandDtos = loadCommands("commands-with-scalar-params-multi-document-trailing-empty.yaml");
+
+        assertScalarCommands(commandDtos);
+    }
+
     private static void assertScalarCommands(final List<CommandDto> commandDtos) {
 
         Assertions.assertThat(commandDtos).hasSize(2);

extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/CausewayModuleExtCommandLogApplib.java

@@ -72,12 +72,12 @@
         ReplayableCommand_replayOrRetry.class,
         ReplayableCommand_excludeFromReplay.class,
         ReplayableCommand_delete.class,
-        CommandExportManager.changeSince.class,
+        CommandExportManager.changeBaseline.class,
         CommandExportManager.previousHour.class,
         CommandExportManager.nextHour.class,
         CommandExportManager.exportSelected.class,
         CommandExportManager.makeSelectedExportable.class,
-        CommandReplayManager.changeSince.class,
+        CommandReplayManager.changeBaseline.class,
         CommandExportManager.previousHour.class,
         CommandReplayManager.nextHour.class,
         CommandReplayManager.importCommands.class,

extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandExportManager.java

@@ -76,9 +76,9 @@ public CommandExportManager(
     }
 
     public CommandExportManager(
-            final java.sql.Timestamp since,
+            final java.sql.Timestamp baseline,
             final ReplayContext replayContext) {
-        this.since = since;
+        this.baseline = baseline;
         this.replayContext = replayContext;
     }
 
@@ -88,9 +88,9 @@ public CommandExportManager(
 
 
     @Property
-    @PropertyLayout(describedAs = "Only commands since this timestamp are available for export")
+    @PropertyLayout(describedAs = "Only commands after this timestamp are available for export")
     @Getter
-    private java.sql.Timestamp since;
+    private java.sql.Timestamp baseline;
 
     @Action(
             semantics = SemanticsOf.SAFE,
@@ -99,7 +99,7 @@ public CommandExportManager(
             executionPublishing = Publishing.DISABLED
     )
     @ActionLayout(
-            associateWith = "since", sequence = "1",
+            associateWith = "baseline", sequence = "1",
             named = "Previous",
             position = ActionLayout.Position.PANEL,
             describedAs = "Move back one hour"
@@ -108,7 +108,7 @@ public class previousHour {
         public class DomainEvent extends ActionDomainEvent<previousHour> { }
 
         @MemberSupport public CommandExportManager act() {
-            return new CommandExportManager(addSeconds(since, -3600), replayContext);
+            return new CommandExportManager(addSeconds(baseline, -3600), replayContext);
         }
     }
 
@@ -119,42 +119,42 @@ public class DomainEvent extends ActionDomainEvent<previousHour> { }
             executionPublishing = Publishing.DISABLED
     )
     @ActionLayout(
-            associateWith = "since", sequence = "3",
+            associateWith = "baseline", sequence = "3",
             named = "Next",
             position = ActionLayout.Position.PANEL,
             describedAs = "Move forward one hour"
     )
     public class nextHour {
         public class DomainEvent extends ActionDomainEvent<nextHour> { }
         @MemberSupport public CommandExportManager act() {
-            return new CommandExportManager(addSeconds(since, +3600), replayContext);
+            return new CommandExportManager(addSeconds(baseline, +3600), replayContext);
         }
     }
 
     @Action(
             restrictTo = RestrictTo.PROTOTYPING,
             semantics = SemanticsOf.SAFE,
             commandPublishing = Publishing.DISABLED,
-            domainEvent = changeSince.DomainEvent.class,
+            domainEvent = changeBaseline.DomainEvent.class,
             executionPublishing = Publishing.DISABLED
     )
     @ActionLayout(
-            associateWith = "since", sequence = "2",
+            associateWith = "baseline", sequence = "2",
             named = "Change",
             position = ActionLayout.Position.PANEL
     )
-    public class changeSince {
+    public class changeBaseline {
         public class DomainEvent extends ActionDomainEvent<nextHour> { }
-        @MemberSupport public CommandExportManager act(final java.sql.Timestamp since) {
-            return new CommandExportManager(since, replayContext);
+        @MemberSupport public CommandExportManager act(final java.sql.Timestamp baseline) {
+            return new CommandExportManager(baseline, replayContext);
         }
-        @MemberSupport public java.sql.Timestamp defaultSince() {
-            return CommandExportManager.this.since;
+        @MemberSupport public java.sql.Timestamp defaultBaseline() {
+            return CommandExportManager.this.baseline;
         }
     }
 
-    private static Timestamp addSeconds(Timestamp since, int secondsToAdd) {
-        return Timestamp.from(since.toInstant().plusSeconds(secondsToAdd));
+    private static Timestamp addSeconds(Timestamp ts, int secondsToAdd) {
+        return Timestamp.from(ts.toInstant().plusSeconds(secondsToAdd));
     }
 
 
@@ -165,7 +165,7 @@ private static Timestamp addSeconds(Timestamp since, int secondsToAdd) {
             describedAs = "Commands that can be exported"
     )
     public List<ReplayableCommand> getNotYetExported() {
-        return commandLogEntryRepository().findForegroundSinceTimestampAndCanBeExported(since).stream()
+        return commandLogEntryRepository().findForegroundSinceTimestampAndCanBeExported(baseline).stream()
             .map(entry->new ReplayableCommand(
                     entry.getInteractionId(),
                     replayContext))
@@ -257,7 +257,7 @@ public List<ReplayableCommand> choicesSelected() {
     @Collection
     @CollectionLayout(describedAs = "Commands that have been exported")
     public List<ReplayableCommand> getExported() {
-        return commandLogEntryRepository().findForegroundSinceTimestampAndHasBeenExported(since).stream()
+        return commandLogEntryRepository().findForegroundSinceTimestampAndHasBeenExported(baseline).stream()
             .map(entry->new ReplayableCommand(
                     entry.getInteractionId(),
                     replayContext))
@@ -308,7 +308,7 @@ public List<ReplayableCommand> choicesSelected() {
 
     @Override
     public String viewModelMemento() {
-        return TimestampMarshallUtil.toString(this.since);
+        return TimestampMarshallUtil.toString(this.baseline);
     }
 
     // -- HELPER

extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandExportManager.layout.fallback.xml

@@ -4,11 +4,11 @@
             <cpt:domainObject/>
         </bs:col>
         <bs:col span="3">
-            <cpt:fieldSet name=" " id="since">
+            <cpt:fieldSet name=" " id="baseline">
                 <cpt:action id="previousHour"/>
-                <cpt:action id="changeSince"/>
+                <cpt:action id="changeBaseline"/>
                 <cpt:action id="nextHour"/>
-                <cpt:property id="since"/>
+                <cpt:property id="baseline"/>
             </cpt:fieldSet>
         </bs:col>
         <bs:col span="3">