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 08:00:57 UTC
[isis] branch master updated: ISIS-2340: ManagedObjects: move and
gather unwrap utility methods (3)
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 b1239dc ISIS-2340: ManagedObjects: move and gather unwrap utility methods (3)
b1239dc is described below
commit b1239dca0a84d9b47b942074613c12267ea7dbdd
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 5 10:00:46 2020 +0200
ISIS-2340: ManagedObjects: move and gather unwrap utility methods (3)
---
.../core/metamodel/facets/DomainEventHelper.java | 2 +-
...ctionInvocationFacetForDomainEventAbstract.java | 2 +-
.../facets/collections/CollectionFacet.java | 3 ++-
.../interactions/ActionArgUsabilityContext.java | 2 +-
.../interactions/ActionArgValidityContext.java | 2 +-
.../interactions/ActionArgVisibilityContext.java | 2 +-
.../interactions/ActionValidityContext.java | 2 +-
.../isis/core/metamodel/spec/ManagedObject.java | 21 -------------------
.../isis/core/metamodel/spec/ManagedObjects.java | 24 +++++++++++++++++++---
9 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
index f61ef2b..a09bdb3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
@@ -119,7 +119,7 @@ public class DomainEventHelper {
} else {
// all other phases, create a new event
final S source = uncheckedCast(UnwrapUtil.single(head.getTarget()));
- final Object[] arguments = ManagedObject.unwrapMultipleAsArray(argumentAdapters);
+ final Object[] arguments = UnwrapUtil.multipleAsArray(argumentAdapters);
final Identifier identifier = identified.getIdentifier();
event = newActionDomainEvent(eventType, identifier, source, arguments);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index af981ec..c5bc655 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -264,7 +264,7 @@ implements ImperativeFacet {
final Can<ManagedObject> arguments)
throws IllegalAccessException, InvocationTargetException {
- final Object[] executionParameters = ManagedObject.unwrapMultipleAsArray(arguments);
+ final Object[] executionParameters = UnwrapUtil.multipleAsArray(arguments);
final Object targetPojo = UnwrapUtil.single(targetAdapter);
final ActionSemanticsFacet semanticsFacet = getFacetHolder().getFacet(ActionSemanticsFacet.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
index 23f13a3..6e06d59 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
@@ -48,6 +48,7 @@ import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects.UnwrapUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import static org.apache.isis.core.commons.internal.base._With.requires;
@@ -126,7 +127,7 @@ public interface CollectionFacet extends Facet {
public static Object[] toArrayOfPojos(@Nullable ManagedObject container) {
val elementAdapters = streamAdapters(container)
.collect(Collectors.toList());
- return ManagedObject.unwrapMultipleAsArray(elementAdapters);
+ return UnwrapUtil.multipleAsArray(elementAdapters);
}
@UtilityClass
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java
index 476db9e..79b3cfa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java
@@ -68,7 +68,7 @@ implements ActionInteractionContext {
return new ActionArgumentUsabilityEvent(
UnwrapUtil.single(getTarget()),
getIdentifier(),
- ManagedObject.unwrapMultipleAsArray(getArgs().toList()),
+ UnwrapUtil.multipleAsArray(getArgs().toList()),
getPosition());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
index 98b218b..5a2ecee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
@@ -67,7 +67,7 @@ implements ProposedHolder, ActionInteractionContext {
return new ActionArgumentEvent(
UnwrapUtil.single(getTarget()),
getIdentifier(),
- ManagedObject.unwrapMultipleAsArray(getArgs().toList()),
+ UnwrapUtil.multipleAsArray(getArgs().toList()),
getPosition());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java
index 319eba3..31a6e80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java
@@ -68,7 +68,7 @@ implements ActionInteractionContext {
return new ActionArgumentVisibilityEvent(
UnwrapUtil.single(getTarget()),
getIdentifier(),
- ManagedObject.unwrapMultipleAsArray(getArgs().toList()),
+ UnwrapUtil.multipleAsArray(getArgs().toList()),
getPosition());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
index 515ea83..6414a80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
@@ -56,7 +56,7 @@ implements ActionInteractionContext {
@Override
public ActionInvocationEvent createInteractionEvent() {
return new ActionInvocationEvent(
- UnwrapUtil.single(getTarget()), getIdentifier(), ManagedObject.unwrapMultipleAsArray(getArgs().toList()));
+ UnwrapUtil.single(getTarget()), getIdentifier(), UnwrapUtil.multipleAsArray(getArgs().toList()));
}
}
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 5e0e049..43c2762 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
@@ -32,7 +32,6 @@ import org.apache.isis.applib.domain.DomainObjectList;
import org.apache.isis.applib.services.repository.EntityState;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Lazy;
-import org.apache.isis.core.commons.internal.collections._Arrays;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
@@ -250,26 +249,6 @@ public interface ManagedObject {
// -- UNWRAPPING
- @Nullable
- public static Object[] unwrapMultipleAsArray(@NonNull final Can<ManagedObject> adapters) {
- val unwrappedObjects = _Arrays.mapCollection(adapters.toList(), UnwrapUtil::single);
- return unwrappedObjects;
- }
-
- @Nullable
- public static Object[] unwrapMultipleAsArray(@Nullable final Collection<ManagedObject> adapters) {
- val unwrappedObjects = _Arrays.mapCollection(adapters, UnwrapUtil::single);
- return unwrappedObjects;
- }
-
- @Nullable
- public static Object[] unwrapMultipleAsArray(@Nullable final ManagedObject[] adapters) {
- val unwrappedObjects = _Arrays.map(adapters, UnwrapUtil::single);
- return unwrappedObjects;
- }
-
-
-
/**
*
* @param adapters
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index d9d3608..17ff150 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -382,7 +382,7 @@ public final class ManagedObjects {
final Can<ManagedObject> pendingArguments,
final List<Object> additionalArguments) {
- val ppmTuple = MethodExtensions.construct(ppmConstructor, ManagedObject.unwrapMultipleAsArray(pendingArguments));
+ val ppmTuple = MethodExtensions.construct(ppmConstructor, UnwrapUtil.multipleAsArray(pendingArguments));
val paramPojos = _Arrays.combineWithExplicitType(Object.class, ppmTuple, additionalArguments.toArray());
return MethodExtensions.invoke(method, UnwrapUtil.single(adapter), paramPojos);
}
@@ -408,7 +408,7 @@ public final class ManagedObjects {
}
public static Object invoke(Method method, ManagedObject adapter, Can<ManagedObject> argumentAdapters) {
- return MethodExtensions.invoke(method, UnwrapUtil.single(adapter), ManagedObject.unwrapMultipleAsArray(argumentAdapters));
+ return MethodExtensions.invoke(method, UnwrapUtil.single(adapter), UnwrapUtil.multipleAsArray(argumentAdapters));
}
public static Object invoke(Method method, ManagedObject adapter, ManagedObject arg0Adapter) {
@@ -416,7 +416,7 @@ public final class ManagedObjects {
}
public static Object invoke(Method method, ManagedObject adapter, ManagedObject[] argumentAdapters) {
- return MethodExtensions.invoke(method, UnwrapUtil.single(adapter), ManagedObject.unwrapMultipleAsArray(argumentAdapters));
+ return MethodExtensions.invoke(method, UnwrapUtil.single(adapter), UnwrapUtil.multipleAsArray(argumentAdapters));
}
/**
@@ -536,6 +536,24 @@ public final class ManagedObjects {
return orElse;
}
+ @Nullable
+ public static Object[] multipleAsArray(@NonNull final Can<ManagedObject> adapters) {
+ val unwrappedObjects = _Arrays.mapCollection(adapters.toList(), UnwrapUtil::single);
+ return unwrappedObjects;
+ }
+
+ @Nullable
+ public static Object[] multipleAsArray(@Nullable final Collection<ManagedObject> adapters) {
+ val unwrappedObjects = _Arrays.mapCollection(adapters, UnwrapUtil::single);
+ return unwrappedObjects;
+ }
+
+ @Nullable
+ public static Object[] multipleAsArray(@Nullable final ManagedObject[] adapters) {
+ val unwrappedObjects = _Arrays.map(adapters, UnwrapUtil::single);
+ return unwrappedObjects;
+ }
+
}