CAUSEWAY-2297: removes _Recreatable

core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/ObjectMemento.java

@@ -29,16 +29,34 @@
 import org.apache.causeway.applib.id.HasLogicalType;
 import org.apache.causeway.applib.id.LogicalType;
 import org.apache.causeway.applib.services.bookmark.BookmarkHolder;
+import org.apache.causeway.applib.services.bookmark.Oid;
 import org.apache.causeway.commons.internal.base._Bytes;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.commons.internal.collections._Lists;
 import org.apache.causeway.commons.internal.resources._Serializables;
+import org.apache.causeway.core.metamodel.facets.object.value.ValueFacet;
 import org.apache.causeway.core.metamodel.object.ManagedObject;
 
 /**
  * @since 2.0
  */
-public interface ObjectMemento extends BookmarkHolder, HasLogicalType, Serializable {
+public sealed interface ObjectMemento
+extends BookmarkHolder, HasLogicalType, Serializable
+permits ObjectMementoForEmpty, ObjectMementoForScalar, ObjectMementoCollection {
+
+    enum RecreateStrategy {
+        /**
+         * The {@link ManagedObject} that this is the memento for, directly has
+         * an {@link ValueFacet} (it is almost certainly a value), and so is
+         * stored directly.
+         */
+        VALUE,
+        /**
+         * The {@link ManagedObject} that this is for, is already known by its
+         * (persistent) {@link Oid}.
+         */
+        LOOKUP;
+    }
 
     /** arbitrary/random string */
     static final String NULL_ID = "VGN6r6zKTiLhUsA0WkdQ17LvMU1IYdb0";

core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/ObjectMementoForEmpty.java

@@ -33,7 +33,7 @@
  */
 @ToString
 @RequiredArgsConstructor
-public class ObjectMementoForEmpty implements ObjectMemento {
+public final class ObjectMementoForEmpty implements ObjectMemento {
 
     private static final long serialVersionUID = 1L;
 

core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/ObjectMementoForScalar.java

@@ -62,7 +62,7 @@ static ObjectMementoForScalar createPersistent(
 
     @Getter(onMethod_ = {@Override}) final LogicalType logicalType;
 
-    _Recreatable.RecreateStrategy recreateStrategy;
+    ObjectMemento.RecreateStrategy recreateStrategy;
 
     @Getter(onMethod_ = {@Override}) private final String title;
     @Getter final Bookmark bookmark;
@@ -86,8 +86,8 @@ private ObjectMementoForScalar(
         this.title = "?memento?"; // TODO can we do better?
 
         this.recreateStrategy = spec.isValue()
-                ? _Recreatable.RecreateStrategy.VALUE
-                : _Recreatable.RecreateStrategy.LOOKUP;
+                ? RecreateStrategy.VALUE
+                : RecreateStrategy.LOOKUP;
     }
 
     private ObjectMementoForScalar(final @NonNull ManagedObject adapter) {
@@ -109,13 +109,13 @@ private ObjectMementoForScalar(final @NonNull ManagedObject adapter) {
                         ? bookmark.withHintId(hintId)
                         : bookmark;
 
-            recreateStrategy = _Recreatable.RecreateStrategy.LOOKUP;
+            recreateStrategy = RecreateStrategy.LOOKUP;
             return;
         }
 
         if (spec.isValue()) {
             bookmark = ManagedObjects.bookmarkElseFail(adapter);
-            recreateStrategy = _Recreatable.RecreateStrategy.VALUE;
+            recreateStrategy = RecreateStrategy.VALUE;
             return;
         }
 
@@ -141,20 +141,20 @@ public ManagedObject reconstructObject(final MetaModelContext mmc) {
             return spec.getMetaModelContext().lookupServiceAdapterById(getLogicalTypeName());
         }
 
-        return recreateStrategy.recreateObject(this, mmc);
+        return mmc.getObjectManager().loadObjectElseFail(bookmark);
     }
 
     @Override
     public int hashCode() {
-        return recreateStrategy.hashCode(this);
+        return bookmark.hashCode();
     }
 
     @Override
-    public boolean equals(final Object other) {
-        if (!(other instanceof ObjectMementoForScalar)) {
-            return false;
-        }
-        return recreateStrategy.equals(this, (ObjectMementoForScalar) other);
+    public boolean equals(final Object o) {
+        return (o instanceof ObjectMementoForScalar other)
+                ? this.recreateStrategy == other.recreateStrategy
+                    && this.bookmark.equals(other.bookmark)
+                : false;
     }
 
 }