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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 96381c2ae6 CAUSEWAY-3508: converts IdStringifierForDnSCOID to a
ValueSemanticsProvider
96381c2ae6 is described below
commit 96381c2ae649e44a89315b4e19030690492103df
Author: Andi Huber <[email protected]>
AuthorDate: Thu Jun 29 07:42:59 2023 +0200
CAUSEWAY-3508: converts IdStringifierForDnSCOID to a
ValueSemanticsProvider
---
.../CausewayModulePersistenceJdoDatanucleus.java | 6 +--
.../idstringifers/IdStringifierForDnSCOID.java | 31 ------------
.../metamodel/facets/entity/JdoEntityFacet.java | 8 +--
.../valuetypes/DnScoidValueSemantics.java | 57 ++++++++++++++++++++++
4 files changed, 64 insertions(+), 38 deletions(-)
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
index d376c0551e..5f1bd3f004 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
@@ -25,8 +25,6 @@ import javax.jdo.JDOException;
import javax.jdo.PersistenceManagerFactory;
import javax.sql.DataSource;
-import
org.apache.causeway.persistence.jdo.datanucleus.idstringifers.IdStringifierForDnSCOID;
-
import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
import org.datanucleus.metadata.PersistenceUnitMetaData;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -57,6 +55,7 @@ import
org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnDatastoreUni
import
org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnIntIdValueSemantics;
import
org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnLongIdValueSemantics;
import
org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnObjectIdValueSemantics;
+import
org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnScoidValueSemantics;
import
org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnShortIdValueSemantics;
import
org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnStringIdValueSemantics;
import
org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoByteIdentityValueSemantics;
@@ -106,8 +105,7 @@ import lombok.extern.log4j.Log4j2;
DnCharIdValueSemantics.class,
DnStringIdValueSemantics.class,
DnObjectIdValueSemantics.class,
-
- IdStringifierForDnSCOID.class,
+ DnScoidValueSemantics.class, // in support of
@PersistenceCapable(identityType=IdentityType.NONDURABLE)
// @Service's
JdoSupportServiceDefault.class,
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/idstringifers/IdStringifierForDnSCOID.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/idstringifers/IdStringifierForDnSCOID.java
deleted file mode 100644
index c50abf994e..0000000000
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/idstringifers/IdStringifierForDnSCOID.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.causeway.persistence.jdo.datanucleus.idstringifers;
-
-import javax.annotation.Priority;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.bookmark.IdStringifier;
-import org.datanucleus.identity.SCOID;
-
-import org.springframework.stereotype.Component;
-
-import lombok.NonNull;
-
-@Component
-@Priority(PriorityPrecedence.LATE + 100) // after the implementations of
DatastoreId; for a custom impl.
-public class IdStringifierForDnSCOID implements IdStringifier<SCOID> {
-
- @Override
- public Class<SCOID> getCorrespondingClass() {
- return SCOID.class;
- }
-
- @Override
- public String enstring(@NonNull SCOID value) {
- return value.getSCOClass();
- }
-
- @Override
- public SCOID destring(@NonNull Class<?> targetEntityClass, @NonNull String
stringified) {
- return new SCOID(stringified);
- }
-}
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 a24a169a4c..bb7d638e72 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
@@ -21,7 +21,6 @@ package
org.apache.causeway.persistence.jdo.datanucleus.metamodel.facets.entity;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
@@ -238,7 +237,10 @@ implements EntityFacet {
case UNSPECIFIED:
default:
throw new IllegalStateException(String.format(
- "JdoEntityFacet has been incorrectly installed on '%s'
which has an supported identityType of '%s'",
+ "JdoEntityFacet was installed on '%s', "
+ + "yet this entity has IdentityType '%s', "
+ + "which is not supported by the framework's "
+ + "JDO implementation.",
entityClass.getName(), identityType));
}
}
@@ -325,7 +327,7 @@ implements EntityFacet {
query.getDescription());
}
- private static boolean hasResultPhrase(javax.jdo.Query<?> namedQuery) {
+ private static boolean hasResultPhrase(final javax.jdo.Query<?>
namedQuery) {
if (namedQuery instanceof JDOQuery) {
JDOQuery<?> jdoQuery = (JDOQuery<?>) namedQuery;
return jdoQuery.getInternalQuery().getResult() != null;
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnScoidValueSemantics.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnScoidValueSemantics.java
new file mode 100644
index 0000000000..a99e5d5530
--- /dev/null
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnScoidValueSemantics.java
@@ -0,0 +1,57 @@
+/*
+ * 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.causeway.persistence.jdo.datanucleus.valuetypes;
+
+import javax.annotation.Priority;
+
+import org.datanucleus.identity.SCOID;
+import org.springframework.stereotype.Component;
+
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import
org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic;
+
+import lombok.NonNull;
+
+/**
+ * Supports {@code @PersistenceCapable(identityType=IdentityType.NONDURABLE)}
+ *
+ * @see SCOID
+ */
+@Component
+@Priority(PriorityPrecedence.LATE + 100) // after the implementations of
DatastoreId; for a custom impl.
+public class DnScoidValueSemantics
+extends ValueSemanticsBasedOnIdStringifierEntityAgnostic<SCOID> {
+
+ public DnScoidValueSemantics() {
+ super(SCOID.class);
+ }
+
+ // -- ID STRINGIFIER
+
+ @Override
+ public SCOID destring(final @NonNull String stringified) {
+ return new SCOID(stringified);
+ }
+
+ @Override
+ public String enstring(final @NonNull SCOID value) {
+ return value.getSCOClass();
+ }
+
+}
