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 3282bbe8fa ISIS-3101: reverts: changes signature of 
IdStringifier#destring - second param can be null
3282bbe8fa is described below

commit 3282bbe8fa35570606b9d69acf120f9e705f2dc8
Author: Andi Huber <[email protected]>
AuthorDate: Tue Aug 2 07:16:18 2022 +0200

    ISIS-3101: reverts: changes signature of IdStringifier#destring - second
    param can be null
    
    - initial design with mandatory second param was more correct
---
 .../isis/applib/services/bookmark/IdStringifier.java      | 15 +++++----------
 .../idstringifiers/IdStringifierForCharacter.java         |  2 +-
 .../idstringifiers/IdStringifierForSerializable.java      |  2 +-
 .../bookmark/idstringifiers/IdStringifierForString.java   |  2 +-
 .../executionlog/jdo/dom/ExecutionLogEntryPK.java         |  2 +-
 .../executionlog/jpa/dom/ExecutionLogEntryPK.java         |  2 +-
 .../executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java   |  2 +-
 .../executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java   |  2 +-
 .../metamodel/facets/entity/IdStringifierForCharId.java   |  6 +++---
 .../facets/entity/IdStringifierForCharIdentity.java       |  6 +++---
 .../facets/entity/IdStringifierForDatastoreId.java        |  2 +-
 .../facets/entity/IdStringifierForDatastoreIdImpl.java    |  4 ++--
 .../entity/IdStringifierForDatastoreUniqueLongId.java     |  2 +-
 .../metamodel/facets/entity/IdStringifierForObjectId.java | 10 +++++-----
 .../facets/entity/IdStringifierForObjectIdentity.java     | 11 +++++------
 .../metamodel/facets/entity/IdStringifierForStringId.java |  6 +++---
 .../facets/entity/IdStringifierForStringIdentity.java     |  6 +++---
 17 files changed, 38 insertions(+), 44 deletions(-)

diff --git 
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/IdStringifier.java
 
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/IdStringifier.java
index c787333d20..e097d01695 100644
--- 
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/IdStringifier.java
+++ 
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/IdStringifier.java
@@ -20,8 +20,6 @@
 
 package org.apache.isis.applib.services.bookmark;
 
-import java.util.UUID;
-
 import org.springframework.lang.Nullable;
 
 import lombok.NonNull;
@@ -77,13 +75,11 @@ public interface IdStringifier<T> {
      * that can be used to retrieve.
      *
      * @param stringified - as returned by {@link #enstring(Object)}
-     * @param targetEntityClassIfAny - the class of the target entity, eg 
<code>Customer</code>.  For both JDO and JPA,
+     * @param targetEntityClass - the class of the target entity, eg 
<code>Customer</code>.  For both JDO and JPA,
      *                                 we always have this information 
available, and is needed (at least) by the JDO
      *                                 implementations of application primary 
keys using built-ins, eg <code>LongIdentity</code>.
-     *                                 For Bookmarks of view models, there 
won't be any targetEntityClass, so this parameter
-     *                                 could be null.
      */
-    T destring(@NonNull String stringified, Class<?> targetEntityClassIfAny);
+    T destring(@NonNull String stringified, @NonNull Class<?> 
targetEntityClass);
 
     abstract class Abstract<T> implements IdStringifier<T> {
 
@@ -120,10 +116,9 @@ public interface IdStringifier<T> {
         /**
          * Overridable default implementation.
          * @param value
-         * @return
          */
         @Override
-        public String enstring(@NonNull T value) {
+        public String enstring(@NonNull final T value) {
             return value.toString();
         }
 
@@ -171,9 +166,9 @@ public interface IdStringifier<T> {
         @Override
         public final T destring(
                 final @NonNull String stringified,
-                final Class<?> targetEntityClassIfAny) {
+                final @NonNull Class<?> targetEntityClass) {
             val suffix = removePrefix(stringified);
-            return doDestring(suffix, targetEntityClassIfAny);
+            return doDestring(suffix, targetEntityClass);
         }
 
         /**
diff --git 
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForCharacter.java
 
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForCharacter.java
index 0cfb3b7901..80eb05b834 100644
--- 
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForCharacter.java
+++ 
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForCharacter.java
@@ -62,7 +62,7 @@ public class IdStringifierForCharacter extends 
IdStringifier.Abstract<Character>
     @Override
     public Character destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
+            final @NonNull Class<?> targetEntityClass) {
         if(stringified.startsWith(REGULAR_PREFIX)) {
             return stringified.substring(REGULAR_PREFIX.length()).charAt(0);
         }
diff --git 
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForSerializable.java
 
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForSerializable.java
index 3551314c68..db2c7357a7 100644
--- 
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForSerializable.java
+++ 
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForSerializable.java
@@ -73,7 +73,7 @@ public class IdStringifierForSerializable extends 
IdStringifier.Abstract<Seriali
     @Override
     public Serializable destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
+            final @NonNull Class<?> targetEntityClass) {
         if (_Strings.isEmpty(stringified)) {
             return null;
         }
diff --git 
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForString.java
 
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForString.java
index 2796e5b109..66774f9193 100644
--- 
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForString.java
+++ 
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForString.java
@@ -61,7 +61,7 @@ public class IdStringifierForString extends 
IdStringifier.Abstract<String> {
     @Override
     public String destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
+            final @NonNull Class<?> targetEntityClass) {
         if(stringified.startsWith(REGULAR_PREFIX)) {
             return stringified.substring(REGULAR_PREFIX.length());
         }
diff --git 
a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
 
b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
index 52393b37b2..427cac1586 100644
--- 
a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
+++ 
b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
@@ -72,7 +72,7 @@ public class ExecutionLogEntryPK implements Serializable {
         @Override
         public ExecutionLogEntryPK destring(
                 final @NonNull String stringified,
-                final Class<?> targetEntityClassIfAny) {
+                final @NonNull Class<?> targetEntityClass) {
             return new ExecutionLogEntryPK(stringified);
         }
     }
diff --git 
a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
 
b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
index f948781794..15c2e3c412 100644
--- 
a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
+++ 
b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
@@ -84,7 +84,7 @@ public class ExecutionLogEntryPK implements Serializable {
         @Override
         public ExecutionLogEntryPK destring(
                 final @NonNull String stringified,
-                final Class<?> targetEntityClassIfAny) {
+                final @NonNull Class<?> targetEntityClass) {
             return new ExecutionLogEntryPK(stringified);
         }
     }
diff --git 
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
 
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
index 855da96b67..e9a367c9b2 100644
--- 
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
+++ 
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
@@ -72,7 +72,7 @@ public class ExecutionOutboxEntryPK implements Serializable {
         @Override
         public ExecutionOutboxEntryPK destring(
                 final @NonNull String stringified,
-                final Class<?> targetEntityClassIfAny) {
+                final @NonNull Class<?> targetEntityClass) {
             return new ExecutionOutboxEntryPK(stringified);
         }
     }
diff --git 
a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java
 
b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java
index 7c289d4157..398657596f 100644
--- 
a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java
+++ 
b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java
@@ -84,7 +84,7 @@ public class ExecutionOutboxEntryPK implements Serializable {
         @Override
         public ExecutionOutboxEntryPK destring(
                 final @NonNull String stringified,
-                final Class<?> targetEntityClassIfAny) {
+                final @NonNull Class<?> targetEntityClass) {
             return new ExecutionOutboxEntryPK(stringified);
         }
     }
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharId.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharId.java
index 14d9062bb9..5a1b8c1fe8 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharId.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharId.java
@@ -59,8 +59,8 @@ public class IdStringifierForCharId extends 
IdStringifier.Abstract<CharId> {
     @Override
     public CharId destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
-        val idValue = idStringifierForCharacter.destring(stringified, 
targetEntityClassIfAny);
-        return new CharId(targetEntityClassIfAny, idValue);
+            final @NonNull Class<?> targetEntityClass) {
+        val idValue = idStringifierForCharacter.destring(stringified, 
targetEntityClass);
+        return new CharId(targetEntityClass, idValue);
     }
 }
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharIdentity.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharIdentity.java
index 2bdf7e0d9b..095830df77 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharIdentity.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharIdentity.java
@@ -59,8 +59,8 @@ public class IdStringifierForCharIdentity extends 
IdStringifier.Abstract<CharIde
     @Override
     public CharIdentity destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
-        val idValue = idStringifierForCharacter.destring(stringified, 
targetEntityClassIfAny);
-        return new CharIdentity(targetEntityClassIfAny, idValue);
+            final @NonNull Class<?> targetEntityClass) {
+        val idValue = idStringifierForCharacter.destring(stringified, 
targetEntityClass);
+        return new CharIdentity(targetEntityClass, idValue);
     }
 }
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreId.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreId.java
index bc54955156..628998c2fd 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreId.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreId.java
@@ -56,7 +56,7 @@ public class IdStringifierForDatastoreId extends 
IdStringifier.Abstract<Datastor
     @Override
     public DatastoreId destring(
             final @NonNull String stringified,
-            final @Nullable Class<?> targetEntityClassIfAny) {
+            final @Nullable Class<?> targetEntityClass) {
         int idx = stringified.indexOf(SEPARATOR);
         String clsName = stringified.substring(0, idx);
         String keyStr = stringified.substring(idx + 1);
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreIdImpl.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreIdImpl.java
index c341c3842f..de6449efd9 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreIdImpl.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreIdImpl.java
@@ -49,9 +49,9 @@ public class IdStringifierForDatastoreIdImpl extends 
IdStringifier.Abstract<Data
     @Override
     public DatastoreIdImpl destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
+            final @NonNull Class<?> targetEntityClass) {
         // enString invoked toString() on the original key; invoking 
toString() on its stringified form does not change it
-        val proto = new DatastoreIdImpl(targetEntityClassIfAny.getName(), 
stringified);
+        val proto = new DatastoreIdImpl(targetEntityClass.getName(), 
stringified);
         // now render in the form that the DataStoreImpl constructor expects; 
it will take it apart itself.
         val str = proto.toString();
         return new DatastoreIdImpl(str);
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreUniqueLongId.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreUniqueLongId.java
index 193146c586..b56d1a6ed2 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreUniqueLongId.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreUniqueLongId.java
@@ -47,7 +47,7 @@ public class IdStringifierForDatastoreUniqueLongId extends 
IdStringifier.Abstrac
     @Override
     public DatastoreUniqueLongId destring(
             final @NonNull String stringified,
-            final @Nullable Class<?> targetEntityClassIfAny) {
+            final @Nullable Class<?> targetEntityClass) {
         return new DatastoreUniqueLongId(stringified);
     }
 
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectId.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectId.java
index 4897c6099a..b2448bbb38 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectId.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectId.java
@@ -71,17 +71,17 @@ public class IdStringifierForObjectId extends 
IdStringifier.Abstract<ObjectId> {
     @Override
     public ObjectId destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
+            final @NonNull Class<?> targetEntityClass) {
         if (stringified.startsWith(PREFIX_LONG)) {
-            return new ObjectId(targetEntityClassIfAny, 
Long.parseLong(stringified.substring(PREFIX_LONG.length())));
+            return new ObjectId(targetEntityClass, 
Long.parseLong(stringified.substring(PREFIX_LONG.length())));
         }
         if (stringified.startsWith(PREFIX_INT)) {
-            return new ObjectId(targetEntityClassIfAny, 
Integer.parseInt(stringified.substring(PREFIX_INT.length())));
+            return new ObjectId(targetEntityClass, 
Integer.parseInt(stringified.substring(PREFIX_INT.length())));
         }
         if (stringified.startsWith(PREFIX_UUID)) {
-            return new ObjectId(targetEntityClassIfAny, 
UUID.fromString(stringified.substring(PREFIX_UUID.length())));
+            return new ObjectId(targetEntityClass, 
UUID.fromString(stringified.substring(PREFIX_UUID.length())));
         }
         // fall through to JDO spec (5.4.3)
-        return new ObjectId(targetEntityClassIfAny, stringified);
+        return new ObjectId(targetEntityClass, stringified);
     }
 }
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectIdentity.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectIdentity.java
index c32c0b6a88..c14a4afdd0 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectIdentity.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectIdentity.java
@@ -23,7 +23,6 @@ import java.util.UUID;
 import javax.annotation.Priority;
 import javax.jdo.identity.ObjectIdentity;
 
-import org.datanucleus.identity.ObjectId;
 import org.springframework.stereotype.Component;
 
 import org.apache.isis.applib.annotation.PriorityPrecedence;
@@ -72,17 +71,17 @@ public class IdStringifierForObjectIdentity extends 
IdStringifier.Abstract<Objec
     @Override
     public ObjectIdentity destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
+            final @NonNull Class<?> targetEntityClass) {
         if (stringified.startsWith(PREFIX_LONG)) {
-            return new ObjectIdentity(targetEntityClassIfAny, 
Long.parseLong(stringified.substring(PREFIX_LONG.length())));
+            return new ObjectIdentity(targetEntityClass, 
Long.parseLong(stringified.substring(PREFIX_LONG.length())));
         }
         if (stringified.startsWith(PREFIX_INT)) {
-            return new ObjectIdentity(targetEntityClassIfAny, 
Integer.parseInt(stringified.substring(PREFIX_INT.length())));
+            return new ObjectIdentity(targetEntityClass, 
Integer.parseInt(stringified.substring(PREFIX_INT.length())));
         }
         if (stringified.startsWith(PREFIX_UUID)) {
-            return new ObjectIdentity(targetEntityClassIfAny, 
UUID.fromString(stringified.substring(PREFIX_UUID.length())));
+            return new ObjectIdentity(targetEntityClass, 
UUID.fromString(stringified.substring(PREFIX_UUID.length())));
         }
         // fall through to JDO spec (5.4.3)
-        return new ObjectIdentity(targetEntityClassIfAny, stringified);
+        return new ObjectIdentity(targetEntityClass, stringified);
     }
 }
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringId.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringId.java
index 620d7338c2..83046b1b45 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringId.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringId.java
@@ -59,8 +59,8 @@ public class IdStringifierForStringId extends 
IdStringifier.Abstract<StringIdent
     @Override
     public StringIdentity destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
-        val idValue = idStringifierForString.destring(stringified, 
targetEntityClassIfAny);
-        return new StringIdentity(targetEntityClassIfAny, idValue);
+            final @NonNull Class<?> targetEntityClass) {
+        val idValue = idStringifierForString.destring(stringified, 
targetEntityClass);
+        return new StringIdentity(targetEntityClass, idValue);
     }
 }
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringIdentity.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringIdentity.java
index 7da2115316..e5a759d856 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringIdentity.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringIdentity.java
@@ -59,8 +59,8 @@ public class IdStringifierForStringIdentity extends 
IdStringifier.Abstract<Strin
     @Override
     public StringIdentity destring(
             final @NonNull String stringified,
-            final Class<?> targetEntityClassIfAny) {
-        val idValue = idStringifierForString.destring(stringified, 
targetEntityClassIfAny);
-        return new StringIdentity(targetEntityClassIfAny, idValue);
+            final @NonNull Class<?> targetEntityClass) {
+        val idValue = idStringifierForString.destring(stringified, 
targetEntityClass);
+        return new StringIdentity(targetEntityClass, idValue);
     }
 }

Reply via email to