You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/01/04 20:56:24 UTC
git commit: DELTASPIKE-299 cleanup
Updated Branches:
refs/heads/master 4f10de53e -> 8bd3795aa
DELTASPIKE-299 cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/8bd3795a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/8bd3795a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/8bd3795a
Branch: refs/heads/master
Commit: 8bd3795aa4f4372c52b259ec65d5c2b8eeaa3095
Parents: 4f10de5
Author: gpetracek <gp...@apache.org>
Authored: Fri Jan 4 20:53:03 2013 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Fri Jan 4 20:54:15 2013 +0100
----------------------------------------------------------------------
.../deltaspike/core/util/ReflectionUtils.java | 10 +++++++-
.../util/metadata/builder/InjectableMethod.java | 5 +--
.../impl/exclude/extension/ExcludeExtension.java | 2 +-
.../security/impl/extension/Authorizer.java | 16 ++------------
4 files changed, 14 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8bd3795a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
index c5c09e5..60f10e1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
@@ -170,8 +170,7 @@ public abstract class ReflectionUtils
public static <T> T invokeMethod(Object instance,
Method method, Class<T> expectedReturnType,
boolean setAccessible,
- Object... args)
- throws InvocationTargetException, IllegalAccessException, IllegalArgumentException
+ Object... args) throws IllegalAccessException, IllegalArgumentException
{
if (setAccessible && !method.isAccessible())
{
@@ -189,6 +188,13 @@ public abstract class ReflectionUtils
{
return expectedReturnType.cast(method.invoke(instance, args));
}
+ catch (InvocationTargetException e)
+ {
+ //re-visit DELTASPIKE-299 before changing this part
+ ExceptionUtils.throwAsRuntimeException(e.getCause());
+ //won't happen
+ return null;
+ }
catch (Exception e)
{
String customMessage = createCustomMessage(e, method, instance, args);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8bd3795a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
index 3cb28d1..84eff15 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
@@ -25,7 +25,6 @@ import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -134,7 +133,7 @@ public class InjectableMethod<X>
* method fails.
*/
public <T> T invoke(Object receiver, CreationalContext<T> creationalContext)
- throws InvocationTargetException, IllegalAccessException, IllegalArgumentException
+ throws IllegalAccessException, IllegalArgumentException
{
return invoke(receiver, creationalContext, null);
}
@@ -168,7 +167,7 @@ public class InjectableMethod<X>
* method fails.
*/
public <T> T invoke(Object receiver, CreationalContext<T> creationalContext, ParameterValueRedefiner redefinition)
- throws InvocationTargetException, IllegalAccessException, IllegalArgumentException
+ throws IllegalAccessException, IllegalArgumentException
{
List<Object> parameterValues = new ArrayList<Object>();
for (int i = 0; i < getParameters().size(); i++)
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8bd3795a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index 49c17d2..4b1bf2a 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -368,7 +368,7 @@ public class ExcludeExtension implements Extension, Deactivatable
catch (Exception e)
{
throw new IllegalStateException("Can't compare " + currentQualifier.annotationType().getName() +
- " with " + qualifierConfiguredBean.annotationType().getName());
+ " with " + qualifierConfiguredBean.annotationType().getName(), e);
}
}
return true;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8bd3795a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
index cea02cb..eb6e8ae 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
@@ -36,7 +36,6 @@ import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.Nonbinding;
import javax.interceptor.InvocationContext;
-import org.apache.deltaspike.core.util.ExceptionUtils;
import org.apache.deltaspike.core.util.metadata.builder.InjectableMethod;
import org.apache.deltaspike.security.api.authorization.AccessDeniedException;
import org.apache.deltaspike.security.api.authorization.SecurityDefinitionException;
@@ -168,7 +167,7 @@ class Authorizer
}
void authorize(final InvocationContext ic, final Object returnValue, BeanManager beanManager)
- throws InvocationTargetException, IllegalAccessException, IllegalArgumentException
+ throws IllegalAccessException, IllegalArgumentException
{
if (boundAuthorizerBean == null)
{
@@ -180,17 +179,8 @@ class Authorizer
Object reference = beanManager.getReference(boundAuthorizerBean,
boundAuthorizerMethod.getJavaMember().getDeclaringClass(), creationalContext);
- Object result = null;
- try
- {
- result = boundAuthorizerMethodProxy.invoke(reference, creationalContext,
- new SecurityParameterValueRedefiner(creationalContext, ic, returnValue));
- }
- catch (InvocationTargetException e)
- {
- //see DELTASPIKE-299
- ExceptionUtils.throwAsRuntimeException(e.getCause());
- }
+ Object result = boundAuthorizerMethodProxy.invoke(reference, creationalContext,
+ new SecurityParameterValueRedefiner(creationalContext, ic, returnValue));
if (Boolean.FALSE.equals(result))
{