commit e77cdaaed85bd96aa741c1ce92f7e8a06ce8558b
author Matthew Jason Benson <mbenson@apache.org> Fri Jul 23 22:29:31 2010 +0000
committer Matthew Jason Benson <mbenson@apache.org> Fri Jul 23 22:29:31 2010 +0000
tree 68b2aab49066cb7cf6b39904d9fe7ba792d4e65e
parent 705cc91b1479fcb85ba782a0c15694ae67ccb2ee

use a shared instance of StubProxyFactory per AnnotationFactory instance

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/branches/version-2.0-work@967287 13f79535-47bb-0310-9956-ffa450edef68

stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java

diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java b/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java
index ab24dde..21cc891 100644
--- a/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java
+++ b/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java
@@ -47,6 +47,31 @@
         }
     };
 
+    private static final ThreadLocal<Object> CONFIGURER = new ThreadLocal<Object>();
+
+    private static final AnnotationStubConfigurer<Annotation> SHARED_CONFIGURER = new AnnotationStubConfigurer<Annotation>() {
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public Class<? extends Annotation> getStubType() {
+            return AnnotationFactory.getStubType();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        protected void configureAnnotation(Annotation stub) {
+            Object o = CONFIGURER.get();
+            if (o instanceof AnnotationStubConfigurer<?>) {
+                @SuppressWarnings("unchecked")
+                final AnnotationStubConfigurer<Annotation> configurer = (AnnotationStubConfigurer<Annotation>) o;
+                configurer.configure(requireStubInterceptor(), stub);
+            }
+        }
+    };
+
     private ProxyFactory proxyFactory;
 
     /**
@@ -62,7 +87,8 @@
      */
     public AnnotationFactory(ProxyFactory proxyFactory) {
         super();
-        this.proxyFactory = proxyFactory;
+        this.proxyFactory = new StubProxyFactory(proxyFactory,
+                SHARED_CONFIGURER);
     }
 
     /**
@@ -73,7 +99,7 @@
      */
     public <A extends Annotation> A create(
             AnnotationStubConfigurer<A> configurer) {
-        return create(Thread.currentThread().getContextClassLoader(),
+        return createInternal(Thread.currentThread().getContextClassLoader(),
                 configurer);
     }
 
@@ -86,7 +112,7 @@
      */
     public <A extends Annotation> A create(ClassLoader classLoader,
             AnnotationStubConfigurer<A> configurer) {
-        return create(classLoader, configurer.getStubType(), configurer);
+        return createInternal(classLoader, configurer);
     }
 
     /**
@@ -97,8 +123,8 @@
      * @return stubbed annotation proxy
      */
     public <A extends Annotation> A create(Class<A> annotationType) {
-        return create(Thread.currentThread().getContextClassLoader(),
-                annotationType, new AnnotationStubConfigurer<A>(annotationType));
+        return createInternal(Thread.currentThread().getContextClassLoader(),
+                annotationType);
     }
 
     /**
@@ -110,17 +136,29 @@
      */
     public <A extends Annotation> A create(ClassLoader classLoader,
             Class<A> annotationType) {
-        return create(classLoader, annotationType,
-                new AnnotationStubConfigurer<A>(annotationType));
+        return createInternal(classLoader, annotationType);
     }
 
-    private <A extends Annotation> A create(ClassLoader classLoader,
-            Class<A> annotationType, AnnotationStubConfigurer<A> configurer) {
-        StubProxyFactory stubFactory = new StubProxyFactory(proxyFactory,
-                configurer);
+    private <A extends Annotation> A createInternal(ClassLoader classLoader, Object configurer) {
+        try {
+            CONFIGURER.set(configurer);
+            @SuppressWarnings("unchecked")
+            final A result = (A) proxyFactory.createInvokerProxy(classLoader, ANNOTATION_INVOKER, getStubType());
+            return result;
+        } finally {
+            CONFIGURER.remove();
+        }
+    }
+
+    private static <A extends Annotation> Class<? extends A> getStubType() {
+        Object o = CONFIGURER.get();
+        if (o instanceof Class<?>) {
+            @SuppressWarnings("unchecked")
+            final Class<? extends A> result = (Class<? extends A>) o;
+            return result;
+        }
         @SuppressWarnings("unchecked")
-        final A result = (A) stubFactory.createInvokerProxy(classLoader, ANNOTATION_INVOKER,
-                annotationType);
-        return result;
+        final AnnotationStubConfigurer<A> configurer = (AnnotationStubConfigurer<A>) o;
+        return configurer.getStubType();
     }
 }

stub/src/main/java/org/apache/commons/proxy2/stub/StubConfigurer.java

diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/StubConfigurer.java b/stub/src/main/java/org/apache/commons/proxy2/stub/StubConfigurer.java
index 2e2330a..8e5c3e8 100644
--- a/stub/src/main/java/org/apache/commons/proxy2/stub/StubConfigurer.java
+++ b/stub/src/main/java/org/apache/commons/proxy2/stub/StubConfigurer.java
@@ -85,7 +85,7 @@
      * Get the stubType.
      * @return Class<T>
      */
-    public Class<T> getStubType() {
+    public Class<? extends T> getStubType() {
         return stubType;
     }
 
@@ -444,7 +444,7 @@
      */
     protected abstract void configure(T stub);
 
-    private synchronized StubInterceptor requireStubInterceptor() {
+    synchronized StubInterceptor requireStubInterceptor() {
         if (stubInterceptor == null) {
             throw new IllegalStateException(
                     "no StubInterceptor currently in use");