Author: dblevins
Date: Fri Aug 10 04:17:13 2012
New Revision: 1371560
URL: http://svn.apache.org/viewvc?rev=1371560&view=rev
Log:
OPENEJB-1885 Simply EJB Proxy Code
Removed:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/InvocationHandler.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java?rev=1371560&r1=1371559&r2=1371560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
Fri Aug 10 04:17:13 2012
@@ -56,12 +56,11 @@ import org.apache.openejb.BeanContext;
import org.apache.openejb.BeanType;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.RpcContainer;
-import org.apache.openejb.core.BaseContext;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.spi.SecurityService;
-import org.apache.openejb.util.proxy.InvocationHandler;
+import java.lang.reflect.InvocationHandler;
import org.apache.openejb.util.proxy.ProxyManager;
public abstract class BaseEjbProxyHandler implements InvocationHandler,
Serializable {
@@ -216,10 +215,6 @@ public abstract class BaseEjbProxyHandle
setDoIntraVmCopy(on);
}
- public InvocationHandler getInvocationHandler() {
- return this;
- }
-
public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
isValidReference(method);
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java?rev=1371560&r1=1371559&r2=1371560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java
Fri Aug 10 04:17:13 2012
@@ -27,7 +27,7 @@ import org.apache.xbean.finder.MetaAnnot
import javax.naming.NamingException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import java.lang.reflect.Method;
+import java.lang.reflect.*;
public class DynamicProxyImplFactory {
public static boolean isKnownDynamicallyImplemented(Class<?> clazz) {
@@ -72,18 +72,13 @@ public class DynamicProxyImplFactory {
return null;
}
- private static class Handler implements InvocationHandler {
+ private static class Handler implements
java.lang.reflect.InvocationHandler {
private java.lang.reflect.InvocationHandler handler;
private Handler(java.lang.reflect.InvocationHandler handler) {
this.handler = handler;
}
- @Override
- public InvocationHandler getInvocationHandler() {
- return this;
- }
-
public java.lang.reflect.InvocationHandler realHandler() {
return handler;
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java?rev=1371560&r1=1371559&r2=1371560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java
Fri Aug 10 04:17:13 2012
@@ -34,10 +34,8 @@ public class Jdk13ProxyFactory implement
public void init(Properties props) throws OpenEJBException {
}
- public org.apache.openejb.util.proxy.InvocationHandler
getInvocationHandler(Object proxy) throws IllegalArgumentException {
- InvocationHandler handler = (InvocationHandler)
Proxy.getInvocationHandler(proxy);
- if (handler == null) return null;
- return handler.getInvocationHandler();
+ public java.lang.reflect.InvocationHandler getInvocationHandler(Object
proxy) throws IllegalArgumentException {
+ return (java.lang.reflect.InvocationHandler)
Proxy.getInvocationHandler(proxy);
}
public Class getProxyClass(Class interfce) throws IllegalArgumentException
{
@@ -62,7 +60,7 @@ public class Jdk13ProxyFactory implement
* Returns an instance of a proxy class for the specified interface that
dispatches method invocations to
* the specified invocation handler.
*/
- public Object newProxyInstance(Class interfce,
org.apache.openejb.util.proxy.InvocationHandler h) throws
IllegalArgumentException {
+ public Object newProxyInstance(Class interfce,
java.lang.reflect.InvocationHandler h) throws IllegalArgumentException {
try {
return Proxy.newProxyInstance(interfce.getClassLoader(), new
Class[]{interfce}, h);
} catch (IllegalArgumentException iae) {
@@ -80,7 +78,7 @@ public class Jdk13ProxyFactory implement
* Returns an instance of a proxy class for the specified interface that
dispatches method invocations to
* the specified invocation handler.
*/
- public Object newProxyInstance(Class[] interfaces,
org.apache.openejb.util.proxy.InvocationHandler handler) throws
IllegalArgumentException {
+ public Object newProxyInstance(Class[] interfaces,
java.lang.reflect.InvocationHandler handler) throws IllegalArgumentException {
if (interfaces.length < 1) {
throw new IllegalArgumentException("It's boring to implement 0
interfaces!");
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=1371560&r1=1371559&r2=1371560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
Fri Aug 10 04:17:13 2012
@@ -35,12 +35,12 @@ public class LocalBeanProxyFactory {
}
}
- public static InvocationHandler getInvocationHandler(Object proxy) {
+ public static java.lang.reflect.InvocationHandler
getInvocationHandler(Object proxy) {
try {
final Field field =
proxy.getClass().getDeclaredField(LocalBeanProxyGeneratorImpl.BUSSINESS_HANDLER_NAME);
field.setAccessible(true);
try {
- return (InvocationHandler) field.get(proxy);
+ return (java.lang.reflect.InvocationHandler) field.get(proxy);
} finally {
field.setAccessible(false);
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java?rev=1371560&r1=1371559&r2=1371560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java
Fri Aug 10 04:17:13 2012
@@ -24,7 +24,7 @@ public interface ProxyFactory {
public void init(Properties props) throws OpenEJBException;
- public InvocationHandler getInvocationHandler(Object proxy) throws
IllegalArgumentException;
+ public java.lang.reflect.InvocationHandler getInvocationHandler(Object
proxy) throws IllegalArgumentException;
public Class getProxyClass(Class interfce) throws IllegalArgumentException;
@@ -39,13 +39,13 @@ public interface ProxyFactory {
* Returns an instance of a proxy class for the specified interface that
dispatches method invocations to
* the specified invocation handler.
*/
- public Object newProxyInstance(Class interfce, InvocationHandler h) throws
IllegalArgumentException;
+ public Object newProxyInstance(Class interfce,
java.lang.reflect.InvocationHandler h) throws IllegalArgumentException;
/*
* Returns an instance of a proxy class for the specified interface that
dispatches method invocations to
* the specified invocation handler.
*/
- public Object newProxyInstance(Class[] interfaces, InvocationHandler h)
throws IllegalArgumentException;
+ public Object newProxyInstance(Class[] interfaces,
java.lang.reflect.InvocationHandler h) throws IllegalArgumentException;
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java?rev=1371560&r1=1371559&r2=1371560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java
Fri Aug 10 04:17:13 2012
@@ -59,7 +59,7 @@ public class ProxyManager {
return defaultFactoryName;
}
- public static InvocationHandler getInvocationHandler(Object proxy) {
+ public static java.lang.reflect.InvocationHandler
getInvocationHandler(Object proxy) {
if (proxy.getClass().getName().endsWith("$LocalBeanProxy")) {
return LocalBeanProxyFactory.getInvocationHandler(proxy);
}
@@ -76,11 +76,11 @@ public class ProxyManager {
return defaultFactory.getProxyClass(interfaces);
}
- public static Object newProxyInstance(Class interfaceType,
InvocationHandler h) throws IllegalAccessException {
+ public static Object newProxyInstance(Class interfaceType,
java.lang.reflect.InvocationHandler h) throws IllegalAccessException {
return newProxyInstance(new Class[]{interfaceType}, h);
}
- public static Object newProxyInstance(Class[] interfaces,
InvocationHandler h) throws IllegalAccessException {
+ public static Object newProxyInstance(Class[] interfaces,
java.lang.reflect.InvocationHandler h) throws IllegalAccessException {
checkDefaultFactory();
return defaultFactory.newProxyInstance(interfaces, h);
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java?rev=1371560&r1=1371559&r2=1371560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
Fri Aug 10 04:17:13 2012
@@ -43,7 +43,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-public class QueryProxy implements InvocationHandler {
+public class QueryProxy implements java.lang.reflect.InvocationHandler {
private static final Logger LOGGER =
Logger.getInstance(LogCategory.OPENEJB, QueryProxy.class);
// keywords
@@ -374,8 +374,4 @@ public class QueryProxy implements Invoc
return "OpenEJB :: QueryProxy";
}
- @Override
- public InvocationHandler getInvocationHandler() {
- return this;
- }
}
