You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/02/21 11:35:58 UTC

[isis] branch master updated: ISIS-2294: fixes regression (regard oids immutable once fetched for entities)

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 856f468  ISIS-2294: fixes regression (regard oids immutable once fetched for entities)
856f468 is described below

commit 856f46804f620558dbcb29597bd1d2a2a4e653bf
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Feb 21 12:35:42 2020 +0100

    ISIS-2294: fixes regression (regard oids immutable once fetched for
    entities)
---
 .../actions/action/invocation/CommandUtil.java     |   4 +-
 .../identify/ObjectIdentifier_builtinHandlers.java |   6 +-
 .../isis/core/metamodel/spec/ManagedObject.java    | 115 +++++++++++++--------
 .../metamodel/spec/ManagedObjectInternalUtil.java  |  43 ++++++++
 .../core/metamodel/util/snapshot/XmlSnapshot.java  |   4 +-
 .../transaction/AdapterAndProperty.java            |   3 +-
 .../transaction/ChangedObjectsService.java         |   8 ++
 .../command/CommandDtoServiceInternalDefault.java  |   4 +-
 .../publish/PublishedObjectsDefault.java           |  28 ++---
 .../ui/component/EventProviderAbstract.java        |   2 +-
 .../JdoPersistenceCapableFacetImpl.java            |  17 +--
 .../datanucleus5/objectadapter/PojoAdapter.java    |  11 ++
 .../persistence/IsisPersistenceSessionJdoBase.java |   3 +-
 .../persistence/IsisTransactionJdo.java            |   2 +
 .../domainobjects/DomainObjectReprRenderer.java    |   2 +-
 .../viewer/context/ResourceContext.java            |   6 +-
 .../viewer/wicket/model/models/ActionModel.java    |   9 +-
 .../wicket/model/models/BookmarkTreeNode.java      |   2 +-
 .../viewer/wicket/model/models/EntityModel.java    |   8 +-
 .../components/tree/IsisToWicketTreeAdapter.java   |   5 +-
 .../ui/components/unknown/UnknownModelPanel.java   |   2 +-
 .../integration/ConverterForObjectAdapter.java     |   7 +-
 .../ConverterForObjectAdapterMemento.java          |   3 +-
 .../services/mementos/ObjectMementoLegacy.java     |   7 +-
 24 files changed, 201 insertions(+), 100 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java
index a5ed88e..1815530 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java
@@ -84,8 +84,8 @@ public class CommandUtil {
     }
 
     public static Bookmark bookmarkFor(final ManagedObject adapter) {
-        val rootOid = ManagedObject._identify(adapter);
-        return rootOid!=null ? rootOid.asBookmark() : null;
+        return ManagedObject.bookmark(adapter)
+                .orElse(null);
     }
 
     static void appendParamArg(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index e93df65..6edc8d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -77,9 +77,13 @@ class ObjectIdentifier_builtinHandlers {
         public RootOid handle(ManagedObject managedObject) {
             val spec = managedObject.getSpecification();
             val pojo = managedObject.getPojo();
+            if(pojo==null) {
+                val msg = String.format("entity '%s' is null, cannot identify", managedObject);
+                throw _Exceptions.unrecoverable(msg);
+            }
             val entityFacet = spec.getFacet(EntityFacet.class);
             if(entityFacet==null) {
-                val msg = String.format("entity '%s' has not EntityFacet associated", managedObject);
+                val msg = String.format("entity '%s' has no EntityFacet associated", managedObject);
                 throw _Exceptions.unrecoverable(msg);
             }
             val identifier = entityFacet.identifierFor(spec, pojo);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
index 9515172..b2fba77 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
@@ -26,6 +26,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -35,6 +36,7 @@ import javax.annotation.Nullable;
 
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.domain.DomainObjectList;
+import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.repository.EntityState;
 import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.core.commons.internal.base._NullSafe;
@@ -48,7 +50,6 @@ import org.apache.isis.core.metamodel.commons.ClassExtensions;
 import org.apache.isis.core.metamodel.commons.MethodExtensions;
 import org.apache.isis.core.metamodel.commons.MethodUtil;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
 import org.apache.isis.core.metamodel.interactions.InteractionUtils;
@@ -87,6 +88,71 @@ public interface ManagedObject {
      * represents with the framework.
      */
     Object getPojo();
+    
+    /**
+     * Returns the object id as identified by the ObjectManager. 
+     * Entity IDs are considered immutable, hence will be memoized once fetched.
+     */
+    Optional<RootOid> getRootOid();
+    
+    // -- SHORTCUTS
+    
+    static Optional<RootOid> identify(@Nullable ManagedObject adapter) {
+        return adapter!=null ? adapter.getRootOid() : Optional.empty(); 
+    }
+    
+    static RootOid identifyElseFail(@Nullable ManagedObject adapter) {
+        return identify(adapter)
+                .orElseThrow(()->_Exceptions.illegalArgument("cannot identify %s", adapter));
+    }
+    
+    static Optional<Bookmark> bookmark(@Nullable ManagedObject adapter) {
+        return identify(adapter)
+                .map(RootOid::asBookmark);
+    }
+    
+    static Bookmark bookmarkElseFail(@Nullable ManagedObject adapter) {
+        return bookmark(adapter)
+                .orElseThrow(()->_Exceptions.illegalArgument("cannot bookmark %s", adapter));
+    }
+    
+    static Optional<String> stringify(@Nullable ManagedObject adapter) {
+        return identify(adapter)
+                .map(RootOid::enString);
+    }
+    
+    static String stringifyElseFail(@Nullable ManagedObject adapter) {
+        return stringify(adapter)
+                .orElseThrow(()->_Exceptions.illegalArgument("cannot stringify %s", adapter));
+    }
+    
+    
+    // -- EMPTY
+    
+    static class EmptyUtil {
+        private static final ManagedObject EMPTY = new ManagedObject() {
+
+            @Override
+            public ObjectSpecification getSpecification() {
+                throw _Exceptions.unsupportedOperation();
+            }
+
+            @Override
+            public Object getPojo() {
+                return null;
+            }
+
+            @Override
+            public Optional<RootOid> getRootOid() {
+                return Optional.empty();
+            }
+            
+        };
+    }
+    
+    static ManagedObject empty() {
+        return EmptyUtil.EMPTY;
+    }
 
     // -- SIMPLE
 
@@ -94,6 +160,9 @@ public interface ManagedObject {
     static final class SimpleManagedObject implements ManagedObject {
         @NonNull private final ObjectSpecification specification;
         @NonNull private final Object pojo;
+        
+        @Getter(lazy=true, onMethod = @__(@Override)) 
+        private final Optional<RootOid> rootOid = Optional.ofNullable(ManagedObjectInternalUtil._identify(this));
     }
 
     // -- LAZY
@@ -104,6 +173,9 @@ public interface ManagedObject {
         @NonNull private final Function<Class<?>, ObjectSpecification> specLoader;  
 
         @Getter @NonNull private final Object pojo;
+        
+        @Getter(lazy=true, onMethod = @__(@Override)) 
+        private final Optional<RootOid> rootOid = Optional.ofNullable(ManagedObjectInternalUtil._identify(this));
 
         @Getter(lazy=true) 
         private final ObjectSpecification specification = specLoader.apply(pojo.getClass());
@@ -639,29 +711,8 @@ public interface ManagedObject {
     
     // -- DEPRECATIONS (REFACTORING)
 
-    static MetaModelContext _mmc(ManagedObject adapter) {
-        return adapter.getSpecification().getMetaModelContext();
-    }
-
-    static RootOid _identify(ManagedObject adapter) {
-        return _mmc(adapter).getObjectManager().identifyObject(adapter); 
-    }
-
-    static RootOid _identifyElseThrow(ManagedObject adapter) {
-        try {
-            val rootOid = _identify(adapter);
-            if(rootOid!=null){
-                return rootOid; 
-            }
-        } catch (Exception e) {
-            throw new IllegalArgumentException(
-                    "ManagedObject must represent an identifiable object: " + adapter, e);
-        }
-        throw new IllegalArgumentException("ManagedObject must represent an identifiable object: " + adapter);
-    }
-    
     static String _instanceId(ManagedObject adapter) {
-        val identifier = ManagedObject._identifyElseThrow(adapter).getIdentifier();
+        val identifier = identifyElseFail(adapter).getIdentifier();
         return identifier; 
     }
     
@@ -794,25 +845,7 @@ public interface ManagedObject {
         return adapter.getSpecification().getBeanSort().isCollection();
     }
 
-    static class EmptyUtil {
-        private static final ManagedObject EMPTY = new ManagedObject() {
 
-            @Override
-            public ObjectSpecification getSpecification() {
-                throw _Exceptions.unsupportedOperation();
-            }
-
-            @Override
-            public Object getPojo() {
-                return null;
-            }
-            
-        };
-    }
-    
-    static ManagedObject empty() {
-        return EmptyUtil.EMPTY;
-    }
 
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectInternalUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectInternalUtil.java
new file mode 100644
index 0000000..a5cb1be
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectInternalUtil.java
@@ -0,0 +1,43 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.spec;
+
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.context.MetaModelContext;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * @since 2.0
+ */
+@UtilityClass
+class ManagedObjectInternalUtil {
+
+    // -- INTERNAL
+
+    static MetaModelContext _mmc(ManagedObject adapter) {
+        return adapter.getSpecification().getMetaModelContext();
+    }
+
+    static RootOid _identify(ManagedObject adapter) {
+        return _mmc(adapter).getObjectManager().identifyObject(adapter); 
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
index 2dae09b..f85b5db 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
@@ -50,7 +50,6 @@ import org.apache.isis.applib.snapshot.SnapshottableWithInclusions;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.internal.codec._DocumentFactories;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
@@ -858,7 +857,8 @@ public class XmlSnapshot implements Snapshot {
             }
             return fakeOid;
         } else {
-            return ManagedObject._identify(adapter).enString();
+            return ManagedObject.stringify(adapter)
+                    .orElse(null);
         }
     }
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
index 9f2cf8b..3fab8f2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
@@ -51,8 +51,7 @@ public class AdapterAndProperty {
         this.property = property;
         this.propertyId = property.getId();
 
-        val oid = ManagedObject._identify(adapter);
-        this.bookmark = oid.asBookmark();
+        this.bookmark = ManagedObject.bookmark(adapter).orElse(null);
         this.bookmarkStr = bookmark.toString();
         
     }
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
index 56f51d3..5c60011 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
@@ -37,6 +37,7 @@ import org.apache.isis.applib.services.HasUniqueId;
 import org.apache.isis.applib.services.WithTransactionScope;
 import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -239,6 +240,13 @@ public class ChangedObjectsService implements WithTransactionScope {
     }
 
     protected boolean shouldIgnore(final ManagedObject adapter) {
+        
+        if(adapter.getPojo()==null) {
+            throw _Exceptions.illegalArgument("!!! cannot reference null");
+        }
+        
+        System.out.println("enlist " + Integer.toHexString(adapter.hashCode()));
+        
         final ObjectSpecification adapterSpec = adapter.getSpecification();
         final Class<?> adapterClass = adapterSpec.getCorrespondingClass();
         return HasUniqueId.class.isAssignableFrom(adapterClass);
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
index 6b23b67..2e2cf8b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
@@ -36,7 +36,6 @@ import org.apache.isis.applib.services.command.Command;
 import org.apache.isis.applib.services.command.CommandContext;
 import org.apache.isis.applib.util.schema.CommandDtoUtils;
 import org.apache.isis.applib.util.schema.CommonDtoUtils;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
 import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
 import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
@@ -108,8 +107,7 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
         dto.setTransactionId(transactionId);
 
         for (val targetAdapter : targetAdapters) {
-            final RootOid rootOid = (RootOid) ManagedObject._identify(targetAdapter);
-            final Bookmark bookmark = rootOid.asBookmark();
+            final Bookmark bookmark = ManagedObject.bookmarkElseFail(targetAdapter);
             final OidsDto targets = CommandDtoUtils.targetsFor(dto);
             targets.getOid().add(bookmark.toOidDto());
         }
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
index 784d91d..76cb8e0 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.runtimeservices.publish;
 
 import java.sql.Timestamp;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 
 import org.apache.isis.applib.annotation.Programmatic;
@@ -30,18 +30,18 @@ import org.apache.isis.applib.annotation.PublishingChangeKind;
 import org.apache.isis.applib.services.RepresentsInteractionMemberExecution;
 import org.apache.isis.applib.services.publish.PublishedObjects;
 import org.apache.isis.core.commons.internal.base._Lazy;
-import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.core.commons.internal.collections._Multimaps.ListMultimap;
 import org.apache.isis.core.metamodel.adapter.oid.RootOid;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
 import org.apache.isis.schema.chg.v2.ChangesDto;
 import org.apache.isis.schema.chg.v2.ObjectsDto;
-import org.apache.isis.schema.common.v2.OidDto;
 import org.apache.isis.schema.common.v2.OidsDto;
 import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
 
 import lombok.ToString;
+import lombok.val;
 
 /**
  * Captures which objects were created, updated or deleted in the course of a transaction.
@@ -185,17 +185,17 @@ public class PublishedObjectsDefault implements PublishedObjects, RepresentsInte
     }
 
     private OidsDto oidsDtoFor(final PublishingChangeKind kind) {
-        final OidsDto oidsDto = new OidsDto();
-
-        final Collection<ManagedObject> adapters = adaptersByChange.get().get(kind);
-        if(adapters != null) {
-            final List<OidDto> oidDtos = _Lists.map(adapters, 
-                    (final ManagedObject objectAdapter) -> {
-                        final RootOid rootOid = ManagedObject._identify(objectAdapter);
-                        return rootOid.asOidDto();
-                    });
-            oidsDto.getOid().addAll(oidDtos);
-        }
+        val oidsDto = new OidsDto();
+
+        _NullSafe.stream(adaptersByChange.get().get(kind))
+        .map((final ManagedObject adapter) -> 
+            ManagedObject.identify(adapter)
+            .map(RootOid::asOidDto)
+            .orElse(null)
+        )
+        .filter(Objects::nonNull)
+        .forEach(oidsDto.getOid()::add);
+        
         return oidsDto;
     }
 
diff --git a/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java b/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
index 95d61e4..53b1e51 100644
--- a/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
+++ b/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
@@ -110,7 +110,7 @@ public abstract class EventProviderAbstract implements EventProvider {
                         final ObjectSpecification spec = specificationLoader.loadSpecification(dereferencedObject.getClass());
                         final ManagedObject dereferencedManagedObject = ManagedObject.of(spec, dereferencedObject);
 
-                        final RootOid rootOid = ManagedObject._identify(dereferencedManagedObject);
+                        final RootOid rootOid = ManagedObject.identify(dereferencedManagedObject).orElse(null);
                         if(rootOid!=null) {
 
                             final String oidStr = rootOid.enString();
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
index 0afb061..f471791 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
@@ -63,12 +63,20 @@ public class JdoPersistenceCapableFacetImpl extends JdoPersistenceCapableFacetAb
     @Override
     public String identifierFor(ObjectSpecification spec, Object pojo) {
 
-        //TODO simplify?, spec is already loaded
+        if(pojo==null) {
+            throw _Exceptions.illegalArgument(
+                    "The persistence layer cannot identify a pojo that is null (given type %s)",
+                    spec.getCorrespondingClass().getName());
+        }
         
-        if(pojo==null || !isPersistableType(pojo.getClass())) {
-            return "?";
+        if(!isPersistableType(pojo.getClass())) {
+            throw _Exceptions.illegalArgument(
+                    "The persistence layer does not recognize given type %s",
+                    pojo.getClass().getName());
         }
         
+        //TODO simplify?, spec is already loaded
+        
         val persistenceSession = super.getPersistenceSessionJdo();
         val isRecognized = persistenceSession.isRecognized(pojo);
         if(isRecognized) {
@@ -81,9 +89,6 @@ public class JdoPersistenceCapableFacetImpl extends JdoPersistenceCapableFacetAb
                     + "meaning the object has no identifier that associates it with the persistence layer. "
                     + "(most likely, because the object is detached, eg. was not persisted after being new-ed up)", 
                     pojo.getClass().getName());
-            
-            //final String identifier = UUID.randomUUID().toString();
-            //return identifier;    
         }
     }
 
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/PojoAdapter.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/PojoAdapter.java
index 8215740..e0237db 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/PojoAdapter.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/PojoAdapter.java
@@ -21,11 +21,13 @@ package org.apache.isis.persistence.jdo.datanucleus5.objectadapter;
 
 import java.io.Serializable;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
 import org.apache.isis.core.metamodel.commons.ToString;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -153,5 +155,14 @@ public final class PojoAdapter implements ObjectAdapter {
         return "S"; // standalone adapter (value)
     }
 
+    @Override
+    public Optional<RootOid> getRootOid() {
+        val oid = getOid();
+        if (oid instanceof RootOid) {
+            return Optional.of((RootOid)oid);
+        }
+        return Optional.empty();
+    }
+
 
 }
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index ac52250..a9d5354 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -235,8 +235,7 @@ abstract class IsisPersistenceSessionJdoBase implements IsisPersistenceSessionJd
             return null;
         }
         val adapter = ManagedObject.of(getSpecificationLoader().loadSpecification(pojo.getClass()), pojo);
-        val oid = ManagedObject._identify(adapter);
-        return oid;
+        return ManagedObject.identify(adapter).orElse(null);
     }
 
     // -- HELPERS - SERVICE LOOKUP
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
index 37c8640..0bb01dd 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
@@ -366,8 +366,10 @@ public class IsisTransactionJdo implements Transaction {
         }
 
         try {
+            
             auditerDispatchService.audit();
             publisherDispatchService.publishObjects();
+            
             doFlush();
 
         } catch (final RuntimeException ex) {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index d9f4aad..07ef097 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -281,7 +281,7 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
     }
 
     private String getOidStr() {
-        return ManagedObject._identifyElseThrow(objectAdapter).enString();
+        return ManagedObject.stringifyElseFail(objectAdapter);
     }
 
     private DomainObjectReprRenderer withMembers(final ManagedObject objectAdapter) {
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
index 93292c6..a7b1ad2 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
@@ -218,8 +218,10 @@ public class ResourceContext extends RuntimeContextBase implements IResourceCont
     private Set<Oid> rendered = _Sets.newHashSet();
     @Override
     public boolean canEagerlyRender(ManagedObject objectAdapter) {
-        final Oid oid = ManagedObject._identify(objectAdapter);
-        return rendered.add(oid);
+        final Oid oid = ManagedObject.identify(objectAdapter).orElse(null);
+        return (oid!=null) 
+                ? rendered.add(oid)
+                : true;
     }
 
 
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 0c58597..9d875f4 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -123,9 +123,10 @@ public class ActionModel extends BookmarkableModel<ManagedObject> implements For
 
         val pageParameters = PageParametersUtils.newPageParameters();
 
-        val oidStr = ManagedObject._identify(adapter).enString();
-
-        PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr);
+        ManagedObject.stringify(adapter)
+        .ifPresent(oidStr->
+            PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr)
+        );
 
         val actionType = objectAction.getType();
         PageParameterNames.ACTION_TYPE.addEnumTo(pageParameters, actionType);
@@ -365,7 +366,7 @@ public class ActionModel extends BookmarkableModel<ManagedObject> implements For
             return encodeable.toEncodedString(adapter);
         }
 
-        return ManagedObject._identify(adapter).enString();
+        return ManagedObject.stringify(adapter).orElse(null);
     }
 
     private ManagedObject decodeArg(final ObjectSpecification objSpec, final String encoded) {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index 7c6ca03..00e1378 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -208,7 +208,7 @@ public class BookmarkTreeNode implements Serializable {
             })
             .filter(_NullSafe::isPresent)
             .map(parentAdapter->{
-                final Oid parentOid = ManagedObject._identify(parentAdapter);
+                final Oid parentOid = ManagedObject.identify(parentAdapter).orElse(null);
                 return parentOid;
             })
             .filter(_NullSafe::isPresent)
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 7d6ec2c..110d332 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -40,13 +40,13 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
 import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
 import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
 import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
 import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
 import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.core.webapp.context.memento.ObjectMemento;
 
 import static org.apache.isis.core.commons.internal.base._With.requires;
 
@@ -79,8 +79,8 @@ implements ObjectAdapterModel, UiHintContainer {
         val isEntity = ManagedObject.isIdentifiable(adapter);
 
         if (isEntity) {
-            val oidStr = ManagedObject._identify(adapter).enString();
-            PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr);
+            ManagedObject.stringify(adapter)
+            .ifPresent(oidStr->PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr));
         } else {
             // don't do anything; instead the page should be redirected back to
             // an EntityPage so that the underlying EntityModel that contains
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index 63093e6..4b51f6b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@ -48,13 +48,13 @@ import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.functions._Functions;
 import org.apache.isis.core.metamodel.adapter.oid.RootOid;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
 import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
 import org.apache.isis.viewer.wicket.model.models.ValueModel;
 import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
 
 import static org.apache.isis.core.commons.internal.base._With.requires;
 
@@ -401,7 +401,8 @@ class IsisToWicketTreeAdapter {
         public LoadableDetachableTreeModel(TreeModel tModel) {
             super(tModel);
             this.treePath = tModel.getTreePath();
-            this.id = (RootOid) ManagedObject._identify(tModel.getObject());
+            this.id = ManagedObject.identifyElseFail(tModel.getObject());
+                    
             this.hashCode = Objects.hash(id.hashCode(), treePath.hashCode());
             this.commonContext = tModel.getCommonContext();
         }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
index 66d938c..09944f0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
@@ -59,7 +59,7 @@ public class UnknownModelPanel extends PanelAbstract<IModel<?>> {
             EntityModel entityModel = (EntityModel) model;
             val objectAdapter = entityModel.getObject();
             if(objectAdapter != null) {
-                buf.append("??? objectAdapter oid: " + ManagedObject._identify(objectAdapter));    
+                buf.append("??? objectAdapter oid: " + ManagedObject.identify(objectAdapter).orElse(null));    
             } else {
                 buf.append("??? objectAdapter is NULL");
             }
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
index 9e2031d..2942643 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
@@ -74,11 +74,8 @@ public class ConverterForObjectAdapter implements IConverter<ManagedObject> {
             return null;
         }
         
-        val rootOid = ManagedObject._identify(adapter);
-        
-        return rootOid!=null
-                ? rootOid.enString()
-                        : null;
+        return ManagedObject.stringify(adapter)
+                .orElse(null);
     }
     
 
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
index e6ac2a8..435c053 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
@@ -72,8 +72,7 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectMement
         if(spec!=null && spec.isValue()) {
             return memento.toString();
         }
-        val oid = ManagedObject._identify(adapter);
-        return oid.enString();
+        return ManagedObject.stringifyElseFail(adapter);
     }
 
 }
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
index 020e8ca..e35f226 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
@@ -241,10 +241,9 @@ final class ObjectMementoLegacy implements Serializable {
                     SpecificationLoader specificationLoader) {
 
                 //XXX REVIEW: this may be redundant because recreateAdapter also guarantees the version will be reset.
-                final ManagedObject adapter = recreateObject(memento, specificationLoader);
+                ManagedObject adapter = recreateObject(memento, specificationLoader);
 
-                Oid oid = ManagedObject._identify(adapter);
-                memento.persistentOidStr = oid.enString();
+                memento.persistentOidStr = ManagedObject.stringifyElseFail(adapter);
             }
 
             @Override
@@ -395,7 +394,7 @@ final class ObjectMementoLegacy implements Serializable {
             return;
         }
 
-        val rootOid = (RootOid) ManagedObject._identify(adapter);
+        val rootOid = ManagedObject.identifyElseFail(adapter);
         persistentOidStr = rootOid.enString();
         bookmark = rootOid.asBookmark();
         if(adapter.getPojo() instanceof HintStore.HintIdProvider) {