You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/06/15 03:42:24 UTC

[causeway] branch 3486-hollow-entity-serialization updated: CAUSEWAY-3486: remove intermediate debug code

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch 3486-hollow-entity-serialization
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/3486-hollow-entity-serialization by this push:
     new a6eb213a18 CAUSEWAY-3486: remove intermediate debug code
a6eb213a18 is described below

commit a6eb213a1828d9595865ea9c21d9951660f2a737
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jun 15 05:42:19 2023 +0200

    CAUSEWAY-3486: remove intermediate debug code
---
 .../entities/DnObjectProviderForCauseway.java      |  124 +--
 .../entities/DnStateManagerForHollow.java          | 1178 +++-----------------
 .../metamodel/facets/entity/JdoEntityFacet.java    |   20 +-
 3 files changed, 217 insertions(+), 1105 deletions(-)

diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnObjectProviderForCauseway.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnObjectProviderForCauseway.java
index da49b52ae5..bdd0e19011 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnObjectProviderForCauseway.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnObjectProviderForCauseway.java
@@ -20,7 +20,6 @@ package org.apache.causeway.persistence.jdo.datanucleus.entities;
 
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.jdo.PersistenceManager;
 
@@ -36,34 +35,28 @@ import org.springframework.lang.Nullable;
 
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.context._Context;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
-import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.persistence.jdo.datanucleus.metamodel.facets.entity.JdoEntityFacet;
 import org.apache.causeway.persistence.jdo.spring.integration.TransactionAwarePersistenceManagerFactoryProxy;
 
-import lombok.SneakyThrows;
 import lombok.val;
+import lombok.extern.log4j.Log4j2;
 
 /**
  * Handles injection into JDO entities.
  * <p>
  * Installed via config property "datanucleus.objectProvider.className".
  */
-//@Log4j2
+@Log4j2
 public class DnObjectProviderForCauseway //TODO[CAUSEWAY-3486] rename to DnStateManagerForCauseway
 extends ReferentialStateManagerImpl {
 
-    private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(DnObjectProviderForCauseway.class);
-
     private Optional<MetaModelContext> mmcIfAny;
-    private Optional<EntityFacet> entityFacetIfAny;
 
     public DnObjectProviderForCauseway(final ExecutionContext ec, final AbstractClassMetaData cmd) {
         super(ec, cmd);
         this.mmcIfAny = extractMetaModelContextFrom(ec);
-        this.entityFacetIfAny = extractEntityFacet(cmd);
     }
 
     @SuppressWarnings("rawtypes")
@@ -71,7 +64,6 @@ extends ReferentialStateManagerImpl {
     public void initialiseForHollow(final Object id, final FieldValues fv, final Class pcClass) {
         super.initialiseForHollow(id, fv, pcClass);
         injectServicesIfNotAlready();
-        System.err.printf("initialiseForHollow %s%n", ""+id);
     }
 
     @SuppressWarnings({ "deprecation", "rawtypes" })
@@ -79,74 +71,68 @@ extends ReferentialStateManagerImpl {
     public void initialiseForHollowAppId(final FieldValues fv, final Class pcClass) {
         super.initialiseForHollowAppId(fv, pcClass);
         injectServicesIfNotAlready();
-        System.err.printf("initialiseForHollowAppId %n");
     }
 
     @Override
     public void initialiseForHollowPreConstructed(final Object id, final Persistable pc) {
         super.initialiseForHollowPreConstructed(id, pc);
         injectServicesIfNotAlready();
-
-        System.err.printf("initialiseForHollowPreConstructed %s%n", ""+id);
     }
 
     @Override
     public void initialiseForPersistentClean(final Object id, final Persistable pc) {
         super.initialiseForPersistentClean(id, pc);
         injectServicesIfNotAlready();
-
-        System.err.printf("initialiseForPersistentClean %s%n", ""+id);
     }
 
     @Override
     public void initialiseForEmbedded(final Persistable pc, final boolean copyPc) {
         super.initialiseForEmbedded(pc, copyPc);
         injectServicesIfNotAlready();
-        System.err.printf("initialiseForEmbedded %n");
     }
 
     @Override
     public void initialiseForPersistentNew(final Persistable pc, final FieldValues preInsertChanges) {
         super.initialiseForPersistentNew(pc, preInsertChanges);
         injectServicesIfNotAlready();
-
-        System.err.printf("initialiseForPersistentNew %s%n", ""+pc.dnGetObjectId());
     }
 
     @Override
     public void initialiseForTransactionalTransient(final Persistable pc) {
         super.initialiseForTransactionalTransient(pc);
         injectServicesIfNotAlready();
-
-        System.err.printf("initialiseForTransactionalTransient %s%n", ""+pc.dnGetObjectId());
     }
 
     @Override
     public void initialiseForDetached(final Persistable pc, final Object id, final Object version) {
         super.initialiseForDetached(pc, id, version);
         injectServicesIfNotAlready();
-        System.err.printf("initialiseForDetached %n");
     }
 
     @Override
     public void initialiseForPNewToBeDeleted(final Persistable pc) {
         super.initialiseForPNewToBeDeleted(pc);
         injectServicesIfNotAlready();
-        System.err.printf("initialiseForPNewToBeDeleted %n");
     }
 
     @Override
     public void initialiseForCachedPC(final CachedPC cachedPC, final Object id) {
         super.initialiseForCachedPC(cachedPC, id);
         injectServicesIfNotAlready();
-
-        System.err.printf("initialiseForCachedPC %s%n", ""+id);
     }
 
     @Override
-    public void clearNonPrimaryKeyFields() {
-        super.clearNonPrimaryKeyFields();
-        System.err.printf("clearNonPrimaryKeyFields %s%n", ""+myID);
+    public void disconnect() {
+        /* If a previously attached entity becomes hollow (or detached),
+         * we memoize the OID in the Persistable.dnStateManager field.
+         * Using a pseudo StateManager, that only acts as a holder of an OID. */
+        val entityPojo = myPC;
+        final Optional<DnStateManagerForHollow> smHollow = snapshotOid()
+                .map(DnStateManagerForHollow::new);
+
+        super.disconnect();
+        smHollow
+            .ifPresent(sm->replaceStateManager(entityPojo, sm));
     }
 
     // -- HELPER
@@ -169,34 +155,14 @@ extends ReferentialStateManagerImpl {
         }
 
         val mmc = (MetaModelContext)mmcValue;
-
         if(mmc.getServiceInjector() == null) {
-            log.error("could not find a usable ServiceInjector with given MetaModelContext");
+            log.error("could not find a usable ServiceInjector within given MetaModelContext");
             return Optional.empty();
         }
 
         return Optional.of(mmc);
     }
 
-    @Deprecated
-    static AtomicInteger ai2 = new AtomicInteger(0);
-
-    @SneakyThrows
-    private Optional<EntityFacet> extractEntityFacet(final AbstractClassMetaData cmd) {
-
-        final int count = ai2.incrementAndGet();
-        System.err.printf("new SM %d%n", count);
-
-        val entityType = _Context.loadClass(cmd.getFullClassName());
-
-        val entityFacet = mmcIfAny
-            .map(MetaModelContext::getSpecificationLoader)
-            .flatMap(specLoader->specLoader.specForType(entityType))
-            .flatMap(ObjectSpecification::entityFacet);
-
-        return entityFacet;
-    }
-
     private boolean injectionPointsResolved = false;
 
     /**
@@ -208,7 +174,6 @@ extends ReferentialStateManagerImpl {
             return true;
         }
         if(injectionPointsResolved) {
-            //XXX would be nice to count as a metric
             return true;
         }
 
@@ -226,53 +191,44 @@ extends ReferentialStateManagerImpl {
         return injectionPointsResolved;
     }
 
-    @Deprecated
-    static AtomicInteger ai = new AtomicInteger(0);
-
-    @Override
-    public void disconnect() {
-        //TODO[CAUSEWAY-3486] if a previously attached entity becomes hollow (or detached)
-        // we could enforce, that the caller creates a bookmark, before its too late
-
-        val entityPojo = myPC;
-        final Optional<DnStateManagerForHollow> smHollow = snapshotOid()
-                .map(oid->new DnStateManagerForHollow(cmd, oid));
-
-        final int count = ai.incrementAndGet();
-        System.err.printf("disconnect %d->%s%n", count, smHollow.map(sm->sm.oidStringified));
-
-        super.disconnect();
-        smHollow
-            .ifPresent(sm->replaceStateManager(entityPojo, sm));
-        flags = 0;
-    }
+    // -- SNAPSHOT OID
 
     private Optional<String> snapshotOid() {
-        if(super.myID==null
-                || entityFacetIfAny.isEmpty()) {
+        if(myID==null) {
             return Optional.empty();
         }
-
-        val entityFacet = (JdoEntityFacet)entityFacetIfAny.get();
-
         try {
             Object id = myPC.dnGetObjectId();
-            if (id != null && id instanceof SingleFieldId)
-            {
-                // Convert to javax.jdo.identity.*
-                id = DataNucleusHelperJDO.getSingleFieldIdentityForDataNucleusIdentity((SingleFieldId)id, myPC.getClass());
+            if(id==null) {
+                return Optional.empty();
             }
-            return entityFacet.identifierForDnPrimaryKey(id);
-
-
-            //return entityFacetIfAny.get().identifierFor(myPC);
+            val entityFacet = lookupEntityFacet().orElse(null);
+            if(entityFacet==null) {
+                return Optional.empty();
+            }
+            if (id instanceof SingleFieldId) {
+                id = DataNucleusHelperJDO
+                        .getSingleFieldIdentityForDataNucleusIdentity((SingleFieldId)id, myPC.getClass());
+            }
+            val oidIfAny = entityFacet.identifierForDnPrimaryKey(id);
+            return oidIfAny;
         } catch (Exception e) {
-            // TODO: handle exception
-
+            log.error("exception while trying to extract entity's current primary key", e);
             e.printStackTrace();
+            return Optional.empty();
+        }
+    }
 
+    private Optional<JdoEntityFacet> lookupEntityFacet() {
+        if(myPC==null) {
             return Optional.empty();
         }
+        val entityFacet = mmcIfAny
+            .map(MetaModelContext::getSpecificationLoader)
+            .flatMap(specLoader->specLoader.specForType(myPC.getClass()))
+            .flatMap(ObjectSpecification::entityFacet)
+            .flatMap(facet->_Casts.castTo(JdoEntityFacet.class, facet));
+        return entityFacet;
     }
 
     // -- [CAUSEWAY-3126] PRE-DIRTY NESTED LOOP PREVENTION
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnStateManagerForHollow.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnStateManagerForHollow.java
index ffc95f1551..7127ac8a09 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnStateManagerForHollow.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnStateManagerForHollow.java
@@ -47,1016 +47,176 @@ public class DnStateManagerForHollow implements DNStateManager<Persistable> {
 
     public final @NonNull String oidStringified;
 
-    public DnStateManagerForHollow(final AbstractClassMetaData cmd, final @NonNull String oidStringified) {
+    public DnStateManagerForHollow(final @NonNull String oidStringified) {
         this.oidStringified = oidStringified;
     }
 
-    @Override
-    public ExecutionContextReference getExecutionContextReference() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public byte replacingFlags(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public StateManager replacingStateManager(final Persistable pc, final StateManager sm) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean isDirty(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isTransactional(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isPersistent(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isNew(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isDeleted(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void makeDirty(final Persistable pc, final String fieldName) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Object getObjectId(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Object getTransactionalObjectId(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Object getVersion(final Persistable pc) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean isLoaded(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void preSerialize(final Persistable pc) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setBooleanField(final Persistable pc, final int field, final boolean currentValue, final boolean newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setCharField(final Persistable pc, final int field, final char currentValue, final char newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setByteField(final Persistable pc, final int field, final byte currentValue, final byte newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setShortField(final Persistable pc, final int field, final short currentValue, final short newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setIntField(final Persistable pc, final int field, final int currentValue, final int newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setLongField(final Persistable pc, final int field, final long currentValue, final long newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setFloatField(final Persistable pc, final int field, final float currentValue, final float newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setDoubleField(final Persistable pc, final int field, final double currentValue, final double newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setStringField(final Persistable pc, final int field, final String currentValue, final String newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setObjectField(final Persistable pc, final int field, final Object currentValue, final Object newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedBooleanField(final Persistable pc, final int field, final boolean currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedCharField(final Persistable pc, final int field, final char currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedByteField(final Persistable pc, final int field, final byte currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedShortField(final Persistable pc, final int field, final short currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedIntField(final Persistable pc, final int field, final int currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedLongField(final Persistable pc, final int field, final long currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedFloatField(final Persistable pc, final int field, final float currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedDoubleField(final Persistable pc, final int field, final double currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedStringField(final Persistable pc, final int field, final String currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void providedObjectField(final Persistable pc, final int field, final Object currentValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean replacingBooleanField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public char replacingCharField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public byte replacingByteField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public short replacingShortField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int replacingIntField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public long replacingLongField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public float replacingFloatField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public double replacingDoubleField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public String replacingStringField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Object replacingObjectField(final Persistable pc, final int field) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Object[] replacingDetachedState(final Detachable pc, final Object[] state) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void connect(final ExecutionContext ec, final AbstractClassMetaData cmd) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void disconnect() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean isConnected() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void initialiseForHollow(final Object id, final FieldValues fv, final Class<Persistable> pcClass) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForHollowAppId(final FieldValues fv, final Class<Persistable> pcClass) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForHollowPreConstructed(final Object id, final Persistable pc) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForPersistentClean(final Object id, final Persistable pc) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForEmbedded(final Persistable pc, final boolean copyPc) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForEmbedded(final Class<Persistable> pcClass) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForPersistentNew(final Persistable pc, final FieldValues preInsertChanges) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForTransactionalTransient(final Persistable pc) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForDetached(final Persistable pc, final Object id, final Object version) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForPNewToBeDeleted(final Persistable pc) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void initialiseForCachedPC(final CachedPC cachedPC, final Object id) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public AbstractClassMetaData getClassMetaData() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public ExecutionContext getExecutionContext() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public StoreManager getStoreManager() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public FetchPlanForClass getFetchPlanForClass() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Persistable getObject() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public String getObjectAsPrintable() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Object getInternalObjectId() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Object getExternalObjectId() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public LifeCycleState getLifecycleState() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void replaceField(final int fieldNumber, final Object value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void replaceFieldMakeDirty(final int fieldNumber, final Object value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void replaceFieldValue(final int fieldNumber, final Object newValue) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void replaceFields(final int[] fieldNumbers, final FieldManager fm) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void replaceFields(final int[] fieldNumbers, final FieldManager fm, final boolean replaceWhenDirty) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void replaceNonLoadedFields(final int[] fieldNumbers, final FieldManager fm) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void replaceAllLoadedSCOFieldsWithWrappers() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void replaceAllLoadedSCOFieldsWithValues() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void provideFields(final int[] fieldNumbers, final FieldManager fm) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Object provideField(final int fieldNumber) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void setAssociatedValue(final Object key, final Object value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Object getAssociatedValue(final Object key) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean containsAssociatedValue(final Object key) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void removeAssociatedValue(final Object key) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public int[] getDirtyFieldNumbers() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public String[] getDirtyFieldNames() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean[] getDirtyFields() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void makeDirty(final int field) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean isEmbedded() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void updateOwnerFieldInEmbeddedField(final int fieldNumber, final Object value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setStoringPC() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void unsetStoringPC() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setInserting() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setInsertingCallbacks() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean isFlushedToDatastore() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isFlushedNew() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void setFlushedNew(final boolean flag) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void flush() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setFlushing(final boolean flushing) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void markAsFlushed() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void locate() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean isWaitingToBeFlushedToDatastore() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isInserting() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isDeleting() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean becomingDeleted() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isDeleted() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isDetaching() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void loadFieldValues(final FieldValues fv) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Persistable getReferencedPC() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void loadField(final int fieldNumber) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean loadStoredField(final int fieldNumber) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void storeFieldValue(final int fieldNumber, final Object value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void loadFieldsInFetchPlan(final FetchPlanState state) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void loadFieldFromDatastore(final int fieldNumber) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void loadUnloadedFieldsInFetchPlan() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void loadUnloadedFieldsOfClassInFetchPlan(final FetchPlan fetchPlan) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void loadUnloadedRelationFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void loadUnloadedFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void unloadField(final int fieldNumber) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void unloadNonFetchPlanFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void refreshLoadedFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void refreshFieldsInFetchPlan() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void clearNonPrimaryKeyFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void restoreFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void saveFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void clearSavedFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void clearFields() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void registerTransactional() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean isRestoreValues() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void clearLoadedFlags() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean[] getLoadedFields() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public int[] getLoadedFieldNumbers() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public String[] getLoadedFieldNames() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean isLoaded(final int fieldNumber) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean getAllFieldsLoaded() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean isFieldLoaded(final int fieldNumber) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void updateFieldAfterInsert(final Object pc, final int fieldNumber) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setPostStoreNewObjectId(final Object id) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void replaceManagedPC(final Persistable pc) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setTransactionalVersion(final Object nextVersion) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Object getTransactionalVersion() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void setVersion(final Object version) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Object getVersion() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean isVersionLoaded() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void evictFromTransaction() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void enlistInTransaction() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void makeTransactional() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void makeNontransactional() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void makeTransient(final FetchPlanState state) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void makeTransientForReachability() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void makePersistent() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void makePersistentTransactionalTransient() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void deletePersistent() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Persistable attachCopy(final Persistable detachedPC, final boolean embedded) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void attach(final boolean embedded) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void attach(final Persistable detachedPC) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Persistable detachCopy(final FetchPlanState state) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void detach(final FetchPlanState state) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void validate() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void markForInheritanceValidation() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void evict() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void refresh() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void retrieve(final boolean fgOnly) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void preBegin(final Transaction tx) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void postCommit(final Transaction tx) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void preRollback(final Transaction tx) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void resetDetachState() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void retrieveDetachState(final DNStateManager sm) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void checkInheritance(final FieldValues fv) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void markFieldsAsLoaded(final int[] fieldNumbers) {
-        // TODO Auto-generated method stub
-
-    }
-
+    @Override public ExecutionContextReference getExecutionContextReference() { return null;}
+    @Override public byte replacingFlags(final Persistable pc) { return 0;}
+    @Override public StateManager replacingStateManager(final Persistable pc, final StateManager sm) { return null;}
+    @Override public boolean isDirty(final Persistable pc) { return false;}
+    @Override public boolean isTransactional(final Persistable pc) { return false;}
+    @Override public boolean isPersistent(final Persistable pc) { return false;}
+    @Override public boolean isNew(final Persistable pc) { return false;}
+    @Override public boolean isDeleted(final Persistable pc) { return false;}
+    @Override public void makeDirty(final Persistable pc, final String fieldName) { }
+    @Override public Object getObjectId(final Persistable pc) { return null;}
+    @Override public Object getTransactionalObjectId(final Persistable pc) { return null;}
+    @Override public Object getVersion(final Persistable pc) { return null;}
+    @Override public boolean isLoaded(final Persistable pc, final int field) { return false;}
+    @Override public void preSerialize(final Persistable pc) { }
+    @Override public void setBooleanField(final Persistable pc, final int field, final boolean currentValue, final boolean newValue) { }
+    @Override public void setCharField(final Persistable pc, final int field, final char currentValue, final char newValue) { }
+    @Override public void setByteField(final Persistable pc, final int field, final byte currentValue, final byte newValue) { }
+    @Override public void setShortField(final Persistable pc, final int field, final short currentValue, final short newValue) { }
+    @Override public void setIntField(final Persistable pc, final int field, final int currentValue, final int newValue) { }
+    @Override public void setLongField(final Persistable pc, final int field, final long currentValue, final long newValue) { }
+    @Override public void setFloatField(final Persistable pc, final int field, final float currentValue, final float newValue) { }
+    @Override public void setDoubleField(final Persistable pc, final int field, final double currentValue, final double newValue) { }
+    @Override public void setStringField(final Persistable pc, final int field, final String currentValue, final String newValue) { }
+    @Override public void setObjectField(final Persistable pc, final int field, final Object currentValue, final Object newValue) { }
+    @Override public void providedBooleanField(final Persistable pc, final int field, final boolean currentValue) { }
+    @Override public void providedCharField(final Persistable pc, final int field, final char currentValue) { }
+    @Override public void providedByteField(final Persistable pc, final int field, final byte currentValue) { }
+    @Override public void providedShortField(final Persistable pc, final int field, final short currentValue) { }
+    @Override public void providedIntField(final Persistable pc, final int field, final int currentValue) { }
+    @Override public void providedLongField(final Persistable pc, final int field, final long currentValue) { }
+    @Override public void providedFloatField(final Persistable pc, final int field, final float currentValue) { }
+    @Override public void providedDoubleField(final Persistable pc, final int field, final double currentValue) { }
+    @Override public void providedStringField(final Persistable pc, final int field, final String currentValue) { }
+    @Override public void providedObjectField(final Persistable pc, final int field, final Object currentValue) { }
+    @Override public boolean replacingBooleanField(final Persistable pc, final int field) { return false;}
+    @Override public char replacingCharField(final Persistable pc, final int field) { return 0;}
+    @Override public byte replacingByteField(final Persistable pc, final int field) { return 0;}
+    @Override public short replacingShortField(final Persistable pc, final int field) { return 0;}
+    @Override public int replacingIntField(final Persistable pc, final int field) { return 0;}
+    @Override public long replacingLongField(final Persistable pc, final int field) { return 0;}
+    @Override public float replacingFloatField(final Persistable pc, final int field) { return 0;}
+    @Override public double replacingDoubleField(final Persistable pc, final int field) { return 0;}
+    @Override public String replacingStringField(final Persistable pc, final int field) { return null;}
+    @Override public Object replacingObjectField(final Persistable pc, final int field) { return null;}
+    @Override public Object[] replacingDetachedState(final Detachable pc, final Object[] state) { return null;}
+    @Override public void connect(final ExecutionContext ec, final AbstractClassMetaData cmd) { }
+    @Override public void disconnect() { }
+    @Override public boolean isConnected() { return false;}
+    @Override public void initialiseForHollow(final Object id, final FieldValues fv, final Class<Persistable> pcClass) { }
+    @Override public void initialiseForHollowAppId(final FieldValues fv, final Class<Persistable> pcClass) { }
+    @Override public void initialiseForHollowPreConstructed(final Object id, final Persistable pc) { }
+    @Override public void initialiseForPersistentClean(final Object id, final Persistable pc) { }
+    @Override public void initialiseForEmbedded(final Persistable pc, final boolean copyPc) { }
+    @Override public void initialiseForEmbedded(final Class<Persistable> pcClass) { }
+    @Override public void initialiseForPersistentNew(final Persistable pc, final FieldValues preInsertChanges) { }
+    @Override public void initialiseForTransactionalTransient(final Persistable pc) { }
+    @Override public void initialiseForDetached(final Persistable pc, final Object id, final Object version) { }
+    @Override public void initialiseForPNewToBeDeleted(final Persistable pc) { }
+    @Override public void initialiseForCachedPC(final CachedPC cachedPC, final Object id) { }
+    @Override public AbstractClassMetaData getClassMetaData() { return null;}
+    @Override public ExecutionContext getExecutionContext() { return null;}
+    @Override public StoreManager getStoreManager() { return null;}
+    @Override public FetchPlanForClass getFetchPlanForClass() { return null;}
+    @Override public Persistable getObject() { return null;}
+    @Override public String getObjectAsPrintable() { return null;}
+    @Override public Object getInternalObjectId() { return null;}
+    @Override public Object getExternalObjectId() { return null;}
+    @Override public LifeCycleState getLifecycleState() { return null;}
+    @Override public void replaceField(final int fieldNumber, final Object value) { }
+    @Override public void replaceFieldMakeDirty(final int fieldNumber, final Object value) { }
+    @Override public void replaceFieldValue(final int fieldNumber, final Object newValue) { }
+    @Override public void replaceFields(final int[] fieldNumbers, final FieldManager fm) { }
+    @Override public void replaceFields(final int[] fieldNumbers, final FieldManager fm, final boolean replaceWhenDirty) { }
+    @Override public void replaceNonLoadedFields(final int[] fieldNumbers, final FieldManager fm) { }
+    @Override public void replaceAllLoadedSCOFieldsWithWrappers() { }
+    @Override public void replaceAllLoadedSCOFieldsWithValues() { }
+    @Override public void provideFields(final int[] fieldNumbers, final FieldManager fm) { }
+    @Override public Object provideField(final int fieldNumber) { return null;}
+    @Override public void setAssociatedValue(final Object key, final Object value) { }
+    @Override public Object getAssociatedValue(final Object key) { return null;}
+    @Override public boolean containsAssociatedValue(final Object key) { return false;}
+    @Override public void removeAssociatedValue(final Object key) { }
+    @Override public int[] getDirtyFieldNumbers() { return null;}
+    @Override public String[] getDirtyFieldNames() { return null;}
+    @Override public boolean[] getDirtyFields() { return null;}
+    @Override public void makeDirty(final int field) { }
+    @Override public boolean isEmbedded() { return false;}
+    @Override public void updateOwnerFieldInEmbeddedField(final int fieldNumber, final Object value) { }
+    @Override public void setStoringPC() { }
+    @Override public void unsetStoringPC() { }
+    @Override public void setInserting() { }
+    @Override public void setInsertingCallbacks() { }
+    @Override public boolean isFlushedToDatastore() { return false;}
+    @Override public boolean isFlushedNew() { return false;}
+    @Override public void setFlushedNew(final boolean flag) { }
+    @Override public void flush() { }
+    @Override public void setFlushing(final boolean flushing) { }
+    @Override public void markAsFlushed() { }
+    @Override public void locate() { }
+    @Override public boolean isWaitingToBeFlushedToDatastore() { return false;}
+    @Override public boolean isInserting() { return false;}
+    @Override public boolean isDeleting() { return false;}
+    @Override public boolean becomingDeleted() { return false;}
+    @Override public boolean isDeleted() { return false;}
+    @Override public boolean isDetaching() { return false;}
+    @Override public void loadFieldValues(final FieldValues fv) { }
+    @Override public Persistable getReferencedPC() { return null;}
+    @Override public void loadField(final int fieldNumber) { }
+    @Override public boolean loadStoredField(final int fieldNumber) { return false;}
+    @Override public void storeFieldValue(final int fieldNumber, final Object value) { }
+    @Override public void loadFieldsInFetchPlan(final FetchPlanState state) { }
+    @Override public void loadFieldFromDatastore(final int fieldNumber) { }
+    @Override public void loadUnloadedFieldsInFetchPlan() { }
+    @Override public void loadUnloadedFieldsOfClassInFetchPlan(final FetchPlan fetchPlan) { }
+    @Override public void loadUnloadedRelationFields() { }
+    @Override public void loadUnloadedFields() { }
+    @Override public void unloadField(final int fieldNumber) { }
+    @Override public void unloadNonFetchPlanFields() { }
+    @Override public void refreshLoadedFields() { }
+    @Override public void refreshFieldsInFetchPlan() { }
+    @Override public void clearNonPrimaryKeyFields() { }
+    @Override public void restoreFields() { }
+    @Override public void saveFields() { }
+    @Override public void clearSavedFields() { }
+    @Override public void clearFields() { }
+    @Override public void registerTransactional() { }
+    @Override public boolean isRestoreValues() { return false;}
+    @Override public void clearLoadedFlags() { }
+    @Override public boolean[] getLoadedFields() { return null;}
+    @Override public int[] getLoadedFieldNumbers() { return null;}
+    @Override public String[] getLoadedFieldNames() { return null;}
+    @Override public boolean isLoaded(final int fieldNumber) { return false;}
+    @Override public boolean getAllFieldsLoaded() { return false;}
+    @Override public boolean isFieldLoaded(final int fieldNumber) { return false;}
+    @Override public void updateFieldAfterInsert(final Object pc, final int fieldNumber) { }
+    @Override public void setPostStoreNewObjectId(final Object id) { }
+    @Override public void replaceManagedPC(final Persistable pc) { }
+    @Override public void setTransactionalVersion(final Object nextVersion) { }
+    @Override public Object getTransactionalVersion() { return null;}
+    @Override public void setVersion(final Object version) { }
+    @Override public Object getVersion() { return null;}
+    @Override public boolean isVersionLoaded() { return false;}
+    @Override public void evictFromTransaction() { }
+    @Override public void enlistInTransaction() { }
+    @Override public void makeTransactional() { }
+    @Override public void makeNontransactional() { }
+    @Override public void makeTransient(final FetchPlanState state) { }
+    @Override public void makeTransientForReachability() { }
+    @Override public void makePersistent() { }
+    @Override public void makePersistentTransactionalTransient() { }
+    @Override public void deletePersistent() { }
+    @Override public Persistable attachCopy(final Persistable detachedPC, final boolean embedded) { return null;}
+    @Override public void attach(final boolean embedded) { }
+    @Override public void attach(final Persistable detachedPC) { }
+    @Override public Persistable detachCopy(final FetchPlanState state) { return null;}
+    @Override public void detach(final FetchPlanState state) { }
+    @Override public void validate() { }
+    @Override public void markForInheritanceValidation() { }
+    @Override public void evict() { }
+    @Override public void refresh() { }
+    @Override public void retrieve(final boolean fgOnly) { }
+    @Override public void preBegin(final Transaction tx) { }
+    @Override public void postCommit(final Transaction tx) { }
+    @Override public void preRollback(final Transaction tx) { }
+    @Override public void resetDetachState() { }
+    @Override public void retrieveDetachState(final DNStateManager sm) { }
+    @Override public void checkInheritance(final FieldValues fv) { }
+    @Override public void markFieldsAsLoaded(final int[] fieldNumbers) { }
 }
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index 0233f2eb25..58b6e1947f 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -32,6 +32,7 @@ import javax.jdo.PersistenceManager;
 import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
 import org.datanucleus.enhancement.Persistable;
 import org.datanucleus.store.rdbms.RDBMSPropertyNames;
+import org.springframework.lang.Nullable;
 
 import org.apache.causeway.applib.exceptions.unrecoverable.ObjectNotFoundException;
 import org.apache.causeway.applib.query.AllInstancesQuery;
@@ -152,23 +153,18 @@ implements EntityFacet {
         }
 
         val pm = getPersistenceManager();
-        var primaryKeyIfAny = Optional.ofNullable(pm.getObjectId(pojo));
+        val primaryKey = pm.getObjectId(pojo);
 
-        _Assert.assertTrue(primaryKeyIfAny.isPresent(), ()->
+        _Assert.assertNotNull(primaryKey, ()->
             String.format("failed to get OID even though entity is attached %s", pojo.getClass().getName()));
 
-        val idIfAny = primaryKeyIfAny
-                .map(primaryKey->
-                    primaryKeyTypeForEncoding(primaryKey).enstringWithCast(primaryKey));
-        return idIfAny;
+        return identifierForDnPrimaryKey(primaryKey);
     }
 
-    //TODO[CAUSEWAY-3486] code deduplicate
-    public Optional<String> identifierForDnPrimaryKey(final Object id) {
-        var primaryKeyIfAny = Optional.ofNullable(id);
-        val idIfAny = primaryKeyIfAny
-                .map(primaryKey->
-                    primaryKeyTypeForEncoding(primaryKey).enstringWithCast(primaryKey));
+    public Optional<String> identifierForDnPrimaryKey(final @Nullable Object primaryKey) {
+        val idIfAny = Optional.ofNullable(primaryKey)
+                .map(pk->
+                    primaryKeyTypeForEncoding(pk).enstringWithCast(pk));
         return idIfAny;
     }