[jboss-cvs] JBossAS SVN: r100381 - in projects/interceptors/trunk/jboss-interceptor/src: main/java/org/jboss/interceptor/proxy and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 4 00:09:14 EST 2010
Author: marius.bogoevici
Date: 2010-02-04 00:09:12 -0500 (Thu, 04 Feb 2010)
New Revision: 100381
Modified:
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/model/metadata/ImmutableIteratorWrapper.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptionHandlerFactory.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/ClassMetadataReader.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/InterceptorMetadataRegistry.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/SimpleClassMetadataReader.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
Log:
final fixes for metadata retrieval
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/model/metadata/ImmutableIteratorWrapper.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/model/metadata/ImmutableIteratorWrapper.java 2010-02-04 04:41:03 UTC (rev 100380)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/model/metadata/ImmutableIteratorWrapper.java 2010-02-04 05:09:12 UTC (rev 100381)
@@ -27,7 +27,7 @@
private Iterator<T> originalIterator;
- ImmutableIteratorWrapper(Iterator<T> originalIterator)
+ protected ImmutableIteratorWrapper(Iterator<T> originalIterator)
{
this.originalIterator = originalIterator;
}
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptionHandlerFactory.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptionHandlerFactory.java 2010-02-04 04:41:03 UTC (rev 100380)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptionHandlerFactory.java 2010-02-04 05:09:12 UTC (rev 100381)
@@ -18,6 +18,7 @@
package org.jboss.interceptor.proxy;
import org.jboss.interceptor.model.metadata.ClassReference;
+import org.jboss.interceptor.model.metadata.ReflectiveClassReference;
import org.jboss.interceptor.registry.InterceptorMetadataRegistry;
/**
@@ -34,6 +35,6 @@
public InterceptionHandler createFor(Class<?> clazz)
{
- return new DirectClassInterceptionHandler(clazz, interceptorMetadataRegistry.getInterceptorClassMetadata(clazz));
+ return new DirectClassInterceptionHandler(clazz, interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassReference.of(clazz)));
}
}
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/ClassMetadataReader.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/ClassMetadataReader.java 2010-02-04 04:41:03 UTC (rev 100380)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/ClassMetadataReader.java 2010-02-04 05:09:12 UTC (rev 100381)
@@ -18,11 +18,12 @@
package org.jboss.interceptor.registry;
import org.jboss.interceptor.model.InterceptorMetadata;
+import org.jboss.interceptor.model.metadata.ClassReference;
/**
* @author Marius Bogoevici
*/
public interface ClassMetadataReader
{
- InterceptorMetadata getInterceptorMetadata(Class<?> clazz, boolean isTargetClass);
+ InterceptorMetadata getInterceptorMetadata(ClassReference clazz, boolean isTargetClass);
}
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/InterceptorMetadataRegistry.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/InterceptorMetadataRegistry.java 2010-02-04 04:41:03 UTC (rev 100380)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/InterceptorMetadataRegistry.java 2010-02-04 05:09:12 UTC (rev 100381)
@@ -29,7 +29,7 @@
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
-public class InterceptorMetadataRegistry
+public class InterceptorMetadataRegistry<T>
{
private final Map<Key, InterceptorMetadata> interceptorClassMetadataMap = new ConcurrentHashMap<Key, InterceptorMetadata>();
@@ -42,12 +42,12 @@
this.classMetadataReader = classMetadataReader;
}
- public InterceptorMetadata getInterceptorClassMetadata(Class<?> interceptorClass)
+ public InterceptorMetadata getInterceptorClassMetadata(ClassReference interceptorClass)
{
return this.getInterceptorClassMetadata(interceptorClass, false);
}
- public InterceptorMetadata getInterceptorClassMetadata(Class<?> interceptorClass, boolean isInterceptorTargetClass)
+ public InterceptorMetadata getInterceptorClassMetadata(ClassReference interceptorClass, boolean isInterceptorTargetClass)
{
Key key = new Key(interceptorClass, isInterceptorTargetClass);
if (!interceptorClassMetadataMap.containsKey(key))
@@ -71,15 +71,20 @@
}
+ public void cleanup()
+ {
+ this.interceptorClassMetadataMap.clear();
+ }
+
public static final class Key
{
private String className;
private boolean isInterceptorTargetClass;
- private Key(Class<?> clazz, boolean interceptorTargetClass)
+ private Key(ClassReference clazz, boolean interceptorTargetClass)
{
- this.className = clazz.getName();
+ this.className = clazz.getClassName();
isInterceptorTargetClass = interceptorTargetClass;
}
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/SimpleClassMetadataReader.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/SimpleClassMetadataReader.java 2010-02-04 04:41:03 UTC (rev 100380)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/registry/SimpleClassMetadataReader.java 2010-02-04 05:09:12 UTC (rev 100381)
@@ -21,6 +21,7 @@
import org.jboss.interceptor.model.InterceptorMetadata;
import org.jboss.interceptor.model.metadata.AbstractInterceptorMetadata;
import org.jboss.interceptor.model.metadata.AbstractInterceptorMetadataSerializationProxy;
+import org.jboss.interceptor.model.metadata.ClassReference;
import org.jboss.interceptor.model.metadata.ReflectiveClassReference;
import org.jboss.interceptor.util.ReflectionUtils;
@@ -31,9 +32,9 @@
{
private static SimpleClassMetadataReader instance = new SimpleClassMetadataReader();
- public InterceptorMetadata getInterceptorMetadata(Class<?> clazz, final boolean isInterceptorTargetClass)
+ public InterceptorMetadata getInterceptorMetadata(ClassReference clazz, final boolean isInterceptorTargetClass)
{
- return new AbstractInterceptorMetadata(ReflectiveClassReference.of(clazz), isInterceptorTargetClass)
+ return new AbstractInterceptorMetadata(clazz, isInterceptorTargetClass)
{
@Override
protected Object createSerializableProxy()
@@ -65,7 +66,7 @@
protected InterceptorMetadata loadInterceptorMetadata() throws ClassNotFoundException
{
Class<?> clazz = ReflectionUtils.classForName(getClassName());
- return SimpleClassMetadataReader.instance.getInterceptorMetadata(clazz, isInterceptionTargetClass());
+ return SimpleClassMetadataReader.instance.getInterceptorMetadata(ReflectiveClassReference.of(clazz), isInterceptionTargetClass());
}
private Object readResolve()
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-02-04 04:41:03 UTC (rev 100380)
+++ projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/metadata/InterceptorClassMetadataTestCase.java 2010-02-04 05:09:12 UTC (rev 100381)
@@ -49,7 +49,7 @@
@Test
public void testInterceptorWithAllMethods()
{
- InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(InterceptorWithAllMethods.class);
+ InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassReference.of(InterceptorWithAllMethods.class));
List<MethodReference> postConstructMethods = interceptorClassMetadata.getInterceptorMethods(InterceptionType.POST_CONSTRUCT);
assertEquals(true, postConstructMethods.size() == 1);
@@ -76,7 +76,7 @@
@Test
public void testInterceptorWithSomeMethods()
{
- InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(InterceptorWithSomeMethods.class);
+ InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassReference.of(InterceptorWithSomeMethods.class));
List<MethodReference> postConstructMethods = interceptorClassMetadata.getInterceptorMethods(InterceptionType.POST_CONSTRUCT);
assertEquals(true, postConstructMethods.size() == 0);
@@ -101,7 +101,7 @@
@Test
public void testSimpleInheritance()
{
- InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(SimpleInheritanceChildInterceptor.class);
+ InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassReference.of(SimpleInheritanceChildInterceptor.class));
List<MethodReference> postConstructMethods = interceptorClassMetadata.getInterceptorMethods(InterceptionType.POST_CONSTRUCT);
assertEquals(1, postConstructMethods.size());
@@ -125,7 +125,7 @@
@Test
public void testInheritanceWithAndWithoutOverriding()
{
- InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(OverrideChildInterceptor.class);
+ InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassReference.of(OverrideChildInterceptor.class));
List<MethodReference> postConstructMethods = interceptorClassMetadata.getInterceptorMethods(InterceptionType.POST_CONSTRUCT);
assertEquals(true, postConstructMethods.size() == 1);
@@ -151,7 +151,7 @@
@Test(expected = InterceptorMetadataException.class)
public void testDuplicateAnnotations()
{
- InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(InterceptorWithDuplicateAnnotations.class);
+ InterceptorMetadata interceptorClassMetadata = interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassReference.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-02-04 04:41:03 UTC (rev 100380)
+++ projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java 2010-02-04 05:09:12 UTC (rev 100381)
@@ -398,7 +398,7 @@
private <T> T proxifyInstance(T instance, Class<? extends T> targetClass)
{
InterceptorProxyCreator ipc = new InterceptorProxyCreatorImpl(interceptorRegistry, interceptionHandlerFactory);
- MethodHandler methodHandler = ipc.createMethodHandler(instance, targetClass, interceptorMetadataRegistry.getInterceptorClassMetadata(targetClass, true));
+ MethodHandler methodHandler = ipc.createMethodHandler(instance, targetClass, interceptorMetadataRegistry.getInterceptorClassMetadata(ReflectiveClassReference.of(targetClass), true));
return ipc.createProxyInstance(InterceptionUtils.createProxyClassWithHandler(targetClass, methodHandler), methodHandler);
}
}
More information about the jboss-cvs-commits
mailing list