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 2020/06/05 06:14:50 UTC
[isis] branch master updated: ISIS-2340: move trivial code snippet
to interface (default)
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 59e6986 ISIS-2340: move trivial code snippet to interface (default)
59e6986 is described below
commit 59e69865345e076a04f9419df5f6c4174081d9c4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 5 08:14:33 2020 +0200
ISIS-2340: move trivial code snippet to interface (default)
---
.../spec/feature/MutableCurrentHolder.java | 6 ++++--
.../specimpl/OneToOneAssociationDefault.java | 23 +++++-----------------
.../handlers/DomainObjectInvocationHandler.java | 1 -
3 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java
index 215c638..ce9ba1c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java
@@ -57,8 +57,10 @@ public interface MutableCurrentHolder extends CurrentHolder {
* @param owner
* @param newValue
*/
- void set(
+ default void set(
final ManagedObject owner,
- final ManagedObject newValue);
+ final ManagedObject newValue) {
+ set(owner, newValue, InteractionInitiatedBy.USER);
+ }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index 7861fc2..fa44341 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -146,9 +146,9 @@ implements OneToOneAssociation {
final ManagedObject ownerAdapter,
final InteractionInitiatedBy interactionInitiatedBy) {
- final PropertyOrCollectionAccessorFacet facet = getFacet(PropertyOrCollectionAccessorFacet.class);
- final Object referencedPojo =
- facet.getProperty(ownerAdapter, interactionInitiatedBy);
+ val propertyOrCollectionAccessorFacet = getFacet(PropertyOrCollectionAccessorFacet.class);
+ val referencedPojo =
+ propertyOrCollectionAccessorFacet.getProperty(ownerAdapter, interactionInitiatedBy);
if (referencedPojo == null) {
return null;
@@ -163,12 +163,6 @@ implements OneToOneAssociation {
}
// -- Set
- @Override
- public void set(
- final ManagedObject ownerAdapter,
- final ManagedObject newReferencedAdapter) {
- set(ownerAdapter, newReferencedAdapter, InteractionInitiatedBy.USER);
- }
/**
* Sets up the {@link Command}, then delegates to the appropriate facet
@@ -182,13 +176,6 @@ implements OneToOneAssociation {
setupCommand(ownerAdapter, newReferencedAdapter);
- setInternal(ownerAdapter, newReferencedAdapter, interactionInitiatedBy);
- }
-
- private void setInternal(
- final ManagedObject ownerAdapter,
- final ManagedObject newReferencedAdapter,
- final InteractionInitiatedBy interactionInitiatedBy) {
if (newReferencedAdapter != null) {
setValue(ownerAdapter, newReferencedAdapter, interactionInitiatedBy);
} else {
@@ -215,8 +202,8 @@ implements OneToOneAssociation {
final ManagedObject ownerAdapter,
final InteractionInitiatedBy interactionInitiatedBy) {
- final PropertyClearFacet facet = getFacet(PropertyClearFacet.class);
- facet.clearProperty(this, ownerAdapter, interactionInitiatedBy);
+ val propertyClearFacet = getFacet(PropertyClearFacet.class);
+ propertyClearFacet.clearProperty(this, ownerAdapter, interactionInitiatedBy);
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index 8785eef..6f73ad8 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -51,7 +51,6 @@ import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.ImperativeFacet.Intent;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
-import org.apache.isis.core.metamodel.interactions.InteractionHead;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;