[webbeans-commits] Webbeans SVN: r281 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: ejb and 2 other directories.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-11-08 13:01:05 -0500 (Sat, 08 Nov 2008)
New Revision: 281
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
Log:
update to latest spec def of enterprise bean lookup algo
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-11-07 18:34:54 UTC (rev 280)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-11-08 18:01:05 UTC (rev 281)
@@ -28,16 +28,20 @@
import javax.webbeans.manager.Interceptor;
import javax.webbeans.manager.Manager;
+import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.contexts.ApplicationContext;
import org.jboss.webbeans.contexts.DependentContext;
import org.jboss.webbeans.contexts.RequestContext;
import org.jboss.webbeans.contexts.SessionContext;
-import org.jboss.webbeans.ejb.EjbManager;
+import org.jboss.webbeans.ejb.DefaultEnterpriseBeanLookup;
import org.jboss.webbeans.event.EventBus;
import org.jboss.webbeans.exceptions.NameResolutionLocation;
import org.jboss.webbeans.exceptions.TypesafeResolutionLocation;
import org.jboss.webbeans.injectable.Injectable;
import org.jboss.webbeans.injectable.ResolverInjectable;
+import org.jboss.webbeans.introspector.AnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
+import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.util.ClientProxy;
import org.jboss.webbeans.util.ProxyPool;
import org.jboss.webbeans.util.Reflections;
@@ -76,7 +80,6 @@
private List<Class<? extends Annotation>> enabledDeploymentTypes;
private ModelManager modelManager;
- private EjbManager ejbLookupManager;
private EventBus eventBus;
private ResolutionManager resolutionManager;
private ContextMap contextMap;
@@ -90,13 +93,14 @@
initEnabledDeploymentTypes(null);
initContexts(null);
this.modelManager = new ModelManager();
- this.ejbLookupManager = new EjbManager();
this.beans = new CopyOnWriteArrayList<Bean<?>>();
this.eventBus = new EventBus();
this.resolutionManager = new ResolutionManager(this);
this.proxyPool = new ProxyPool(this);
this.decorators = new HashSet<Decorator>();
this.interceptors = new HashSet<Interceptor>();
+ SimpleAnnotatedClass<DefaultEnterpriseBeanLookup> sc = new SimpleAnnotatedClass<DefaultEnterpriseBeanLookup>(DefaultEnterpriseBeanLookup.class, new HashMap<Class<? extends Annotation>, Annotation>());
+ addBean( new SimpleBean<DefaultEnterpriseBeanLookup>( new SimpleBeanModel<DefaultEnterpriseBeanLookup>(sc, null, this), this ) );
}
protected void initEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes)
@@ -172,11 +176,6 @@
return this.modelManager;
}
- public EjbManager getEjbManager()
- {
- return ejbLookupManager;
- }
-
public <T> Set<Bean<T>> resolveByType(Class<T> type, Annotation... bindingTypes)
{
return resolveByType(new ResolverInjectable<T>(type, bindingTypes, getModelManager()));
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java 2008-11-08 18:01:05 UTC (rev 281)
@@ -0,0 +1,55 @@
+package org.jboss.webbeans.ejb;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.webbeans.CreationException;
+import javax.webbeans.Standard;
+import javax.webbeans.manager.EnterpriseBeanLookup;
+
+import org.jboss.webbeans.util.JNDI;
+
+@Standard
+public class DefaultEnterpriseBeanLookup implements EnterpriseBeanLookup
+{
+ public Object lookup(String ejbName)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ private Map<String, EjbMetaData<?>> ejbMetaDataMap = new HashMap<String, EjbMetaData<?>>();
+
+ // TODO Should this be static?
+ public <T> T lookup(EjbMetaData<T> ejb)
+ {
+ if (ejb.getEjbLinkJndiName() != null)
+ {
+ return JNDI.lookup(ejb.getEjbLinkJndiName(), ejb.getType());
+ }
+ try
+ {
+ return JNDI.lookup(ejb.getDefaultJndiName(), ejb.getType());
+ }
+ catch (Exception e)
+ {
+ throw new CreationException("could not find the EJB in JNDI", e);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> EjbMetaData<T> registerEjbMetaData(Class<? extends T> clazz)
+ {
+ // TODO replace with an application lookup
+ if (!ejbMetaDataMap.containsKey(clazz))
+ {
+ EjbMetaData<T> ejbMetaData = new EjbMetaData<T>(clazz);
+ ejbMetaDataMap.put(ejbMetaData.getEjbName(), ejbMetaData);
+ return ejbMetaData;
+ }
+ else
+ {
+ return (EjbMetaData<T>) ejbMetaDataMap.get(clazz);
+ }
+
+ }
+}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java 2008-11-07 18:34:54 UTC (rev 280)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java 2008-11-08 18:01:05 UTC (rev 281)
@@ -1,59 +0,0 @@
-package org.jboss.webbeans.ejb;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.webbeans.manager.EnterpriseBeanLookup;
-
-import org.jboss.webbeans.util.JNDI;
-
-
-public class EjbManager
-{
-
- private Map<Class<?>, EjbMetaData<?>> ejbMetaDataMap = new HashMap<Class<?>, EjbMetaData<?>>();
-
- private EnterpriseBeanLookup enterpriseBeanLookup;
-
- public EjbManager()
- {
- // TODO Write enterpriseBeanLookup instantiation
- }
-
- // TODO Should this be static?
- public <T> T lookup(EjbMetaData<T> ejb)
- {
- if (ejb.getEjbLinkJndiName() != null)
- {
- return (T) JNDI.lookup(ejb.getEjbLinkJndiName(), ejb.getType());
- }
- try
- {
- // TODO How is a JNDI lookup failure shown to us?
- return (T) JNDI.lookup(ejb.getDefaultJndiName(), ejb.getType());
- }
- catch (Exception e)
- {
-
- }
- return (T) enterpriseBeanLookup.lookup(ejb.getEjbName());
- }
-
- @SuppressWarnings("unchecked")
- public <T> EjbMetaData<T> getEjbMetaData(Class<? extends T> clazz)
- {
- // TODO replace with an application lookup
- if (!ejbMetaDataMap.containsKey(clazz))
- {
- EjbMetaData<T> ejbMetaData = new EjbMetaData<T>(clazz);
- ejbMetaDataMap.put(clazz, ejbMetaData);
- return ejbMetaData;
- }
- else
- {
- return (EjbMetaData<T>) ejbMetaDataMap.get(clazz);
- }
-
- }
-
-}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java 2008-11-07 18:34:54 UTC (rev 280)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java 2008-11-08 18:01:05 UTC (rev 281)
@@ -1,5 +1,7 @@
package org.jboss.webbeans.injectable;
+import javax.webbeans.manager.EnterpriseBeanLookup;
+
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.ejb.EjbMetaData;
@@ -20,7 +22,7 @@
if (manager instanceof ManagerImpl)
{
ManagerImpl containerImpl = (ManagerImpl) manager;
- return containerImpl.getEjbManager().lookup(ejbMetaData);
+ return (T) containerImpl.getInstanceByType(EnterpriseBeanLookup.class).lookup(ejbMetaData.getEjbName());
}
else
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java 2008-11-07 18:34:54 UTC (rev 280)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java 2008-11-08 18:01:05 UTC (rev 281)
@@ -28,7 +28,7 @@
protected void init(ManagerImpl container)
{
super.init(container);
- ejbMetaData = container.getEjbManager().getEjbMetaData(getType());
+ ejbMetaData = new EjbMetaData<T>(getType());
checkEnterpriseBeanTypeAllowed();
checkEnterpriseScopeAllowed();
checkConflictingRoles();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-07 18:34:54 UTC (rev 280)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-08 18:01:05 UTC (rev 281)
@@ -79,7 +79,7 @@
}
-// TODO loggigng
+// TODO logging
protected void initRemoveMethod(ManagerImpl container)
{
if (getEjbMetaData().isStateful())
15 years, 5 months
[webbeans-commits] Webbeans SVN: r280 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: beans and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-11-07 13:34:54 -0500 (Fri, 07 Nov 2008)
New Revision: 280
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java
Log:
test predestroy
enable specialization tests
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-11-07 17:50:49 UTC (rev 279)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-11-07 18:34:54 UTC (rev 280)
@@ -13,8 +13,6 @@
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.contexts.RequestContext;
-import org.jboss.webbeans.test.beans.Farm;
-import org.jboss.webbeans.test.beans.FarmOffice;
import org.jboss.webbeans.test.beans.Fox;
import org.jboss.webbeans.test.beans.FoxRun;
import org.jboss.webbeans.test.beans.SpiderNest;
@@ -51,18 +49,6 @@
farmHouseBean.create();
}
- @Test(groups={"injection", "postConstruct"}) @SpecAssertion(section="4.2")
- public void testPostConstruct() throws Exception
- {
- Bean<FarmOffice> farmOfficeBean = createSimpleWebBean(FarmOffice.class, manager);
- Bean<Farm> farmBean = createSimpleWebBean(Farm.class, manager);
- manager.addBean(farmOfficeBean);
- manager.addBean(farmBean);
- Farm farm = farmBean.create();
- assert farm.founded!=null;
- assert farm.initialStaff==20;
- }
-
@Test(groups={"injection", "clientProxy"}, expectedExceptions=ContextNotActiveException.class) @SpecAssertion(section="4.3")
public void testInvokeNormalInjectedWebBeanWhenContextNotActive()
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-07 17:50:49 UTC (rev 279)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-07 18:34:54 UTC (rev 280)
@@ -5,6 +5,8 @@
import javax.webbeans.manager.Bean;
import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.test.beans.Farm;
+import org.jboss.webbeans.test.beans.FarmOffice;
import org.jboss.webbeans.test.beans.FishPond;
import org.jboss.webbeans.test.beans.Goldfish;
import org.jboss.webbeans.test.beans.RedSnapper;
@@ -53,13 +55,13 @@
assert false;
}
- @Test(groups={"beanLifecycle", "ejb3"}) @SpecAssertion(section="5.3")
+ @Test(groups={"beanLifecycle", "commonAnnotations"}) @SpecAssertion(section="5.3")
public void testCreateInjectsEjb()
{
assert false;
}
- @Test(groups={"beanLifecycle", "ejb3"}) @SpecAssertion(section="5.3")
+ @Test(groups={"beanLifecycle", "commonAnnotations"}) @SpecAssertion(section="5.3")
public void testCreateInjectsPersistenceContext()
{
assert false;
@@ -71,6 +73,21 @@
assert false;
}
+ @Test(groups={"beanLifecycle", "lifecycleCallbacks"}) @SpecAssertion(section="5.3")
+ public void testPostConstructPreDestroy() throws Exception
+ {
+ Bean<FarmOffice> farmOfficeBean = createSimpleWebBean(FarmOffice.class, manager);
+ Bean<Farm> farmBean = createSimpleWebBean(Farm.class, manager);
+ manager.addBean(farmOfficeBean);
+ manager.addBean(farmBean);
+ Farm farm = farmBean.create();
+ assert farm.founded!=null;
+ assert farm.initialStaff==20;
+ assert farm.closed==null;
+ farmBean.destroy(farm);
+ assert farm.closed!=null;
+ }
+
@Test(groups="injection") @SpecAssertion(section="5.3")
public void testCreateInjectsFieldsDeclaredInJava()
{
@@ -81,12 +98,6 @@
assert tunaFarm.tuna != null;
}
- @Test(groups={"beanConstruction", "commonAnnotations"}) @SpecAssertion(section="5.3")
- public void testPostConstructMethodCalled()
- {
- assert false;
- }
-
@Test(groups="injection")
public void testFieldMissingBindingAnnotationsAreNotInjected()
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-11-07 17:50:49 UTC (rev 279)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-11-07 18:34:54 UTC (rev 280)
@@ -267,7 +267,7 @@
assert map.get(Integer.class).contains(new SynchronousAnnotationLiteral());
}
- @Test(groups="specialization") @SpecAssertion(section="3.2.6")
+ @Test(groups="specializationInherit") @SpecAssertion(section="3.2.6")
public void testSpecializedClassInheritsBindingTypes()
{
SimpleBeanModel<Tractor> bean = createSimpleModel(Tractor.class, manager);
@@ -276,7 +276,7 @@
assert bean.getBindingTypes().contains( new AnnotationLiteral<HeavyDuty>() {} );
}
- @Test(groups="specialization") @SpecAssertion(section="3.2.6")
+ @Test(groups="specializationInherit") @SpecAssertion(section="3.2.6")
public void testSpecializedClassInheritsName()
{
SimpleBeanModel<Tractor> bean = createSimpleModel(Tractor.class, manager);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java 2008-11-07 17:50:49 UTC (rev 279)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java 2008-11-07 18:34:54 UTC (rev 280)
@@ -3,12 +3,14 @@
import java.util.Date;
import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.webbeans.Current;
public class Farm
{
public Date founded;
+ public Date closed;
public int initialStaff;
@Current
@@ -21,4 +23,10 @@
initialStaff = farmOffice.noOfStaff;
}
+ @PreDestroy
+ private void preDestroy()
+ {
+ closed = new Date();
+ }
+
}
15 years, 5 months
[webbeans-commits] Webbeans SVN: r279 - ri/trunk.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-11-07 12:50:49 -0500 (Fri, 07 Nov 2008)
New Revision: 279
Modified:
ri/trunk/pom.xml
Log:
common annotations
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2008-11-07 17:50:26 UTC (rev 278)
+++ ri/trunk/pom.xml 2008-11-07 17:50:49 UTC (rev 279)
@@ -92,6 +92,12 @@
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
<groupId>org.scannotation</groupId>
<artifactId>scannotation</artifactId>
<version>1.0.2</version>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r278 - ri/trunk/webbeans-ri.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-11-07 12:50:26 -0500 (Fri, 07 Nov 2008)
New Revision: 278
Modified:
ri/trunk/webbeans-ri/pom.xml
Log:
commons annotations
Modified: ri/trunk/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml 2008-11-07 17:50:06 UTC (rev 277)
+++ ri/trunk/webbeans-ri/pom.xml 2008-11-07 17:50:26 UTC (rev 278)
@@ -38,10 +38,14 @@
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r277 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-11-07 12:50:06 -0500 (Fri, 07 Nov 2008)
New Revision: 277
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FarmOffice.java
Log:
test @PostConstruct after injection
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java 2008-11-07 17:50:06 UTC (rev 277)
@@ -0,0 +1,24 @@
+package org.jboss.webbeans.test.beans;
+
+import java.util.Date;
+
+import javax.annotation.PostConstruct;
+import javax.webbeans.Current;
+
+public class Farm
+{
+
+ public Date founded;
+ public int initialStaff;
+
+ @Current
+ FarmOffice farmOffice;
+
+ @PostConstruct
+ private void postConstruct()
+ {
+ founded = new Date();
+ initialStaff = farmOffice.noOfStaff;
+ }
+
+}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FarmOffice.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FarmOffice.java 2008-11-07 17:49:48 UTC (rev 276)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FarmOffice.java 2008-11-07 17:50:06 UTC (rev 277)
@@ -1,11 +1,9 @@
package org.jboss.webbeans.test.beans;
-import javax.webbeans.Current;
public class FarmOffice
{
- @Current
- public int noOfStaff;
+ public int noOfStaff = 20;
}
15 years, 5 months
[webbeans-commits] Webbeans SVN: r276 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-11-07 12:49:48 -0500 (Fri, 07 Nov 2008)
New Revision: 276
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
Log:
test @PostConstruct after injection
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-11-07 17:49:25 UTC (rev 275)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-11-07 17:49:48 UTC (rev 276)
@@ -13,6 +13,8 @@
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.contexts.RequestContext;
+import org.jboss.webbeans.test.beans.Farm;
+import org.jboss.webbeans.test.beans.FarmOffice;
import org.jboss.webbeans.test.beans.Fox;
import org.jboss.webbeans.test.beans.FoxRun;
import org.jboss.webbeans.test.beans.SpiderNest;
@@ -49,6 +51,18 @@
farmHouseBean.create();
}
+ @Test(groups={"injection", "postConstruct"}) @SpecAssertion(section="4.2")
+ public void testPostConstruct() throws Exception
+ {
+ Bean<FarmOffice> farmOfficeBean = createSimpleWebBean(FarmOffice.class, manager);
+ Bean<Farm> farmBean = createSimpleWebBean(Farm.class, manager);
+ manager.addBean(farmOfficeBean);
+ manager.addBean(farmBean);
+ Farm farm = farmBean.create();
+ assert farm.founded!=null;
+ assert farm.initialStaff==20;
+ }
+
@Test(groups={"injection", "clientProxy"}, expectedExceptions=ContextNotActiveException.class) @SpecAssertion(section="4.3")
public void testInvokeNormalInjectedWebBeanWhenContextNotActive()
{
15 years, 5 months
[webbeans-commits] Webbeans SVN: r275 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: model/bean and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-11-07 12:49:25 -0500 (Fri, 07 Nov 2008)
New Revision: 275
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
Log:
@PostConstruct/@PreDestroy for simple web beans
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2008-11-07 17:39:32 UTC (rev 274)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2008-11-07 17:49:25 UTC (rev 275)
@@ -3,6 +3,7 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.injectable.InjectableField;
import org.jboss.webbeans.injectable.InjectableMethod;
+import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
public class SimpleBean<T> extends AbstractBean<T>
@@ -25,9 +26,48 @@
injectEjbAndCommonFields();
injectBoundFields(instance);
callInitializers(instance);
+ callPostConstruct(instance);
return instance;
}
+ @Override
+ public void destroy(T instance)
+ {
+ callPreDestroy(instance);
+ }
+
+ protected void callPreDestroy(T instance)
+ {
+ AnnotatedMethod<Object> preDestroy = getModel().getPreDestroy();
+ if (preDestroy!=null)
+ {
+ try
+ {
+ preDestroy.getAnnotatedMethod().invoke(instance);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Unable to invoke " + preDestroy + " on " + instance, e);
+ }
+ }
+ }
+
+ protected void callPostConstruct(T instance)
+ {
+ AnnotatedMethod<Object> postConstruct = getModel().getPostConstruct();
+ if (postConstruct!=null)
+ {
+ try
+ {
+ postConstruct.getAnnotatedMethod().invoke(instance);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Unable to invoke " + postConstruct + " on " + instance, e);
+ }
+ }
+ }
+
protected void callInitializers(T instance)
{
for (InjectableMethod<Object> initializer : model.getInitializerMethods())
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-11-07 17:39:32 UTC (rev 274)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-11-07 17:49:25 UTC (rev 275)
@@ -4,6 +4,8 @@
import java.util.Set;
import java.util.logging.Logger;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.webbeans.DefinitionException;
import javax.webbeans.Initializer;
@@ -12,6 +14,7 @@
import org.jboss.webbeans.injectable.SimpleConstructor;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.AnnotatedConstructor;
+import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.AnnotatedParameter;
import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.util.LoggerUtil;
@@ -25,6 +28,8 @@
private static Set<Class<?>> NO_ARGUMENTS = Collections.emptySet();
private SimpleConstructor<T> constructor;
+ private AnnotatedMethod<Object> postConstruct;
+ private AnnotatedMethod<Object> preDestroy;
private String location;
@@ -47,6 +52,8 @@
initConstructor();
checkType(getType());
initInjectionPoints();
+ initPostConstruct();
+ initPreDestroy();
// TODO Interceptors
}
@@ -78,10 +85,7 @@
log.finest("Found " + initializerAnnotatedConstructors + " constructors annotated with @Initializer for " + getType());
if (initializerAnnotatedConstructors.size() > 1)
{
- if (initializerAnnotatedConstructors.size() > 1)
- {
- throw new DefinitionException("Cannot have more than one constructor annotated with @Initializer for " + getType());
- }
+ throw new DefinitionException("Cannot have more than one constructor annotated with @Initializer for " + getType());
}
else if (initializerAnnotatedConstructors.size() == 1)
{
@@ -89,24 +93,70 @@
log.finest("Exactly one constructor (" + constructor +") annotated with @Initializer defined, using it as the bean constructor for " + getType());
return;
}
-
- if (getAnnotatedItem().getConstructor(NO_ARGUMENTS) != null)
+ else if (getAnnotatedItem().getConstructor(NO_ARGUMENTS) != null)
{
this.constructor = new SimpleConstructor<T>(getAnnotatedItem().getConstructor(NO_ARGUMENTS));
log.finest("Exactly one constructor (" + constructor +") defined, using it as the bean constructor for " + getType());
return;
}
-
- throw new DefinitionException("Cannot determine constructor to use for " + getType());
+ else {
+ throw new DefinitionException("Cannot determine constructor to use for " + getType());
+ }
}
+
+ protected void initPostConstruct()
+ {
+ Set<AnnotatedMethod<Object>> postConstructMethods = getAnnotatedItem().getAnnotatedMethods(PostConstruct.class);
+ log.finest("Found " + postConstructMethods + " constructors annotated with @Initializer for " + getType());
+ if (postConstructMethods.size() > 1)
+ {
+ //TODO: actually this is wrong, in EJB you can have @PostConstruct methods on the superclass,
+ // though the Web Beans spec is silent on the issue
+ throw new DefinitionException("Cannot have more than one post construct method annotated with @Initializer for " + getType());
+ }
+ else if (postConstructMethods.size() == 1)
+ {
+ this.postConstruct = postConstructMethods.iterator().next();
+ log.finest("Exactly one post construct method (" + postConstruct +") for " + getType());
+ return;
+ }
+ }
+ protected void initPreDestroy()
+ {
+ Set<AnnotatedMethod<Object>> preDestroyMethods = getAnnotatedItem().getAnnotatedMethods(PreDestroy.class);
+ log.finest("Found " + preDestroyMethods + " constructors annotated with @Initializer for " + getType());
+ if (preDestroyMethods.size() > 1)
+ {
+ //TODO: actually this is wrong, in EJB you can have @PreDestroy methods on the superclass,
+ // though the Web Beans spec is silent on the issue
+ throw new DefinitionException("Cannot have more than one pre destroy method annotated with @Initializer for " + getType());
+ }
+ else if (preDestroyMethods.size() == 1)
+ {
+ this.preDestroy = preDestroyMethods.iterator().next();
+ log.finest("Exactly one post construct method (" + preDestroy +") for " + getType());
+ return;
+ }
+ }
+
public SimpleConstructor<T> getConstructor()
{
return constructor;
}
+ public AnnotatedMethod<Object> getPostConstruct()
+ {
+ return postConstruct;
+ }
+
+ public AnnotatedMethod<Object> getPreDestroy()
+ {
+ return preDestroy;
+ }
+
@Override
public String toString()
{
15 years, 5 months
[webbeans-commits] Webbeans SVN: r274 - in ri/trunk/webbeans-ri/src: test/java/org/jboss/webbeans/test and 1 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-07 12:39:32 -0500 (Fri, 07 Nov 2008)
New Revision: 274
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
Log:
Switch producer method tests to use Bean, not Model
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-11-07 17:30:37 UTC (rev 273)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-11-07 17:39:32 UTC (rev 274)
@@ -6,6 +6,7 @@
import javax.webbeans.manager.Bean;
import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.model.MergedStereotypesModel;
import org.jboss.webbeans.model.bean.BeanModel;
public abstract class AbstractBean<T> extends Bean<T>
@@ -88,5 +89,10 @@
}
public abstract BeanModel<T, ?> getModel();
+
+ public MergedStereotypesModel<T, ?> getMergedStereotypes()
+ {
+ return getModel().getMergedStereotypes();
+ }
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java 2008-11-07 17:30:37 UTC (rev 273)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java 2008-11-07 17:39:32 UTC (rev 274)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.test;
-import static org.jboss.webbeans.test.util.Util.createProducerModel;
+import static org.jboss.webbeans.test.util.Util.createProducerMethodBean;
import static org.jboss.webbeans.test.util.Util.createSimpleModel;
import java.lang.reflect.Method;
@@ -9,9 +9,9 @@
import javax.webbeans.manager.Bean;
import javax.webbeans.manager.Context;
+import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.contexts.AbstractContext;
import org.jboss.webbeans.contexts.RequestContext;
-import org.jboss.webbeans.model.bean.ProducerMethodBeanModel;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.beans.SpiderProducer;
import org.jboss.webbeans.test.beans.Tarantula;
@@ -70,7 +70,8 @@
SimpleBeanModel<SpiderProducer> producer = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(producer);
Method nullProducer = SpiderProducer.class.getMethod("produceShelob");
- ProducerMethodBeanModel<Tarantula> producerModel = createProducerModel(Tarantula.class, nullProducer, manager);
+ ProducerMethodBean<Tarantula> producerModel = createProducerMethodBean(Tarantula.class, nullProducer, manager);
+ // TODO Fix this
//Bean<Tarantula> shelobBean = new ProducerBeanImpl<Tarantula>(producerModel, manager);
//assert context.get(shelobBean, true) == null;
}
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-07 17:30:37 UTC (rev 273)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-11-07 17:39:32 UTC (rev 274)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.test;
-import static org.jboss.webbeans.test.util.Util.createProducerModel;
+import static org.jboss.webbeans.test.util.Util.createProducerMethodBean;
import static org.jboss.webbeans.test.util.Util.createSimpleModel;
import java.lang.reflect.Method;
@@ -9,7 +9,7 @@
import javax.webbeans.DefinitionException;
import javax.webbeans.RequestScoped;
-import org.jboss.webbeans.model.bean.ProducerMethodBeanModel;
+import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
import org.jboss.webbeans.test.annotations.Tame;
@@ -37,7 +37,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("produceTameTarantula");
- ProducerMethodBeanModel<Tarantula> tarantulaModel = createProducerModel(Tarantula.class, method, manager);
+ ProducerMethodBean<Tarantula> tarantulaModel = createProducerMethodBean(Tarantula.class, method, manager);
tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class);
}
@@ -47,7 +47,7 @@
SimpleBeanModel<BeanWithStaticProducerMethod> model = createSimpleModel(BeanWithStaticProducerMethod.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = BeanWithStaticProducerMethod.class.getMethod("getString");
- createProducerModel(String.class, method, manager);
+ createProducerMethodBean(String.class, method, manager);
}
@Test(groups={"producerMethod", "enterpriseBeans"}, expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
@@ -62,7 +62,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("getFunnelWeaverSpider");
- createProducerModel(FunnelWeaver.class, method, manager);
+ createProducerMethodBean(FunnelWeaver.class, method, manager);
}
@Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
@@ -71,7 +71,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("getAnotherFunnelWeaver");
- createProducerModel(FunnelWeaver.class, method, manager);
+ createProducerMethodBean(FunnelWeaver.class, method, manager);
}
@Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
@@ -80,7 +80,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("getFunnelWeaver");
- createProducerModel(FunnelWeaver.class, method, manager);
+ createProducerMethodBean(FunnelWeaver.class, method, manager);
}
@Test(groups={"producerMethod", "deployment"}) @SpecAssertion(section="3.4")
@@ -95,7 +95,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("produceTarantula");
- ProducerMethodBeanModel<Tarantula> tarantulaModel = createProducerModel(Tarantula.class, method, manager);
+ ProducerMethodBean<Tarantula> tarantulaModel = createProducerMethodBean(Tarantula.class, method, manager);
assert tarantulaModel.getBindingTypes().size() == 1;
assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class);
}
@@ -106,14 +106,14 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("produceTarantula");
- ProducerMethodBeanModel<Tarantula> tarantulaModel = createProducerModel(Tarantula.class, method, manager);
- assert tarantulaModel.getApiTypes().size() == 6;
- assert tarantulaModel.getApiTypes().contains(Tarantula.class);
- assert tarantulaModel.getApiTypes().contains(DeadlySpider.class);
- assert tarantulaModel.getApiTypes().contains(Spider.class);
- assert tarantulaModel.getApiTypes().contains(Animal.class);
- assert tarantulaModel.getApiTypes().contains(DeadlyAnimal.class);
- assert tarantulaModel.getApiTypes().contains(Object.class);
+ ProducerMethodBean<Tarantula> tarantulaModel = createProducerMethodBean(Tarantula.class, method, manager);
+ assert tarantulaModel.getTypes().size() == 6;
+ assert tarantulaModel.getTypes().contains(Tarantula.class);
+ assert tarantulaModel.getTypes().contains(DeadlySpider.class);
+ assert tarantulaModel.getTypes().contains(Spider.class);
+ assert tarantulaModel.getTypes().contains(Animal.class);
+ assert tarantulaModel.getTypes().contains(DeadlyAnimal.class);
+ assert tarantulaModel.getTypes().contains(Object.class);
}
@Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
@@ -122,10 +122,10 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("makeASpider");
- ProducerMethodBeanModel<Animal> animalModel = createProducerModel(Animal.class, method, manager);
- assert animalModel.getApiTypes().size() == 2;
- assert animalModel.getApiTypes().contains(Animal.class);
- assert animalModel.getApiTypes().contains(Object.class);
+ ProducerMethodBean<Animal> animalModel = createProducerMethodBean(Animal.class, method, manager);
+ assert animalModel.getTypes().size() == 2;
+ assert animalModel.getTypes().contains(Animal.class);
+ assert animalModel.getTypes().contains(Object.class);
}
@Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
@@ -134,10 +134,10 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("getWolfSpiderSize");
- ProducerMethodBeanModel<Integer> intModel = createProducerModel(int.class, method, manager);
- assert intModel.getApiTypes().size() == 2;
- assert intModel.getApiTypes().contains(int.class);
- assert intModel.getApiTypes().contains(Object.class);
+ ProducerMethodBean<Integer> intModel = createProducerMethodBean(int.class, method, manager);
+ assert intModel.getTypes().size() == 2;
+ assert intModel.getTypes().contains(int.class);
+ assert intModel.getTypes().contains(Object.class);
}
@Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
@@ -146,10 +146,10 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("getSpiders");
- ProducerMethodBeanModel<Spider[]> spidersModel = createProducerModel(Spider[].class, method, manager);
- assert spidersModel.getApiTypes().size() == 2;
- assert spidersModel.getApiTypes().contains(Spider[].class);
- assert spidersModel.getApiTypes().contains(Object.class);
+ ProducerMethodBean<Spider[]> spidersModel = createProducerMethodBean(Spider[].class, method, manager);
+ assert spidersModel.getTypes().size() == 2;
+ assert spidersModel.getTypes().contains(Spider[].class);
+ assert spidersModel.getTypes().contains(Object.class);
}
@Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
@@ -158,7 +158,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("produceTameTarantula");
- ProducerMethodBeanModel<Tarantula> tarantulaModel = createProducerModel(Tarantula.class, method, manager);
+ ProducerMethodBean<Tarantula> tarantulaModel = createProducerMethodBean(Tarantula.class, method, manager);
assert tarantulaModel.getBindingTypes().size() == 1;
assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class);
}
@@ -169,7 +169,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs");
- ProducerMethodBeanModel<DaddyLongLegs> daddyLongLegsModel = createProducerModel(DaddyLongLegs.class, method, manager);
+ ProducerMethodBean<DaddyLongLegs> daddyLongLegsModel = createProducerMethodBean(DaddyLongLegs.class, method, manager);
assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class);
// TODO Inherit scope from returned web bean?
@@ -181,7 +181,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("getLadybirdSpider");
- ProducerMethodBeanModel<LadybirdSpider> ladybirdSpiderModel = createProducerModel(LadybirdSpider.class, method, manager);
+ ProducerMethodBean<LadybirdSpider> ladybirdSpiderModel = createProducerMethodBean(LadybirdSpider.class, method, manager);
assert ladybirdSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class);
}
@@ -191,7 +191,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("produceBlackWidow");
- ProducerMethodBeanModel<BlackWidow> blackWidowSpiderModel = createProducerModel(BlackWidow.class, method, manager);
+ ProducerMethodBean<BlackWidow> blackWidowSpiderModel = createProducerMethodBean(BlackWidow.class, method, manager);
assert blackWidowSpiderModel.getName().equals("blackWidow");
}
@@ -201,7 +201,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs");
- ProducerMethodBeanModel<DaddyLongLegs> daddyLongLegsSpiderModel = createProducerModel(DaddyLongLegs.class, method, manager);
+ ProducerMethodBean<DaddyLongLegs> daddyLongLegsSpiderModel = createProducerMethodBean(DaddyLongLegs.class, method, manager);
assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs");
}
@@ -211,7 +211,7 @@
SimpleBeanModel<BrokenSpiderProducer> model = createSimpleModel(BrokenSpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = BrokenSpiderProducer.class.getMethod("destroy");
- createProducerModel(String.class, method, manager);
+ createProducerMethodBean(String.class, method, manager);
}
@Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
@@ -220,7 +220,7 @@
SimpleBeanModel<BrokenSpiderProducer> model = createSimpleModel(BrokenSpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = BrokenSpiderProducer.class.getMethod("dispose", String.class);
- createProducerModel(String.class, method, manager);
+ createProducerMethodBean(String.class, method, manager);
}
@Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
@@ -229,7 +229,7 @@
SimpleBeanModel<BrokenSpiderProducer> model = createSimpleModel(BrokenSpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = BrokenSpiderProducer.class.getMethod("observe", String.class);
- createProducerModel(String.class, method, manager);
+ createProducerMethodBean(String.class, method, manager);
}
@Test(groups="disposalMethod") @SpecAssertion(section="3.3.4")
@@ -298,7 +298,7 @@
SimpleBeanModel<SpiderProducer> model = createSimpleModel(SpiderProducer.class, manager);
manager.getModelManager().addBeanModel(model);
Method method = SpiderProducer.class.getMethod("produceWolfSpider");
- ProducerMethodBeanModel<WolfSpider> wolfSpiderModel = createProducerModel(WolfSpider.class, method, manager);
+ ProducerMethodBean<WolfSpider> wolfSpiderModel = createProducerMethodBean(WolfSpider.class, method, manager);
assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1;
assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class);
assert wolfSpiderModel.getScopeType().equals(RequestScoped.class);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-07 17:30:37 UTC (rev 273)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-07 17:39:32 UTC (rev 274)
@@ -51,7 +51,7 @@
public static <T> ProducerMethodBean<T> createProducerMethodBean(Class<T> type, Method method, ManagerImpl manager, AbstractBean<?> declaringBean)
{
- return new ProducerMethodBean<T>(createProducerModel(type, method, null, manager, declaringBean), manager);
+ return new ProducerMethodBean<T>(createProducerMethodBeanModel(type, method, null, manager, declaringBean), manager);
}
public static <T> ProducerMethodBean<T> createProducerMethodBean(Class<T> type, Method method, ManagerImpl manager)
@@ -59,20 +59,20 @@
return createProducerMethodBean(type, method, manager, null);
}
- public static <T> ProducerMethodBeanModel<T> createProducerModel(Class<T> type, Method method, ManagerImpl manager)
+ private static <T> ProducerMethodBeanModel<T> createProducerMethodBeanModel(Class<T> type, Method method, ManagerImpl manager)
{
- return createProducerModel(type, method, null, manager);
+ return createProducerMethodBeanModel(type, method, null, manager);
}
- public static <T> ProducerMethodBeanModel<T> createProducerModel(Class<T> type, Method method, AnnotatedMethod<T> xmlAnnotatedMethod, ManagerImpl manager, AbstractBean<?> declaringBean)
+ private static <T> ProducerMethodBeanModel<T> createProducerMethodBeanModel(Class<T> type, Method method, AnnotatedMethod<T> xmlAnnotatedMethod, ManagerImpl manager, AbstractBean<?> declaringBean)
{
return new ProducerMethodBeanModel<T>(new SimpleAnnotatedMethod<T>(method), xmlAnnotatedMethod, manager, declaringBean);
}
@Deprecated
- public static <T> ProducerMethodBeanModel<T> createProducerModel(Class<T> type, Method method, AnnotatedMethod<T> xmlAnnotatedMethod, ManagerImpl manager)
+ public static <T> ProducerMethodBeanModel<T> createProducerMethodBeanModel(Class<T> type, Method method, AnnotatedMethod<T> xmlAnnotatedMethod, ManagerImpl manager)
{
- return createProducerModel(type, method, xmlAnnotatedMethod, manager, null);
+ return createProducerMethodBeanModel(type, method, xmlAnnotatedMethod, manager, null);
}
@Deprecated
15 years, 5 months
[webbeans-commits] Webbeans SVN: r273 - in ri/trunk/webbeans-ri/src: test/java/org/jboss/webbeans/test/ejb/model and 1 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-07 12:30:37 -0500 (Fri, 07 Nov 2008)
New Revision: 273
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
Log:
Switch enterprise tests to use Bean, not Model
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-11-07 10:28:31 UTC (rev 272)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-11-07 17:30:37 UTC (rev 273)
@@ -58,6 +58,12 @@
{
injectableField.inject(instance, manager);
}
- }
+ }
+
+ public InjectableMethod<?> getRemoveMethod()
+ {
+ return model.getRemoveMethod();
+
+ }
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java 2008-11-07 10:28:31 UTC (rev 272)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java 2008-11-07 17:30:37 UTC (rev 273)
@@ -2,7 +2,7 @@
import javax.webbeans.DefinitionException;
-import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
+import org.jboss.webbeans.bean.EnterpriseBean;
import org.jboss.webbeans.test.AbstractTest;
import org.jboss.webbeans.test.SpecAssertion;
import org.jboss.webbeans.test.SpecVersion;
@@ -32,84 +32,84 @@
@SpecAssertion(section = "3.3")
public void testStatelessWithDependentScopeOK()
{
- EnterpriseBeanModel<Giraffe> giraffe = Util.createEnterpriseBeanModel(Giraffe.class, manager);
+ EnterpriseBean<Giraffe> giraffe = Util.createEnterpriseBean(Giraffe.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testStatelessWithRequestScopeFails()
{
- EnterpriseBeanModel<Beagle> beagle = Util.createEnterpriseBeanModel(Beagle.class, manager);
+ EnterpriseBean<Beagle> beagle = Util.createEnterpriseBean(Beagle.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testStatelessWithConversationScopeFails()
{
- EnterpriseBeanModel<Boxer> boxer = Util.createEnterpriseBeanModel(Boxer.class, manager);
+ EnterpriseBean<Boxer> boxer = Util.createEnterpriseBean(Boxer.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testStatelessWithSessionScopeFails()
{
- EnterpriseBeanModel<Bullmastiff> boxer = Util.createEnterpriseBeanModel(Bullmastiff.class, manager);
+ EnterpriseBean<Bullmastiff> boxer = Util.createEnterpriseBean(Bullmastiff.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testStatelessWithApplicationScopeFails()
{
- EnterpriseBeanModel<Dachshund> dachshund = Util.createEnterpriseBeanModel(Dachshund.class, manager);
+ EnterpriseBean<Dachshund> dachshund = Util.createEnterpriseBean(Dachshund.class, manager);
}
@Test
@SpecAssertion(section = "3.3")
public void testSingletonWithDependentScopeOK()
{
- EnterpriseBeanModel<GreatDane> greatDane = Util.createEnterpriseBeanModel(GreatDane.class, manager);
+ EnterpriseBean<GreatDane> greatDane = Util.createEnterpriseBean(GreatDane.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testSingletonWithRequestScopeFails()
{
- EnterpriseBeanModel<Greyhound> greyhound = Util.createEnterpriseBeanModel(Greyhound.class, manager);
+ EnterpriseBean<Greyhound> greyhound = Util.createEnterpriseBean(Greyhound.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testSingletonWithConversationScopeFails()
{
- EnterpriseBeanModel<Husky> husky = Util.createEnterpriseBeanModel(Husky.class, manager);
+ EnterpriseBean<Husky> husky = Util.createEnterpriseBean(Husky.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testSingletonWithSessionScopeFails()
{
- EnterpriseBeanModel<IrishTerrier> irishTerrier = Util.createEnterpriseBeanModel(IrishTerrier.class, manager);
+ EnterpriseBean<IrishTerrier> irishTerrier = Util.createEnterpriseBean(IrishTerrier.class, manager);
}
@Test
@SpecAssertion(section = "3.3")
public void testSingletonWithApplicationScopeOK()
{
- EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager);
+ EnterpriseBean<Laika> laika = Util.createEnterpriseBean(Laika.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testEnterpriseBeanInterceptorFails()
{
- EnterpriseBeanModel<Pug> pug = Util.createEnterpriseBeanModel(Pug.class, manager);
+ EnterpriseBean<Pug> pug = Util.createEnterpriseBean(Pug.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
public void testEnterpriseBeanDecoratorFails()
{
- EnterpriseBeanModel<Pekingese> pekingese = Util.createEnterpriseBeanModel(Pekingese.class, manager);
+ EnterpriseBean<Pekingese> pekingese = Util.createEnterpriseBean(Pekingese.class, manager);
}
@Test(expectedExceptions = DefinitionException.class, groups = "enterpriseBeans")
@@ -175,8 +175,8 @@
@SpecAssertion(section = "3.3.2")
public void testObjectIsInAPITypes()
{
- EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager);
- assert laika.getApiTypes().contains(Object.class);
+ EnterpriseBean<Laika> laika = Util.createEnterpriseBean(Laika.class, manager);
+ assert laika.getTypes().contains(Object.class);
}
@Test(groups="enterpriseBeans")
@@ -204,7 +204,7 @@
@SpecAssertion(section = "3.3")
public void testMessageDrivenBeansNotOK()
{
- EnterpriseBeanModel<Leopard> Leopard = Util.createEnterpriseBeanModel(Leopard.class, manager);
+ EnterpriseBean<Leopard> Leopard = Util.createEnterpriseBean(Leopard.class, manager);
}
@@ -212,7 +212,7 @@
@SpecAssertion(section = "3.3.7")
public void testDefaultName()
{
- EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager);
+ EnterpriseBean<Pitbull> pitbull = Util.createEnterpriseBean(Pitbull.class, manager);
assert pitbull.getName().equals("pitbull");
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java 2008-11-07 10:28:31 UTC (rev 272)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java 2008-11-07 17:30:37 UTC (rev 273)
@@ -1,9 +1,8 @@
package org.jboss.webbeans.test.ejb.model;
import javax.webbeans.DefinitionException;
-import javax.webbeans.UnremovedException;
-import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
+import org.jboss.webbeans.bean.EnterpriseBean;
import org.jboss.webbeans.test.AbstractTest;
import org.jboss.webbeans.test.SpecAssertion;
import org.jboss.webbeans.test.SpecVersion;
@@ -33,42 +32,42 @@
@SpecAssertion(section = "3.3.5")
public void testStatefulEnterpriseBeanWithoutRemoveMethodInDependentScopeOK()
{
- EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager);
+ EnterpriseBean<Pitbull> pitbull = Util.createEnterpriseBean(Pitbull.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
public void testStatefulEnterpriseBeanWithoutRemoveMethodInApplicationScopeFails()
{
- EnterpriseBeanModel<Poodle> poodle = Util.createEnterpriseBeanModel(Poodle.class, manager);
+ EnterpriseBean<Poodle> poodle = Util.createEnterpriseBean(Poodle.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
public void testStatefulEnterpriseBeanWithoutRemoveMethodInSessionScopeFails()
{
- EnterpriseBeanModel<Rottweiler> rottweiler = Util.createEnterpriseBeanModel(Rottweiler.class, manager);
+ EnterpriseBean<Rottweiler> rottweiler = Util.createEnterpriseBean(Rottweiler.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
public void testStatefulEnterpriseBeanWithoutRemoveMethodInConversationScopeFails()
{
- EnterpriseBeanModel<Spitz> spitz = Util.createEnterpriseBeanModel(Spitz.class, manager);
+ EnterpriseBean<Spitz> spitz = Util.createEnterpriseBean(Spitz.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
public void testStatefulEnterpriseBeanWithoutRemoveMethodInRequestScopeFails()
{
- EnterpriseBeanModel<Saluki> saluki = Util.createEnterpriseBeanModel(Saluki.class, manager);
+ EnterpriseBean<Saluki> saluki = Util.createEnterpriseBean(Saluki.class, manager);
}
@Test
@SpecAssertion(section = "3.3.5.1")
public void testAnnotationDefinedEnterpriseBeanWithoutDestructorUsesRemoveMethodWithoutParamsAsWebBeansRemoveMethod()
{
- EnterpriseBeanModel<Armant> whippet = Util.createEnterpriseBeanModel(Armant.class, manager);
+ EnterpriseBean<Armant> whippet = Util.createEnterpriseBean(Armant.class, manager);
assert whippet.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("destroy");
}
@@ -76,7 +75,7 @@
@SpecAssertion(section = "3.3.5.1")
public void testAnnotationDefinedEnterpriseBeanWithoutDestructorAndRemoveMethodWithoutParamsHasNoWebBeansRemoveMethod()
{
- EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager);
+ EnterpriseBean<Laika> laika = Util.createEnterpriseBean(Laika.class, manager);
assert laika.getRemoveMethod() == null;
}
@@ -84,48 +83,48 @@
@SpecAssertion(section = "3.3.5.1")
public void testEnterpriseBeanWithMultipleDestructorAnnotationsFail()
{
- EnterpriseBeanModel<Whippet> whippet = Util.createEnterpriseBeanModel(Whippet.class, manager);
+ EnterpriseBean<Whippet> whippet = Util.createEnterpriseBean(Whippet.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
public void testAnnotationDefinedEnterpriseBeanWithDestructorAnnotationOnMethodNotAnEJBRemoveMethodFails()
{
- EnterpriseBeanModel<GoldenRetriever> goldenRetriever = Util.createEnterpriseBeanModel(GoldenRetriever.class, manager);
+ EnterpriseBean<GoldenRetriever> goldenRetriever = Util.createEnterpriseBean(GoldenRetriever.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
public void testAnnotationDefinedEnterpriseBeanWithDestructorWithDisposesParameterFails()
{
- EnterpriseBeanModel<Pumi> pumi = Util.createEnterpriseBeanModel(Pumi.class, manager);
+ EnterpriseBean<Pumi> pumi = Util.createEnterpriseBean(Pumi.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
public void testEnterpriseBeanWithInitializerAnnotationOnRemoveMethodFails()
{
- EnterpriseBeanModel<JackRussellTerrier> jackRussellTerrier = Util.createEnterpriseBeanModel(JackRussellTerrier.class, manager);
+ EnterpriseBean<JackRussellTerrier> jackRussellTerrier = Util.createEnterpriseBean(JackRussellTerrier.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
public void testEnterpriseBeanWithProducerAnnotationOnRemoveMethodFails()
{
- EnterpriseBeanModel<RussellTerrier> russellTerrier = Util.createEnterpriseBeanModel(RussellTerrier.class, manager);
+ EnterpriseBean<RussellTerrier> russellTerrier = Util.createEnterpriseBean(RussellTerrier.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
public void testEnterpriseBeanWithRemoveMethodTakingObserverAnnotatedParameterFails()
{
- EnterpriseBeanModel<Toller> toller = Util.createEnterpriseBeanModel(Toller.class, manager);
+ EnterpriseBean<Toller> toller = Util.createEnterpriseBean(Toller.class, manager);
}
@Test(expectedExceptions=DefinitionException.class)
public void testStatelessEnterpriseBeansWithDestructorAnnotationFails()
{
- EnterpriseBeanModel<WelshCorgie> welshCorgie = Util.createEnterpriseBeanModel(WelshCorgie.class, manager);
+ EnterpriseBean<WelshCorgie> welshCorgie = Util.createEnterpriseBean(WelshCorgie.class, manager);
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java 2008-11-07 10:28:31 UTC (rev 272)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java 2008-11-07 17:30:37 UTC (rev 273)
@@ -3,7 +3,7 @@
import javax.webbeans.DefinitionException;
import javax.webbeans.DeploymentException;
-import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
+import org.jboss.webbeans.bean.EnterpriseBean;
import org.jboss.webbeans.test.AbstractTest;
import org.jboss.webbeans.test.SpecAssertion;
import org.jboss.webbeans.test.SpecVersion;
@@ -21,13 +21,13 @@
@SpecAssertion(section = "3.3.6")
public void testSpecializingBeanInheritsBindingTypes()
{
- EnterpriseBeanModel<Hound> hound = Util.createEnterpriseBeanModel(Hound.class, manager);
- EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBeanModel(HoundOfBaskerville.class, manager);
+ EnterpriseBean<Hound> hound = Util.createEnterpriseBean(Hound.class, manager);
+ EnterpriseBean<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBean(HoundOfBaskerville.class, manager);
assert compareBindingTypesOK(hound, houndOfBaskerville);
}
- private boolean compareBindingTypesOK(EnterpriseBeanModel<Hound> hound,
- EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville)
+ private boolean compareBindingTypesOK(EnterpriseBean<Hound> hound,
+ EnterpriseBean<HoundOfBaskerville> houndOfBaskerville)
{
if (hound.getBindingTypes().size() != houndOfBaskerville.getBindingTypes().size()) {
return false;
@@ -45,7 +45,7 @@
@SpecAssertion(section = "3.3.6")
public void testSpecializingBeanInheritsNameIfAny()
{
- EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBeanModel(HoundOfBaskerville.class, manager);
+ EnterpriseBean<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBean(HoundOfBaskerville.class, manager);
assert houndOfBaskerville.getName().equals("Pongo");
}
@@ -82,7 +82,7 @@
@SpecAssertion(section = "3.3.6")
public void testAnnotationDefinedSpecializingEnterpriseBeanNotDirectlyExtendingAnnotationDefinedEnterpriseBeanFails()
{
- EnterpriseBeanModel<GreaterDane> greaterDane = Util.createEnterpriseBeanModel(GreaterDane.class, manager);
+ EnterpriseBean<GreaterDane> greaterDane = Util.createEnterpriseBean(GreaterDane.class, manager);
}
@Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"})
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-07 10:28:31 UTC (rev 272)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-07 17:30:37 UTC (rev 273)
@@ -24,7 +24,7 @@
return new SimpleBean<T>(createSimpleModel(clazz, manager), manager);
}
- public static <T> EnterpriseBean<T> createSimpleEnterpriseBean(Class<T> clazz, ManagerImpl manager)
+ public static <T> EnterpriseBean<T> createEnterpriseBean(Class<T> clazz, ManagerImpl manager)
{
return new EnterpriseBean<T>(createEnterpriseBeanModel(clazz, manager), manager);
}
@@ -39,12 +39,12 @@
return new SimpleBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), xmlAnnotatedType, manager);
}
- public static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, ManagerImpl manager)
+ private static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, ManagerImpl manager)
{
return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), null, manager);
}
- public static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, AnnotatedClass<T> xmlAnnotatedType, ManagerImpl manager)
+ private static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, AnnotatedClass<T> xmlAnnotatedType, ManagerImpl manager)
{
return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), xmlAnnotatedType, manager);
}
15 years, 5 months
[webbeans-commits] Webbeans SVN: r272 - in ri/trunk/webbeans-ri/src: test/java/org/jboss/webbeans/test/util and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: nickarls
Date: 2008-11-07 05:28:31 -0500 (Fri, 07 Nov 2008)
New Revision: 272
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
Log:
Enterprise bean stubs
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-11-07 10:28:31 UTC (rev 272)
@@ -0,0 +1,63 @@
+package org.jboss.webbeans.bean;
+
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.injectable.InjectableField;
+import org.jboss.webbeans.injectable.InjectableMethod;
+import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
+
+public class EnterpriseBean<T> extends AbstractBean<T>
+{
+ private EnterpriseBeanModel<T> model;
+
+ public EnterpriseBean(EnterpriseBeanModel<T> model, ManagerImpl manager) {
+ super(manager);
+ this.model = model;
+ }
+
+ @Override
+ public EnterpriseBeanModel<T> getModel()
+ {
+ return model;
+ }
+
+ @Override
+ public T create()
+ {
+ T instance = model.getConstructor().invoke(manager);
+ bindDecorators();
+ bindInterceptors();
+ injectEjbAndCommonFields();
+ injectBoundFields(instance);
+ callInitializers(instance);
+ return instance;
+ }
+
+ @Override
+ public void destroy(T instance)
+ {
+ // TODO Auto-generated method stub
+ super.destroy(instance);
+ }
+
+ protected void callInitializers(T instance)
+ {
+ for (InjectableMethod<Object> initializer : model.getInitializerMethods())
+ {
+ initializer.invoke(manager, instance);
+ }
+ }
+
+ protected void injectEjbAndCommonFields()
+ {
+ // TODO
+ }
+
+ protected void injectBoundFields(T instance)
+ {
+ for (InjectableField<?> injectableField : getModel().getInjectableFields())
+ {
+ injectableField.inject(instance, manager);
+ }
+ }
+
+}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-07 03:45:58 UTC (rev 271)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-07 10:28:31 UTC (rev 272)
@@ -6,6 +6,7 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.bean.AbstractBean;
+import org.jboss.webbeans.bean.EnterpriseBean;
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.introspector.AnnotatedClass;
@@ -23,6 +24,11 @@
return new SimpleBean<T>(createSimpleModel(clazz, manager), manager);
}
+ public static <T> EnterpriseBean<T> createSimpleEnterpriseBean(Class<T> clazz, ManagerImpl manager)
+ {
+ return new EnterpriseBean<T>(createEnterpriseBeanModel(clazz, manager), manager);
+ }
+
public static <T> SimpleBeanModel<T> createSimpleModel(Class<T> clazz, ManagerImpl manager)
{
return new SimpleBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), null, manager);
15 years, 5 months