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/01/07 23:39:08 UTC
[isis] branch master updated: ISIS-2226 revert wrapping value with
Optional, since Lists can hold null
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 6865f77 ISIS-2226 revert wrapping value with Optional, since Lists can hold null
6865f77 is described below
commit 6865f773419f543bcefac7e497b877e349e3fdfc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 8 00:38:58 2020 +0100
ISIS-2226 revert wrapping value with Optional, since Lists can hold null
---
.../method/ActionParameterAutoCompleteFacetViaMethod.java | 4 +---
.../main/java/org/apache/isis/metamodel/spec/ManagedObject.java | 7 +++----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
index b392fce..1feee47 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
@@ -23,9 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
@@ -86,7 +84,7 @@ implements ImperativeFacet {
final Object collectionOrArray =
ManagedObject.InvokeUtil.invokeAutofit(
method, owningAdapter, pendingArgs,
- Collections.singletonList(Optional.ofNullable(searchArg)));
+ Collections.singletonList(searchArg));
if (collectionOrArray == null) {
return _Constants.emptyObjects;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
index 8d07c3f..03eac6a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -474,7 +473,7 @@ public interface ManagedObject {
final Method method,
final ManagedObject target,
final List<? extends ManagedObject> pendingArgs,
- final List<Optional<Object>> additionalArgValues) {
+ final List<Object> additionalArgValues) {
val argArray = adjust(method, pendingArgs, additionalArgValues);
@@ -495,7 +494,7 @@ public interface ManagedObject {
private static Object[] adjust(
final Method method,
final List<? extends ManagedObject> pendingArgs,
- final List<Optional<Object>> additionalArgValues) {
+ final List<Object> additionalArgValues) {
val parameterTypes = method.getParameterTypes();
val paramCount = parameterTypes.length;
@@ -516,7 +515,7 @@ public interface ManagedObject {
int paramIndex = pendingArgsToConsiderCount;
for(val additionalArg : additionalArgValues) {
val paramType = parameterTypes[paramIndex];
- adjusted[paramIndex] = honorPrimitiveDefaults(paramType, additionalArg.orElse(null));
+ adjusted[paramIndex] = honorPrimitiveDefaults(paramType, additionalArg);
++paramIndex;
}