[isis] branch master updated: ISIS-3119: moves SEPARATOR constant from nested AbstractWithPrefix to IdStringifier

[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 1aba44fb21 ISIS-3119: moves SEPARATOR constant from nested 
AbstractWithPrefix to IdStringifier
1aba44fb21 is described below

commit 1aba44fb21da957dc6d2d57985332ca768097b32
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Aug 11 23:41:37 2022 +0200

    ISIS-3119: moves SEPARATOR constant from nested AbstractWithPrefix to
    IdStringifier
---
 .../java/org/apache/isis/applib/services/bookmark/IdStringifier.java  | 4 ++--
 .../isis/core/metamodel/valuesemantics/CharacterValueSemantics.java   | 4 ++--
 .../isis/core/metamodel/valuesemantics/StringValueSemantics.java      | 4 ++--
 .../jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java      | 4 ++--
 4 files changed, 8 insertions(+), 8 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 d4c4306cd2..d9896cb441 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
@@ -50,6 +50,8 @@ import lombok.val;
 @SuppressWarnings("javadoc")
 public interface IdStringifier<T> {
 
+    public final static char SEPARATOR = '_';
+
     Class<T> getCorrespondingClass();
 
     /**
@@ -104,8 +106,6 @@ public interface IdStringifier<T> {
     @Deprecated
     abstract class AbstractWithPrefix<T> implements IdStringifier<T> {
 
-        public final static char SEPARATOR = '_';
-
         /**
          * eg <code>Integer.class</code>, or JDO-specific 
<code>DatastoreId</code>,
          * or a custom class for application-defined PKs.
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/CharacterValueSemantics.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/CharacterValueSemantics.java
index deaf9ee6a2..92773143c4 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/CharacterValueSemantics.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/CharacterValueSemantics.java
@@ -99,8 +99,8 @@ implements
             .stream()
             .map(x -> x.charAt(0))
             .collect(Collectors.toList());
-    static final String REGULAR_PREFIX = "c" + 
IdStringifier.AbstractWithPrefix.SEPARATOR;
-    static final String BASE64_PREFIX = "cbse64" + 
IdStringifier.AbstractWithPrefix.SEPARATOR;
+    static final String REGULAR_PREFIX = "c" + IdStringifier.SEPARATOR;
+    static final String BASE64_PREFIX = "cbse64" + IdStringifier.SEPARATOR;
 
     @Override
     public String enstring(final @NonNull Character id) {
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/StringValueSemantics.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/StringValueSemantics.java
index 7365b145e9..72f117c48c 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/StringValueSemantics.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/StringValueSemantics.java
@@ -75,8 +75,8 @@ implements
 
     static final List<String> NON_SAFE_URL_CHARS =
             Arrays.asList("/", "\\", "?", ":", "&", "%", "+");
-    static final String REGULAR_PREFIX = "s" + 
IdStringifier.AbstractWithPrefix.SEPARATOR;
-    static final String BASE64_PREFIX = "base64" + 
IdStringifier.AbstractWithPrefix.SEPARATOR;
+    static final String REGULAR_PREFIX = "s" + IdStringifier.SEPARATOR;
+    static final String BASE64_PREFIX = "base64" + IdStringifier.SEPARATOR;
 
     @Override
     public String enstring(final @NonNull String id) {
diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java
index b3732f958d..c992d36cdc 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java
@@ -75,7 +75,7 @@ extends ValueSemanticsBasedOnIdStringifier<DatastoreId> {
         // re-create-able through the constructor
         //
         // to do this, we also need to capture the class of the Id value class 
itself, followed by the value (as a string)
-        return value.getClass().getName() + 
IdStringifier.AbstractWithPrefix.SEPARATOR + value.toString();
+        return value.getClass().getName() + IdStringifier.SEPARATOR + 
value.toString();
     }
 
     @SneakyThrows
@@ -83,7 +83,7 @@ extends ValueSemanticsBasedOnIdStringifier<DatastoreId> {
     public DatastoreId destring(
             final @NonNull Class<?> targetEntityClass,
             final @NonNull String stringified) {
-        int idx = 
stringified.indexOf(IdStringifier.AbstractWithPrefix.SEPARATOR);
+        int idx = stringified.indexOf(IdStringifier.SEPARATOR);
         String clsName = stringified.substring(0, idx);
         String keyStr = stringified.substring(idx + 1);
         final Class<?> cls = _Context.loadClass(clsName);