CAUSEWAY-3859: Java record refactoring (part 52)

apache · Feb 26, 2025 · 4063fb4 · 4063fb4
1 parent 78e5c48
commit 4063fb4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/...n/java/org/apache/causeway/viewer/wicket/model/models/interaction/HasBookmarkedOwner.java b/...n/java/org/apache/causeway/viewer/wicket/model/models/interaction/HasBookmarkedOwner.java
@@ -23,7 +23,14 @@
 
 public interface HasBookmarkedOwner {
 
-    Bookmark getOwnerBookmark();
-    ManagedObject getBookmarkedOwner();
+    BookmarkedObjectWkt bookmarkedObjectModel();
+
+    default Bookmark getOwnerBookmark() {
+        return bookmarkedObjectModel().bookmark();
+    }
+
+    default ManagedObject getBookmarkedOwner() {
+        return bookmarkedObjectModel().managedObject();
+    }
 
 }
diff --git a/...rg/apache/causeway/viewer/wicket/model/models/interaction/HasBookmarkedOwnerAbstract.java b/...rg/apache/causeway/viewer/wicket/model/models/interaction/HasBookmarkedOwnerAbstract.java
@@ -18,47 +18,38 @@
  */
 package org.apache.causeway.viewer.wicket.model.models.interaction;
 
+import org.apache.wicket.model.LoadableDetachableModel;
+
 import org.apache.causeway.applib.annotation.BookmarkPolicy;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.util.Facets;
-import org.apache.causeway.viewer.wicket.model.models.ModelAbstract;
 
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public abstract class HasBookmarkedOwnerAbstract<T>
-extends ModelAbstract<T>
+extends LoadableDetachableModel<T>
 implements
-    HasBookmarkedOwner {
+    HasBookmarkedOwner, HasMetaModelContext {
 
     private static final long serialVersionUID = 1L;
 
     final BookmarkedObjectWkt bookmarkedObject;
 
     @Override
-    public final Bookmark getOwnerBookmark() {
-        return bookmarkedObject.bookmark();
-    }
-
-    @Override
-    public final ManagedObject getBookmarkedOwner() {
-        return bookmarkedObject.managedObject();
-    }
-
     public final BookmarkedObjectWkt bookmarkedObjectModel() {
         return bookmarkedObject;
     }
 
+    public final ObjectSpecification getTypeOfSpecification() {
+        // serving this from a potentially unattached entity seems safe
+        return bookmarkedObjectModel().getObject().getSpecification();
+    }
+
     /** governs how to populate the BookmarkPanel in the UI */
     public final BookmarkPolicy getBookmarkPolicy() {
         return Facets.bookmarkPolicyOrElseNotSpecified(getTypeOfSpecification());
     }
 
-    public final ObjectSpecification getTypeOfSpecification() {
-        // serving this from a potentially unattached entity seems safe
-        return bookmarkedObject.getObject().getSpecification();
-    }
-
 }