WELDX-144 rename @ManagedProducer to @Unwraps

weld · Sep 21, 2010 · 2dac538 · 2dac538
1 parent a6dfa95
commit 2dac538
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 51 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/extensions/managedproducer/ManagedProducer.java b/impl/src/main/java/org/jboss/weld/extensions/managedproducer/ManagedProducer.java
diff --git a/impl/src/main/java/org/jboss/weld/extensions/unwraps/Unwraps.java b/impl/src/main/java/org/jboss/weld/extensions/unwraps/Unwraps.java
@@ -0,0 +1,27 @@
+package org.jboss.weld.extensions.unwraps;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This allows for producer methods that emulate a stateless scope.
+ * 
+ * If a method is annotated with @Unwraps then a bean is registered with CDI
+ * with the same types and qualifiers as the @Unwraps method. This bean produces
+ * a proxy, whenever a method is invoked on the proxy the @Unwraps method is
+ * called, and the method invocation is forwarded to the result.
+ * 
+ * This allows you to manually control the lifecycle of an object while still
+ * allowing it to be injected.
+ * 
+ * @author Stuart Douglas
+ * 
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Unwraps
+{
+
+}
diff --git a/...gedproducer/ManagedProducerExtension.java → .../extensions/unwraps/UnwrapsExtension.java b/...gedproducer/ManagedProducerExtension.java → .../extensions/unwraps/UnwrapsExtension.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.managedproducer;
+package org.jboss.weld.extensions.unwraps;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -27,34 +27,33 @@
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
 
 /**
- * An extension that allows the use of @ManagedProducer methods
+ * An extension that allows the use of {@link Unwraps} methods
  * 
- * these methods work in a similar manner to @Unwrap methods in seam 2
  * 
- * @author stuart
+ * @author Stuart Douglas
  * 
  */
-public class ManagedProducerExtension implements Extension
+public class UnwrapsExtension implements Extension
 {
 
-   final private Set<ManagedProducerBean<?>> beans = new HashSet<ManagedProducerBean<?>>();
+   final private Set<UnwrapsProducerBean<?>> beans = new HashSet<UnwrapsProducerBean<?>>();
 
    public void processAnnotatedType(@Observes ProcessAnnotatedType<?> type, BeanManager manager)
    {
       for (AnnotatedMethod<?> m : type.getAnnotatedType().getMethods())
       {
-         if (m.isAnnotationPresent(ManagedProducer.class))
+         if (m.isAnnotationPresent(Unwraps.class))
          {
             // we have a managed producer
             // lets make a note of it and register it later
-            beans.add(new ManagedProducerBean(m, manager));
+            beans.add(new UnwrapsProducerBean(m, manager));
          }
       }
    }
 
    public void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBean)
    {
-      for (ManagedProducerBean<?> b : beans)
+      for (UnwrapsProducerBean<?> b : beans)
       {
          afterBean.addBean(b);
       }

diff --git a/...cer/ManagedProducerInvocationHandler.java → ...ons/unwraps/UnwrapsInvocationHandler.java b/...cer/ManagedProducerInvocationHandler.java → ...ons/unwraps/UnwrapsInvocationHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.managedproducer;
+package org.jboss.weld.extensions.unwraps;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -34,7 +34,7 @@
 
 import org.jboss.weld.extensions.bean.InjectionPointImpl;
 
-public class ManagedProducerInvocationHandler implements MethodHandler
+public class UnwrapsInvocationHandler implements MethodHandler
 {
 
    final private BeanManager manager;
@@ -46,7 +46,7 @@ public class ManagedProducerInvocationHandler implements MethodHandler
    final private InjectionPoint injectionPoint;
 
 
-   public ManagedProducerInvocationHandler(BeanManager manager, AnnotatedMethod<?> method, Bean<?> bean, InjectionPoint injectionPoint)
+   public UnwrapsInvocationHandler(BeanManager manager, AnnotatedMethod<?> method, Bean<?> bean, InjectionPoint injectionPoint)
    {
       this.manager = manager;
       this.method = method.getJavaMember();
@@ -69,11 +69,11 @@ public ManagedProducerInvocationHandler(BeanManager manager, AnnotatedMethod<?>
       Set<Bean<?>> beans = manager.getBeans(mainType, mainClassQualifiers.toArray(new Annotation[0]));
       if (beans.isEmpty())
       {
-         throw new UnsatisfiedResolutionException("could not find declaring bean for managed producer method " + method.getDeclaringType().getJavaClass() + "." + this.method.getName());
+         throw new UnsatisfiedResolutionException("Could not find declaring bean for @Unwrap method " + method.getDeclaringType().getJavaClass() + "." + this.method.getName());
       }
       else if (beans.size() > 1)
       {
-         throw new AmbiguousResolutionException("could not find declaring bean for managed producer method " + method.getDeclaringType().getJavaClass() + "." + this.method.getName());
+         throw new AmbiguousResolutionException("Could not find declaring bean for @Unwrap method " + method.getDeclaringType().getJavaClass() + "." + this.method.getName());
       }
       mainClassBean = beans.iterator().next();
       this.injectionPoint = injectionPoint;

diff --git a/.../managedproducer/ManagedProducerBean.java → ...tensions/unwraps/UnwrapsProducerBean.java b/.../managedproducer/ManagedProducerBean.java → ...tensions/unwraps/UnwrapsProducerBean.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.managedproducer;
+package org.jboss.weld.extensions.unwraps;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -41,14 +41,13 @@
 /**
  * Bean implementation that produces a JDK proxy
  * 
- * when a method is invoked on the proxy it calls the managed producer method
+ * when a method is invoked on the proxy it calls the Unwraps producer method
  * and invokes the method on the returned object
  * 
- * @author stuart
+ * @author Stuart Douglas
  * 
- * @param <M>
  */
-public class ManagedProducerBean<M> implements Bean<M>
+public class UnwrapsProducerBean<M> implements Bean<M>
 {
 
    final private Class<?> beanClass;
@@ -69,7 +68,7 @@ public class ManagedProducerBean<M> implements Bean<M>
    {
    } };
 
-   public ManagedProducerBean(AnnotatedMethod<?> method, BeanManager manager)
+   public UnwrapsProducerBean(AnnotatedMethod<?> method, BeanManager manager)
    {
       this.method = method;
       beanClass = method.getDeclaringType().getJavaClass();
@@ -201,7 +200,7 @@ public M create(CreationalContext<M> creationalContext)
       Set<Bean<?>> beans = manager.getBeans(InjectionPoint.class, defaultQualifiers);
       Bean<?> injectionPointBean = (Bean<?>) beans.iterator().next();
       InjectionPoint injectionPoint = (InjectionPoint) manager.getReference(injectionPointBean, InjectionPoint.class, creationalContext);
-      ManagedProducerInvocationHandler hdl = new ManagedProducerInvocationHandler(manager, this.method, this, injectionPoint);
+      UnwrapsInvocationHandler hdl = new UnwrapsInvocationHandler(manager, this.method, this, injectionPoint);
       try
       {
          M obj = proxyClass.newInstance();

diff --git a/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -2,7 +2,7 @@ org.jboss.weld.extensions.bean.generic.GenericBeanExtension
 org.jboss.weld.extensions.resourceLoader.servlet.ServletResourceExtension
 org.jboss.weld.extensions.core.CoreExtension
 org.jboss.weld.extensions.interceptor.InterceptorExtension
-org.jboss.weld.extensions.managedproducer.ManagedProducerExtension
+org.jboss.weld.extensions.unwraps.UnwrapsExtension
 org.jboss.weld.extensions.defaultbean.DefaultBeanExtension
 org.jboss.weld.extensions.log.LoggerExtension
 org.jboss.weld.extensions.servicehandler.ServiceHandlerExtension

diff --git a/...ns/test/managedproducer/BeanProducer.java → ...extensions/test/unwraps/BeanProducer.java b/...ns/test/managedproducer/BeanProducer.java → ...extensions/test/unwraps/BeanProducer.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.test.managedproducer;
+package org.jboss.weld.extensions.test.unwraps;
 
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.jboss.weld.extensions.managedproducer.ManagedProducer;
+import org.jboss.weld.extensions.unwraps.Unwraps;
 
 public class BeanProducer
 {
-   @ManagedProducer
+   @Unwraps
    public ProducedInterface produce(InjectionPoint injectionPoint)
    {
       ProducedBean b = new ProducedBean();

diff --git a/...extensions/test/managedproducer/Lion.java → ...ss/weld/extensions/test/unwraps/Lion.java b/...extensions/test/managedproducer/Lion.java → ...ss/weld/extensions/test/unwraps/Lion.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.test.managedproducer;
+package org.jboss.weld.extensions.test.unwraps;
 
 import org.jboss.weld.extensions.core.Veto;
 

diff --git a/...sions/test/managedproducer/LionTamer.java → ...ld/extensions/test/unwraps/LionTamer.java b/...sions/test/managedproducer/LionTamer.java → ...ld/extensions/test/unwraps/LionTamer.java
@@ -1,9 +1,9 @@
-package org.jboss.weld.extensions.test.managedproducer;
+package org.jboss.weld.extensions.test.unwraps;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Named;
 
-import org.jboss.weld.extensions.managedproducer.ManagedProducer;
+import org.jboss.weld.extensions.unwraps.Unwraps;
 
 /*
  * JBoss, Home of Professional Open Source
@@ -32,7 +32,7 @@ public void changeLion()
       lion = new Lion("lion two");
    }
 
-   @ManagedProducer
+   @Unwraps
    @Named("lion")
    public Lion produceLion()
    {

diff --git a/...tensions/test/managedproducer/MPType.java → .../weld/extensions/test/unwraps/MPType.java b/...tensions/test/managedproducer/MPType.java → .../weld/extensions/test/unwraps/MPType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.test.managedproducer;
+package org.jboss.weld.extensions.test.unwraps;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...test/managedproducer/ManagedReciever.java → ...ensions/test/unwraps/ManagedReciever.java b/...test/managedproducer/ManagedReciever.java → ...ensions/test/unwraps/ManagedReciever.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.test.managedproducer;
+package org.jboss.weld.extensions.test.unwraps;
 
 import javax.inject.Inject;
 

diff --git a/...ns/test/managedproducer/ProducedBean.java → ...extensions/test/unwraps/ProducedBean.java b/...ns/test/managedproducer/ProducedBean.java → ...extensions/test/unwraps/ProducedBean.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.test.managedproducer;
+package org.jboss.weld.extensions.test.unwraps;
 
 import org.jboss.weld.extensions.core.Veto;
 

diff --git a/...st/managedproducer/ProducedInterface.java → ...sions/test/unwraps/ProducedInterface.java b/...st/managedproducer/ProducedInterface.java → ...sions/test/unwraps/ProducedInterface.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.test.managedproducer;
+package org.jboss.weld.extensions.test.unwraps;
 
 public interface ProducedInterface
 {

diff --git a/.../managedproducer/ManagedProducerTest.java → .../extensions/test/unwraps/UnwrapsTest.java b/.../managedproducer/ManagedProducerTest.java → .../extensions/test/unwraps/UnwrapsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.test.managedproducer;
+package org.jboss.weld.extensions.test.unwraps;
 
 import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;
 
@@ -28,13 +28,13 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
-public class ManagedProducerTest
+public class UnwrapsTest
 {
 
    @Deployment
    public static Archive<?> deployment()
    {
-      return baseDeployment().addPackage(ManagedProducerTest.class.getPackage());
+      return baseDeployment().addPackage(UnwrapsTest.class.getPackage());
    }
 
    @Inject
@@ -48,14 +48,14 @@ public static Archive<?> deployment()
    LionTamer lionTamer;
 
    @Test
-   public void testManagedProducersInjectionPoint()
+   public void testUnwrapsInjectionPoint()
    {
       assert bean.getBean1().getValue().equals("bean1") : " value: " + bean.getBean1().getValue();
       assert bean.getBean2().getValue().equals("bean2") : " value: " + bean.getBean2().getValue();
    }
 
    @Test
-   public void testManagedProducers()
+   public void testUnwraps()
    {
       assert lion.getName().equals("lion one");
       lionTamer.changeLion();