[isis] branch master updated: ISIS-3119: fixes prev. commit

[ahuber]

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 0bd8039ceb ISIS-3119: fixes prev. commit
0bd8039ceb is described below

commit 0bd8039cebcac6a9cd00c701d807d6bdb87753fd
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Aug 11 15:48:37 2022 +0200

    ISIS-3119: fixes prev. commit
---
 .../isis/core/runtime/idstringifier/IdStringifierService.java      | 7 +------
 .../jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java    | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierService.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierService.java
index 8a27baccef..4569710925 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierService.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierService.java
@@ -111,7 +111,7 @@ public class IdStringifierService {
     private <T> Optional<IdStringifier<T>> lookup(final Class<T> 
candidateValueClass) {
         val idStringifier = 
stringifierByClass.computeIfAbsent(candidateValueClass, aClass -> {
             for (val candidateStringifier : idStringifiers) {
-                if (handles(candidateStringifier, candidateValueClass)) {
+                if 
(candidateStringifier.getCorrespondingClass().isAssignableFrom(candidateValueClass))
 {
                     return candidateStringifier;
                 }
             }
@@ -120,9 +120,4 @@ public class IdStringifierService {
         return Optional.ofNullable(_Casts.uncheckedCast(idStringifier));
     }
 
-    private boolean handles(final IdStringifier<?> idStringifier, final 
@NonNull Class<?> candidateValueClass) {
-        return idStringifier.getCorrespondingClass()
-                
.isAssignableFrom(ClassUtils.resolvePrimitiveIfNecessary(candidateValueClass));
-    }
-
 }
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index 256407fdb5..b4c82b7b47 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -133,7 +133,7 @@ implements EntityFacet {
                     pojo.getClass().getName());
         }
 
-        return 
idStringifierService.enstringPrimaryKey(primaryKeyTypeFor(entityClass), 
primaryKey);
+        return idStringifierService.enstringPrimaryKey(primaryKey.getClass(), 
primaryKey);
     }