[jboss-cvs] JBossAS SVN: r107547 - projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy.

[jboss-cvs-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2010-08-11 23:53:10 -0400 (Wed, 11 Aug 2010)
New Revision: 107547

Modified:
   projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorMethodHandler.java
   projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java
Log:
Simplify ProxyCreator

Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorMethodHandler.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorMethodHandler.java	2010-08-12 03:47:59 UTC (rev 107546)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorMethodHandler.java	2010-08-12 03:53:10 UTC (rev 107547)
@@ -48,7 +48,7 @@
    private boolean proxy;
 
    public InterceptorMethodHandler(Object targetInstance,
-                                   InterceptorMetadata targetClassMetadata,
+                                   ClassMetadata<?> targetClassMetadata,
                                    InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel,
                                    InterceptorInstantiator<ClassMetadata<?>, ?> interceptorInstantiator,
                                    InvocationContextFactory invocationContextFactory,
@@ -69,7 +69,7 @@
       {
          interceptorHandlerInstances.put(interceptorReference, interceptorInstantiator.createFor(interceptorReference));
       }
-      targetClassInterceptorMetadata = targetClassMetadata;
+      targetClassInterceptorMetadata = InterceptorMetadataUtils.readMetadataForTargetClass(targetClassMetadata);
       this.proxy = proxy;
    }
 

Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java	2010-08-12 03:47:59 UTC (rev 107546)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java	2010-08-12 03:53:10 UTC (rev 107547)
@@ -22,14 +22,14 @@
 
 import javassist.util.proxy.MethodHandler;
 import javassist.util.proxy.ProxyObject;
+
 import org.jboss.interceptor.proxy.javassist.CompositeHandler;
-import org.jboss.interceptor.reader.InterceptorMetadataUtils;
 import org.jboss.interceptor.spi.context.InvocationContextFactory;
 import org.jboss.interceptor.spi.instance.InterceptorInstantiator;
 import org.jboss.interceptor.spi.metadata.ClassMetadata;
-import org.jboss.interceptor.spi.metadata.InterceptorMetadata;
 import org.jboss.interceptor.spi.model.InterceptionModel;
 import org.jboss.interceptor.util.InterceptionUtils;
+
 import sun.reflect.ReflectionFactory;
 
 /**
@@ -109,12 +109,12 @@
 
    public <T> MethodHandler createMethodHandler(Object target, ClassMetadata<T> proxyClass)
    {
-      return new InterceptorMethodHandler(target, InterceptorMetadataUtils.readMetadataForTargetClass(proxyClass), interceptionModel, interceptorInstantiator, invocationContextFactory,  true);
+      return new InterceptorMethodHandler(target, proxyClass, interceptionModel, interceptorInstantiator, invocationContextFactory,  true);
    }
 
     public <T> MethodHandler createSubclassingMethodHandler(Object targetInstance, ClassMetadata<T> proxyClass)
     {
-       return new InterceptorMethodHandler(targetInstance,  InterceptorMetadataUtils.readMetadataForTargetClass(proxyClass), interceptionModel, interceptorInstantiator, invocationContextFactory, false);
+       return new InterceptorMethodHandler(targetInstance,  proxyClass, interceptionModel, interceptorInstantiator, invocationContextFactory, false);
     }