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 2019/12/17 10:27:46 UTC
[isis] branch master updated: ISIS-2226: fixes method invocation
verbose exception creation
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 3869b34 ISIS-2226: fixes method invocation verbose exception creation
3869b34 is described below
commit 3869b3405a2f654495861c7b5f835ada5f83f3d2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 17 11:27:37 2019 +0100
ISIS-2226: fixes method invocation verbose exception creation
prevents an ArrayIndexOutOfBoundsException happening during creation of
a message for an exception
---
.../isis/commons/internal/collections/_Arrays.java | 22 ++++++++++++++++++++
.../commons/MethodInvocationPreprocessor.java | 24 +++++++++++++++++-----
.../manager/AuthorizationManager.java | 6 +++++-
3 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
index 29f0ac6..e7eb1ab 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
@@ -22,6 +22,7 @@ package org.apache.isis.commons.internal.collections;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Optional;
import java.util.function.BiPredicate;
import java.util.stream.Collector;
@@ -296,6 +297,27 @@ public final class _Arrays {
}
return arrayType.getComponentType();
}
+
+ // -- ACCESSOR
+
+ /**
+ * Optionally returns an array element by index, based on whether the index is valid.
+ * @param <T>
+ * @param array
+ * @param index
+ */
+ public static <T> Optional<T> get(@Nullable T[] array, int index) {
+ val size = _NullSafe.size(array);
+ if(size==0) {
+ return Optional.empty();
+ }
+ val minIndex = 0;
+ val maxIndex = size - 1;
+ if(index < minIndex || index > maxIndex) {
+ return Optional.empty();
+ }
+ return Optional.ofNullable(array[index]);
+ }
// --
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
index 346ec62..5939a5b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
@@ -27,11 +27,14 @@ import java.util.Set;
import java.util.SortedSet;
import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.commons.internal.collections._Collections;
import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+import lombok.val;
+
/**
* Utility for method invocation pre-processing.
* <p>
@@ -121,15 +124,26 @@ public class MethodInvocationPreprocessor {
Object[] adaptedExecutionParameters,
IllegalArgumentException e) {
- final StringBuilder sb = new StringBuilder();
-
+ val sb = new StringBuilder();
+
+ val expectedParamCount = _NullSafe.size(parameterTypes);
+ val actualParamCount = _NullSafe.size(adaptedExecutionParameters);
+ if(expectedParamCount!=actualParamCount) {
+ sb.append(String.format("expected-param-count mismatch: expected %d, got %d\n",
+ expectedParamCount, actualParamCount));
+ }
+
for(int j=0;j<parameterTypes.length;++j) {
final Class<?> parameterType = parameterTypes[j];
- final Object parameterValue = adaptedExecutionParameters[j];
+ final String parameterValueTypeLiteral = _Arrays.get(adaptedExecutionParameters, j)
+ .map(Object::getClass)
+ .map(Class::getName)
+ .orElse("missing or null");
- sb.append(String.format("expected-param-type[%d]: %s, got %s\n",
- j, parameterType.getName(), parameterValue.getClass().getName()));
+ sb.append(String.format("expected-param-type[%d]: '%s', got '%s'\n",
+ j, parameterType.getName(), parameterValueTypeLiteral));
}
+
// re-throw more verbose
return new IllegalArgumentException(sb.toString(), e);
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java b/core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
index 570b7c0..2791681 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
@@ -19,6 +19,7 @@
package org.apache.isis.security.api.authorization.manager;
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Named;
@@ -108,7 +109,10 @@ public class AuthorizationManager {
return false;
}
- private static boolean containsSudoSuperuserRole(final AuthenticationSession session) {
+ private static boolean containsSudoSuperuserRole(@Nullable final AuthenticationSession session) {
+ if(session==null) {
+ return false;
+ }
return session.hasRole(SudoService.ACCESS_ALL_ROLE);
}