DELTASPIKE-1179 And now tests pass with this configuration.
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 @@
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;
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 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);
}
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 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);
}
