You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2016/07/06 01:52:31 UTC
deltaspike git commit: DELTASPIKE-1179 And now tests pass with this
configuration.
Repository: deltaspike
Updated Branches:
refs/heads/master bc8c82e5b -> 5e6c6ab2b
DELTASPIKE-1179 And now tests pass with this configuration.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5e6c6ab2
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5e6c6ab2
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5e6c6ab2
Branch: refs/heads/master
Commit: 5e6c6ab2bdf9b969d4407786e851e305cc7fd25c
Parents: bc8c82e
Author: John D. Ament <jo...@apache.org>
Authored: Tue Jul 5 21:52:13 2016 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Tue Jul 5 21:52:13 2016 -0400
----------------------------------------------------------------------
.../impl/invocation/AbstractManualInvocationHandler.java | 2 --
.../impl/invocation/DelegateManualInvocationHandler.java | 7 ++++---
.../impl/invocation/InterceptManualInvocationHandler.java | 7 ++++---
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5e6c6ab2/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/AbstractManualInvocationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/AbstractManualInvocationHandler.java b/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/AbstractManualInvocationHandler.java
index b105206..37f763c 100644
--- a/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/AbstractManualInvocationHandler.java
+++ b/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/AbstractManualInvocationHandler.java
@@ -21,11 +21,9 @@ package org.apache.deltaspike.proxy.impl.invocation;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.util.List;
-import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.Interceptor;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-@Typed
public abstract class AbstractManualInvocationHandler implements InvocationHandler
{
private volatile Boolean initialized;
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5e6c6ab2/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/DelegateManualInvocationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/DelegateManualInvocationHandler.java b/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/DelegateManualInvocationHandler.java
index a4911f7..91587ea 100644
--- a/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/DelegateManualInvocationHandler.java
+++ b/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/DelegateManualInvocationHandler.java
@@ -24,18 +24,19 @@ import org.apache.deltaspike.proxy.spi.DeltaSpikeProxy;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
-import javax.enterprise.inject.Typed;
+import javax.enterprise.context.ApplicationScoped;
/**
* {@link AbstractManualInvocationHandler} which delegates the method call to the defined {@link InvocationHandler}
* in {@link DeltaSpikeProxy#getDelegateInvocationHandler()}.
*/
-@Typed
+@ApplicationScoped
public class DelegateManualInvocationHandler extends AbstractManualInvocationHandler
{
public static Object staticInvoke(Object proxy, Method method, Object[] parameters) throws Throwable
{
- DelegateManualInvocationHandler handler = BeanProvider.getContextualReference(DelegateManualInvocationHandler.class);
+ DelegateManualInvocationHandler handler = BeanProvider
+ .getContextualReference(DelegateManualInvocationHandler.class);
return handler.invoke(proxy, method, parameters);
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5e6c6ab2/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/InterceptManualInvocationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/InterceptManualInvocationHandler.java b/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/InterceptManualInvocationHandler.java
index b4f7d7a..49caaef 100644
--- a/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/InterceptManualInvocationHandler.java
+++ b/deltaspike/modules/proxy/impl-asm5/src/main/java/org/apache/deltaspike/proxy/impl/invocation/InterceptManualInvocationHandler.java
@@ -24,17 +24,18 @@ import org.apache.deltaspike.proxy.api.DeltaSpikeProxyFactory;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import javax.enterprise.inject.Typed;
+import javax.enterprise.context.ApplicationScoped;
/**
* {@link AbstractManualInvocationHandler} which just delegates to the original method after invoking interceptors.
*/
-@Typed
+@ApplicationScoped
public class InterceptManualInvocationHandler extends AbstractManualInvocationHandler
{
public static Object staticInvoke(Object proxy, Method method, Object[] parameters) throws Throwable
{
- InterceptManualInvocationHandler handler = BeanProvider.getContextualReference(InterceptManualInvocationHandler.class);
+ InterceptManualInvocationHandler handler = BeanProvider
+ .getContextualReference(InterceptManualInvocationHandler.class);
return handler.invoke(proxy, method, parameters);
}