[jboss-cvs] JBossAS SVN: r107156 - in projects/interceptors/trunk/jboss-interceptor/src: main/java/org/jboss/interceptor/proxy and 2 other directories.

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

Author: marius.bogoevici
Date: 2010-07-28 10:58:37 -0400 (Wed, 28 Jul 2010)
New Revision: 107156

Removed:
   projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/
Modified:
   projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptorInstantiator.java
   projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/metadata/InterceptorClassMetadataTestCase.java
   projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java
   projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/SubclassingInterceptionTestCase.java
Log:
removed InterceptorMetadataRegistry - will leave caching/reading of interceptor metadata to client

Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptorInstantiator.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptorInstantiator.java	2010-07-28 14:57:58 UTC (rev 107155)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptorInstantiator.java	2010-07-28 14:58:37 UTC (rev 107156)
@@ -17,7 +17,6 @@
 
 package org.jboss.interceptor.proxy;
 
-import org.jboss.interceptor.registry.InterceptorMetadataRegistry;
 import org.jboss.interceptor.spi.instance.InterceptorInstantiator;
 import org.jboss.interceptor.spi.metadata.ClassMetadata;
 
@@ -26,11 +25,9 @@
  */
 public class DirectClassInterceptorInstantiator implements InterceptorInstantiator<ClassMetadata<?>, Object>
 {
-   private InterceptorMetadataRegistry interceptorMetadataRegistry;
 
-   public DirectClassInterceptorInstantiator(InterceptorMetadataRegistry interceptorMetadataRegistry)
+   public DirectClassInterceptorInstantiator()
    {
-      this.interceptorMetadataRegistry = interceptorMetadataRegistry;
    }
 
    public Object createFor(ClassMetadata<?> clazz)

Modified: projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/metadata/InterceptorClassMetadataTestCase.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/metadata/InterceptorClassMetadataTestCase.java	2010-07-28 14:57:58 UTC (rev 107155)
+++ projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/metadata/InterceptorClassMetadataTestCase.java	2010-07-28 14:58:37 UTC (rev 107156)
@@ -20,14 +20,12 @@
 
 import java.util.List;
 
-import org.jboss.interceptor.registry.InterceptorMetadataRegistry;
-import org.jboss.interceptor.registry.SimpleInterceptorMetadataRegistry;
+import org.jboss.interceptor.reader.InterceptorMetadataUtils;
 import org.jboss.interceptor.reader.ReflectiveClassMetadata;
 import org.jboss.interceptor.spi.metadata.InterceptorMetadata;
 import org.jboss.interceptor.spi.metadata.MethodMetadata;
 import org.jboss.interceptor.spi.model.InterceptionType;
 import org.jboss.interceptor.util.InterceptorMetadataException;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -36,18 +34,10 @@
 public class InterceptorClassMetadataTestCase
 {
 
-   InterceptorMetadataRegistry interceptorMetadataRegistry;
-
-   @Before
-   public void setUp()
-   {
-      interceptorMetadataRegistry = new SimpleInterceptorMetadataRegistry();
-   }
-
    @Test
    public void testInterceptorWithAllMethods()
    {
-      InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassMetadata.of(InterceptorWithAllMethods.class));
+      InterceptorMetadata interceptorClassMetadata = InterceptorMetadataUtils.readMetadataForInterceptorClass(ReflectiveClassMetadata.of(InterceptorWithAllMethods.class));
 
       List<MethodMetadata> postConstructMethods = interceptorClassMetadata.getInterceptorMethods(InterceptionType.POST_CONSTRUCT);
       assertEquals(true, postConstructMethods.size() == 1);
@@ -74,7 +64,7 @@
    @Test
    public void testInterceptorWithSomeMethods()
    {
-      InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassMetadata.of(InterceptorWithSomeMethods.class));
+      InterceptorMetadata interceptorClassMetadata = InterceptorMetadataUtils.readMetadataForInterceptorClass(ReflectiveClassMetadata.of(InterceptorWithSomeMethods.class));
 
       List<MethodMetadata> postConstructMethods = interceptorClassMetadata.getInterceptorMethods(InterceptionType.POST_CONSTRUCT);
       assertEquals(true, postConstructMethods.size() == 0);
@@ -99,7 +89,7 @@
    @Test
    public void testSimpleInheritance()
    {
-      InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassMetadata.of(SimpleInheritanceChildInterceptor.class));
+      InterceptorMetadata interceptorClassMetadata = InterceptorMetadataUtils.readMetadataForInterceptorClass(ReflectiveClassMetadata.of(SimpleInheritanceChildInterceptor.class));
 
       List<MethodMetadata> postConstructMethods = interceptorClassMetadata.getInterceptorMethods(InterceptionType.POST_CONSTRUCT);
       assertEquals(1, postConstructMethods.size());
@@ -123,7 +113,7 @@
    @Test
    public void testInheritanceWithAndWithoutOverriding()
    {
-      InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassMetadata.of(OverrideChildInterceptor.class));
+      InterceptorMetadata interceptorClassMetadata = InterceptorMetadataUtils.readMetadataForInterceptorClass(ReflectiveClassMetadata.of(OverrideChildInterceptor.class));
 
       List<MethodMetadata> postConstructMethods = interceptorClassMetadata.getInterceptorMethods(InterceptionType.POST_CONSTRUCT);
       assertEquals(true, postConstructMethods.size() == 1);
@@ -149,7 +139,7 @@
    @Test(expected = InterceptorMetadataException.class)
    public void testDuplicateAnnotations()
    {
-      InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassMetadata.of(InterceptorWithDuplicateAnnotations.class));
+      InterceptorMetadata interceptorClassMetadata = InterceptorMetadataUtils.readMetadataForInterceptorClass(ReflectiveClassMetadata.of(InterceptorWithDuplicateAnnotations.class));
 
    }
 

Modified: projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java	2010-07-28 14:57:58 UTC (rev 107155)
+++ projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java	2010-07-28 14:58:37 UTC (rev 107156)
@@ -32,9 +32,8 @@
 import org.jboss.interceptor.proxy.DirectClassInterceptorInstantiator;
 import org.jboss.interceptor.proxy.InterceptorProxyCreatorImpl;
 import org.jboss.interceptor.proxy.javassist.CompositeHandler;
+import org.jboss.interceptor.reader.InterceptorMetadataUtils;
 import org.jboss.interceptor.reader.ReflectiveClassMetadata;
-import org.jboss.interceptor.registry.InterceptorMetadataRegistry;
-import org.jboss.interceptor.registry.SimpleInterceptorMetadataRegistry;
 import org.jboss.interceptor.spi.metadata.ClassMetadata;
 import org.jboss.interceptor.spi.metadata.InterceptorMetadata;
 import org.jboss.interceptor.spi.model.InterceptionModel;
@@ -100,13 +99,10 @@
 
    private DirectClassInterceptorInstantiator interceptionHandlerFactory;
 
-   private InterceptorMetadataRegistry interceptorMetadataRegistry;
-
    @Before
    public void setUp()
    {
-      interceptorMetadataRegistry = new SimpleInterceptorMetadataRegistry();
-      interceptionHandlerFactory = new DirectClassInterceptorInstantiator(interceptorMetadataRegistry);
+      interceptionHandlerFactory = new DirectClassInterceptorInstantiator();
    }
 
    public void resetLogAndSetupClassesForMethod() throws Exception
@@ -464,7 +460,7 @@
    private <T> T proxifyInstance(T instance, Class<? extends T> targetClass)
    {
       InterceptorProxyCreatorImpl ipc = new InterceptorProxyCreatorImpl(interceptionHandlerFactory, interceptionModelRegistry.get(targetClass));
-      InterceptorMetadata classMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassMetadata.of(targetClass), true);
+      InterceptorMetadata classMetadata = InterceptorMetadataUtils.readMetadataForTargetClass(ReflectiveClassMetadata.of(targetClass));
       ClassMetadata<? extends T> targetClassMetadata = ReflectiveClassMetadata.of(targetClass);
       MethodHandler methodHandler = ipc.createMethodHandler(instance, targetClassMetadata, classMetadata);
       Class<? extends T> proxyClassWithHandler = InterceptionUtils.createProxyClassWithHandler(targetClassMetadata, methodHandler);

Modified: projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/SubclassingInterceptionTestCase.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/SubclassingInterceptionTestCase.java	2010-07-28 14:57:58 UTC (rev 107155)
+++ projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/SubclassingInterceptionTestCase.java	2010-07-28 14:58:37 UTC (rev 107156)
@@ -29,9 +29,8 @@
 import org.jboss.interceptor.proxy.DirectClassInterceptorInstantiator;
 import org.jboss.interceptor.proxy.InterceptorProxyCreatorImpl;
 import org.jboss.interceptor.proxy.javassist.CompositeHandler;
+import org.jboss.interceptor.reader.InterceptorMetadataUtils;
 import org.jboss.interceptor.reader.ReflectiveClassMetadata;
-import org.jboss.interceptor.registry.InterceptorMetadataRegistry;
-import org.jboss.interceptor.registry.SimpleInterceptorMetadataRegistry;
 import org.jboss.interceptor.spi.metadata.ClassMetadata;
 import org.jboss.interceptor.spi.model.InterceptionModel;
 import org.jboss.interceptor.util.InterceptionUtils;
@@ -96,13 +95,10 @@
 
    private DirectClassInterceptorInstantiator interceptionHandlerFactory;
 
-   private InterceptorMetadataRegistry interceptorMetadataRegistry;
-
    @Before
    public void setUp()
    {
-      interceptorMetadataRegistry = new SimpleInterceptorMetadataRegistry();
-      interceptionHandlerFactory = new DirectClassInterceptorInstantiator(interceptorMetadataRegistry);
+      interceptionHandlerFactory = new DirectClassInterceptorInstantiator();
    }
 
    public void resetLogAndSetupClassesForMethod() throws Exception
@@ -449,7 +445,7 @@
    {
       InterceptionModel<ClassMetadata<?>, ClassMetadata> classMetadataInterceptionModel =  interceptionModelRegistry.get(targetClass);
       InterceptorProxyCreatorImpl ipc = new InterceptorProxyCreatorImpl(interceptionHandlerFactory, classMetadataInterceptionModel);
-      return ipc.createProxyFromClass(ReflectiveClassMetadata.of((Class<? extends T>) targetClass), new Class<?>[]{String.class}, args, interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassMetadata.of((Class<? extends T>) targetClass), true));
+      return ipc.createProxyFromClass(ReflectiveClassMetadata.of((Class<? extends T>) targetClass), new Class<?>[]{String.class}, args, InterceptorMetadataUtils.readMetadataForTargetClass(ReflectiveClassMetadata.of((Class<? extends T>) targetClass)));
    }
 
 }
\ No newline at end of file