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 2021/08/03 05:05:24 UTC
[isis] branch master updated: ISIS-2794: replace recent
ManagedObject#pojoOf with existing unwrapping tools
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 2035d6b ISIS-2794: replace recent ManagedObject#pojoOf with existing unwrapping tools
2035d6b is described below
commit 2035d6bdfe75c8be3f3c4e0303da88ffe22a3671
Author: andi-huber <ah...@apache.org>
AuthorDate: Tue Aug 3 07:05:09 2021 +0200
ISIS-2794: replace recent ManagedObject#pojoOf with existing unwrapping
tools
---
.../services/objectlifecycle/ObjectLifecyclePublisher.java | 5 +++--
.../java/org/apache/isis/core/metamodel/spec/ManagedObject.java | 7 -------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/ObjectLifecyclePublisher.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/ObjectLifecyclePublisher.java
index d97475d..aec3a74 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/ObjectLifecyclePublisher.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/ObjectLifecyclePublisher.java
@@ -27,6 +27,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facets.properties.property.entitychangepublishing.EntityPropertyChangePublishingPolicyFacet;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import lombok.NonNull;
@@ -85,7 +86,7 @@ public interface ObjectLifecyclePublisher {
property,
PreAndPostValue
.pre(PropertyValuePlaceholder.NEW)
- .withPost(ManagedObject.pojoOf(property.get(entity))))
+ .withPost(ManagedObjects.UnwrapUtil.single(property.get(entity))))
.toEntityPropertyChange(
timestamp,
user,
@@ -120,7 +121,7 @@ public interface ObjectLifecyclePublisher {
entity,
property,
PreAndPostValue
- .pre(ManagedObject.pojoOf(property.get(entity)))
+ .pre(ManagedObjects.UnwrapUtil.single(property.get(entity)))
.withPost(PropertyValuePlaceholder.DELETED))
.toEntityPropertyChange(
timestamp,
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 0d29fd0..2ee3788 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
@@ -51,13 +51,6 @@ import lombok.val;
*/
public interface ManagedObject {
- @Nullable
- static Object pojoOf(ManagedObject managedObject) {
- return managedObject != null
- ? managedObject.getPojo()
- : null;
- }
-
/**
* Returns the specification that details the structure (meta-model) of this object.
*/