[webbeans-commits] Webbeans SVN: r255 - in ri/trunk/webbeans-ri/src: test/java/org/jboss/webbeans/test and 1 other directory.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Nov 6 06:50:09 EST 2008
Author: pete.muir at jboss.org
Date: 2008-11-06 06:50:09 -0500 (Thu, 06 Nov 2008)
New Revision: 255
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractProducerBeanModel.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
Log:
Start to fix producer methods
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractProducerBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractProducerBeanModel.java 2008-11-06 04:59:58 UTC (rev 254)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractProducerBeanModel.java 2008-11-06 11:50:09 UTC (rev 255)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.model.bean;
-
-import java.lang.reflect.Method;
-
-public abstract class AbstractProducerBeanModel<T> extends
- AbstractBeanModel<T, Method>
-{
-
-
-}
\ No newline at end of file
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java 2008-11-06 04:59:58 UTC (rev 254)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java 2008-11-06 11:50:09 UTC (rev 255)
@@ -6,6 +6,7 @@
import java.lang.reflect.Type;
import java.util.Set;
+import javax.webbeans.DefinitionException;
import javax.webbeans.Dependent;
import org.jboss.webbeans.ManagerImpl;
@@ -16,7 +17,7 @@
import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.util.Reflections;
-public class ProducerMethodBeanModel<T> extends AbstractProducerBeanModel<T>
+public class ProducerMethodBeanModel<T> extends AbstractBeanModel<T, Method>
{
private MethodConstructor<T> constructor;
@@ -92,7 +93,7 @@
{
if (getAnnotatedItem().isStatic())
{
- throw new RuntimeException("Producer method cannot be static " + annotatedMethod);
+ throw new DefinitionException("Producer method cannot be static " + annotatedMethod);
}
// TODO Check if declaring class is a WB bean
if (!getScopeType().equals(Dependent.class) && getAnnotatedItem().isFinal())
@@ -153,7 +154,10 @@
{
try
{
- // TODO Fix this this.type = annotatedMethod.getType();
+ if (getAnnotatedItem() != null)
+ {
+ this.type = getAnnotatedItem().getType();
+ }
}
catch (ClassCastException e)
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-11-06 04:59:58 UTC (rev 254)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-11-06 11:50:09 UTC (rev 255)
@@ -86,7 +86,7 @@
@Test(groups="producerMethod") @SpecAssertion(section="3.4")
public void testBeanDeclaresMultipleProducerMethods()
{
-
+ assert false;
}
@Test(groups="producerMethod") @SpecAssertion(section="3.4")
More information about the weld-commits
mailing list