CAUSEWAY-3989: simplify by not requiring bookmark service

Author: andi-huber

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

@@ -22,7 +22,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.command.CommandExecutorService;
 import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.repository.RepositoryService;
@@ -118,12 +117,11 @@ public static void honorSystemEnvironment() {
     }
 
     @Bean ReplayContext replayContext(
-            final BookmarkService bookmarkService,
             final RepositoryService repositoryService,
             final InteractionService interactionService,
             final CommandLogEntryRepository commandLogEntryRepository,
             final CommandExecutorService commandExecutorService) {
-        return new ReplayContext(bookmarkService, repositoryService, interactionService,
+        return new ReplayContext(repositoryService, interactionService,
                 commandLogEntryRepository, commandExecutorService);
     }
 

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

@@ -80,7 +80,7 @@ public List<ReplayableCommand> getNotYetExported() {
         return commandLogEntryRepository().findAll().stream()
             .filter(entry->ReplayState.canExport(entry.getReplayState()))
             .map(entry->new ReplayableCommand(
-                    replayContext.bookmarkService().bookmarkFor(entry).get().identifier(),
+                    entry.getInteractionId(),
                     replayContext))
             .toList();
     }
@@ -136,7 +136,7 @@ public List<ReplayableCommand> getExported() {
         return commandLogEntryRepository().findAll().stream()
             .filter(entry->ReplayState.isExported(entry.getReplayState()))
             .map(entry->new ReplayableCommand(
-                    replayContext.bookmarkService().bookmarkFor(entry).get().identifier(),
+                    entry.getInteractionId(),
                     replayContext))
             .toList();
     }

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

@@ -94,7 +94,7 @@ public CommandReplayManager deleteAll() {
     public List<ReplayableCommand> getPendingOrFailed() {
         return commandLogEntryRepository().findReplayPendingOrFailed().stream()
             .map(entry->new ReplayableCommand(
-                    replayContext.bookmarkService().bookmarkFor(entry).get().identifier(),
+                    entry.getInteractionId(),
                     replayContext))
             .toList();
     }
@@ -147,7 +147,7 @@ public CommandReplayManager deleteSelected(final List<ReplayableCommand> selecte
     public List<ReplayableCommand> getSucceededOrExcluded() {
         return commandLogEntryRepository().findReplaySucceededOrExcluded().stream()
             .map(entry->new ReplayableCommand(
-                    replayContext.bookmarkService().bookmarkFor(entry).get().identifier(),
+                    entry.getInteractionId(),
                     replayContext))
             .toList();
     }

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

@@ -18,7 +18,6 @@
  */
 package org.apache.causeway.extensions.commandlog.applib.dom.replay;
 
-import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.command.CommandExecutorService;
 import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.repository.RepositoryService;
@@ -28,7 +27,6 @@
  * Bundles dependencies for the replay logic.
  */
 public record ReplayContext(
-        BookmarkService bookmarkService,
         RepositoryService repositoryService,
         InteractionService interactionService,
         CommandLogEntryRepository commandLogEntryRepository,

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

@@ -42,12 +42,10 @@
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.fa.FontAwesomeLayers;
 import org.apache.causeway.applib.jaxb.JavaTimeXMLGregorianCalendarMarshalling;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.command.CommandExecutorService.InteractionContextPolicy;
 import org.apache.causeway.commons.functional.Try;
 import org.apache.causeway.commons.internal.base._Refs.ObjectReference;
 import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
 import org.apache.causeway.commons.io.JsonUtils;
 import org.apache.causeway.commons.io.TextUtils;
 import org.apache.causeway.commons.io.YamlUtils;
@@ -69,7 +67,7 @@
 @DomainObjectLayout(cssClassFa = "terminal")
 @Named(ReplayableCommand.LOGICAL_TYPE_NAME)
 public record ReplayableCommand(
-        String commandLogEntryId,
+        UUID interactionId,
         ReplayContext replayContext,
         ObjectReference<CommandRecord> recordRef) implements ViewModel, Comparable<ReplayableCommand> {
 
@@ -102,7 +100,13 @@ public String faQuickIcon() {
     public ReplayableCommand(
             final String memento,
             final ReplayContext replayContext) {
-        this(memento, replayContext, new ObjectReference<>(null));
+        this(UUID.fromString(memento), replayContext);
+    }
+
+    ReplayableCommand(
+            final UUID interactionId,
+            final ReplayContext replayContext) {
+        this(interactionId, replayContext, new ObjectReference<>(null));
     }
 
     @ObjectSupport public String title() {
@@ -123,11 +127,7 @@ public ReplayableCommand(
             fieldSetId = "details",
             describedAs = "UUID of the original (replayabel) Command")
     public UUID getInteractionId() {
-        return commandRecord()
-            .map(CommandRecord::commandDto)
-            .map(CommandDto::getInteractionId)
-            .map(UUID::fromString)
-            .orElse(null);
+        return interactionId();
     }
 
     @Property
@@ -323,7 +323,7 @@ public int compareTo(final ReplayableCommand other) {
 
     @Override
     public String viewModelMemento() {
-        return commandLogEntryId;
+        return interactionId.toString();
     }
 
     // -- UTIL
@@ -370,15 +370,7 @@ private Optional<CommandRecord> commandRecord() {
     }
 
     Optional<CommandLogEntry> commandLogEntry() {
-        return replayContext.bookmarkService().lookup(commandLogEntryBookmark(), CommandLogEntry.class);
-    }
-
-    private Bookmark commandLogEntryBookmark() {
-        return replayContext.bookmarkService()
-            .bookmarkFor(CommandLogEntry.class, commandLogEntryId)
-            .orElseThrow(()->_Exceptions.unrecoverable(
-                    "framework error: cannot create bookmark for CommandLogEntry using id '%s'",
-                    commandLogEntryId));
+        return replayContext.commandLogEntryRepository().findByInteractionId(interactionId());
     }
 
     private static boolean canReplayOrRetryOrMarkForExclusion(final CommandLogEntry commandLogEntry) {