[webbeans-commits] Webbeans SVN: r256 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bean and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Nov 6 06:52:38 EST 2008
Author: pete.muir at jboss.org
Date: 2008-11-06 06:52:38 -0500 (Thu, 06 Nov 2008)
New Revision: 256
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/BeanWrapper.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/SimpleBeanImpl.java
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/util/Util.java
Log:
Rename and move BeanImpl
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-11-06 11:50:09 UTC (rev 255)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -1,96 +0,0 @@
-package org.jboss.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.model.bean.BeanModel;
-
-public abstract class BeanImpl<T> extends Bean<T>
-{
-
- public static final String LOGGER_NAME = "bean";
-
- protected ManagerImpl manager;
-
- public BeanImpl(ManagerImpl manager)
- {
- super(manager);
- this.manager = manager;
- }
-
- protected T getInstance()
- {
- return getModel().getConstructor().invoke(manager);
- }
-
- protected void bindInterceptors()
- {
- // TODO
- }
-
- protected void bindDecorators()
- {
- // TODO
- }
-
- @Override
- public void destroy(T instance)
- {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Set<Annotation> getBindingTypes()
- {
- return getModel().getBindingTypes();
- }
-
- @Override
- public Class<? extends Annotation> getDeploymentType()
- {
- return getModel().getDeploymentType();
- }
-
- @Override
- public String getName()
- {
- return getModel().getName();
- }
-
- @Override
- public Class<? extends Annotation> getScopeType()
- {
- return getModel().getScopeType();
- }
-
- @Override
- public Set<Class<?>> getTypes()
- {
- return getModel().getApiTypes();
- }
-
- @Override
- public boolean isNullable()
- {
- return !getModel().isPrimitive();
- }
-
- @Override
- public boolean isSerializable()
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public String toString()
- {
- return getModel().toString();
- }
-
- public abstract BeanModel<T, ?> getModel();
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java 2008-11-06 11:50:09 UTC (rev 255)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -1,92 +0,0 @@
-package org.jboss.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Manager;
-
-public class BeanWrapper<T> extends Bean<T>
-{
-
- private Bean<T> delegate;
-
- public BeanWrapper(Manager manager, Bean<T> delegate)
- {
- super(manager);
- this.delegate = delegate;
- }
-
- @Override
- public T create()
- {
- return delegate.create();
- }
-
- @Override
- public void destroy(T instance)
- {
- delegate.destroy(instance);
- }
-
- @Override
- public Set<Annotation> getBindingTypes()
- {
- return delegate.getBindingTypes();
- }
-
- @Override
- public Class<? extends Annotation> getDeploymentType()
- {
- return delegate.getDeploymentType();
- }
-
- @Override
- public String getName()
- {
- return delegate.getName();
- }
-
- @Override
- public Class<? extends Annotation> getScopeType()
- {
- return delegate.getScopeType();
- }
-
- @Override
- public Set<Class<?>> getTypes()
- {
- return delegate.getTypes();
- }
-
- @Override
- public boolean isNullable()
- {
- return delegate.isNullable();
- }
-
- @Override
- public boolean isSerializable()
- {
- return delegate.isSerializable();
- }
-
- @Override
- public String toString()
- {
- return delegate.toString();
- }
-
- @Override
- public int hashCode()
- {
- return delegate.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- return delegate.equals(obj);
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/SimpleBeanImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/SimpleBeanImpl.java 2008-11-06 11:50:09 UTC (rev 255)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/SimpleBeanImpl.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -1,57 +0,0 @@
-package org.jboss.webbeans;
-
-import org.jboss.webbeans.injectable.InjectableField;
-import org.jboss.webbeans.injectable.InjectableMethod;
-import org.jboss.webbeans.model.bean.SimpleBeanModel;
-
-public class SimpleBeanImpl<T> extends BeanImpl<T>
-{
-
- private SimpleBeanModel<T> model;
-
- public SimpleBeanImpl(SimpleBeanModel<T> model, ManagerImpl manager)
- {
- super(manager);
- this.model = model;
- }
-
- @Override
- public T create()
- {
- T instance = getInstance();
- bindDecorators();
- bindInterceptors();
- injectEjbAndCommonFields();
- injectBoundFields(instance);
- callInitializers(instance);
- return 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);
- }
- }
-
- @Override
- public SimpleBeanModel<T> getModel()
- {
- return model;
- }
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java (from rev 254, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -0,0 +1,97 @@
+package org.jboss.webbeans.bean;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.webbeans.manager.Bean;
+
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.model.bean.BeanModel;
+
+public abstract class AbstractBean<T> extends Bean<T>
+{
+
+ public static final String LOGGER_NAME = "bean";
+
+ protected ManagerImpl manager;
+
+ public AbstractBean(ManagerImpl manager)
+ {
+ super(manager);
+ this.manager = manager;
+ }
+
+ protected T getInstance()
+ {
+ return getModel().getConstructor().invoke(manager);
+ }
+
+ protected void bindInterceptors()
+ {
+ // TODO
+ }
+
+ protected void bindDecorators()
+ {
+ // TODO
+ }
+
+ @Override
+ public void destroy(T instance)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Set<Annotation> getBindingTypes()
+ {
+ return getModel().getBindingTypes();
+ }
+
+ @Override
+ public Class<? extends Annotation> getDeploymentType()
+ {
+ return getModel().getDeploymentType();
+ }
+
+ @Override
+ public String getName()
+ {
+ return getModel().getName();
+ }
+
+ @Override
+ public Class<? extends Annotation> getScopeType()
+ {
+ return getModel().getScopeType();
+ }
+
+ @Override
+ public Set<Class<?>> getTypes()
+ {
+ return getModel().getApiTypes();
+ }
+
+ @Override
+ public boolean isNullable()
+ {
+ return !getModel().isPrimitive();
+ }
+
+ @Override
+ public boolean isSerializable()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public String toString()
+ {
+ return getModel().toString();
+ }
+
+ public abstract BeanModel<T, ?> getModel();
+
+}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/BeanWrapper.java (from rev 254, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/BeanWrapper.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/BeanWrapper.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -0,0 +1,92 @@
+package org.jboss.webbeans.bean;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Manager;
+
+public class BeanWrapper<T> extends Bean<T>
+{
+
+ private Bean<T> delegate;
+
+ public BeanWrapper(Manager manager, Bean<T> delegate)
+ {
+ super(manager);
+ this.delegate = delegate;
+ }
+
+ @Override
+ public T create()
+ {
+ return delegate.create();
+ }
+
+ @Override
+ public void destroy(T instance)
+ {
+ delegate.destroy(instance);
+ }
+
+ @Override
+ public Set<Annotation> getBindingTypes()
+ {
+ return delegate.getBindingTypes();
+ }
+
+ @Override
+ public Class<? extends Annotation> getDeploymentType()
+ {
+ return delegate.getDeploymentType();
+ }
+
+ @Override
+ public String getName()
+ {
+ return delegate.getName();
+ }
+
+ @Override
+ public Class<? extends Annotation> getScopeType()
+ {
+ return delegate.getScopeType();
+ }
+
+ @Override
+ public Set<Class<?>> getTypes()
+ {
+ return delegate.getTypes();
+ }
+
+ @Override
+ public boolean isNullable()
+ {
+ return delegate.isNullable();
+ }
+
+ @Override
+ public boolean isSerializable()
+ {
+ return delegate.isSerializable();
+ }
+
+ @Override
+ public String toString()
+ {
+ return delegate.toString();
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return delegate.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ return delegate.equals(obj);
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/BeanWrapper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -0,0 +1,31 @@
+package org.jboss.webbeans.bean;
+
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.model.bean.BeanModel;
+
+public class ProducerBean<T> extends AbstractBean<T>
+{
+
+ public ProducerBean(ManagerImpl manager)
+ {
+ super(manager);
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public BeanModel<T, ?> getModel()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public T create()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java (from rev 254, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/SimpleBeanImpl.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -0,0 +1,58 @@
+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.SimpleBeanModel;
+
+public class SimpleBean<T> extends AbstractBean<T>
+{
+
+ private SimpleBeanModel<T> model;
+
+ public SimpleBean(SimpleBeanModel<T> model, ManagerImpl manager)
+ {
+ super(manager);
+ this.model = model;
+ }
+
+ @Override
+ public T create()
+ {
+ T instance = getInstance();
+ bindDecorators();
+ bindInterceptors();
+ injectEjbAndCommonFields();
+ injectBoundFields(instance);
+ callInitializers(instance);
+ return 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);
+ }
+ }
+
+ @Override
+ public SimpleBeanModel<T> getModel()
+ {
+ return model;
+ }
+
+}
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-06 11:50:09 UTC (rev 255)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -9,7 +9,7 @@
import javax.webbeans.NullableDependencyException;
import javax.webbeans.manager.Bean;
-import org.jboss.webbeans.SimpleBeanImpl;
+import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.test.beans.Fox;
import org.jboss.webbeans.test.beans.FoxRun;
import org.jboss.webbeans.test.beans.Tuna;
@@ -64,7 +64,7 @@
@Test(groups="injection", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.6")
public void testInjectingStaticField()
{
- SimpleBeanImpl<BeanWithStaticBoundField> bean = createSimpleWebBean(BeanWithStaticBoundField.class, manager);
+ SimpleBean<BeanWithStaticBoundField> bean = createSimpleWebBean(BeanWithStaticBoundField.class, manager);
Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
manager.addBean(tunaBean);
BeanWithStaticBoundField instance = bean.create();
@@ -73,7 +73,7 @@
@Test(groups="injection",expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.6")
public void testInjectingFinalField()
{
- SimpleBeanImpl<BeanWithFinalBoundField> bean = createSimpleWebBean(BeanWithFinalBoundField.class, manager);
+ SimpleBean<BeanWithFinalBoundField> bean = createSimpleWebBean(BeanWithFinalBoundField.class, manager);
Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
manager.addBean(tunaBean);
BeanWithFinalBoundField instance = bean.create();
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-06 11:50:09 UTC (rev 255)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -4,7 +4,7 @@
import javax.webbeans.manager.Bean;
-import org.jboss.webbeans.SimpleBeanImpl;
+import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.test.beans.FishPond;
import org.jboss.webbeans.test.beans.Goldfish;
import org.jboss.webbeans.test.beans.RedSnapper;
@@ -74,7 +74,7 @@
@Test(groups="injection") @SpecAssertion(section="5.3")
public void testCreateInjectsFieldsDeclaredInJava()
{
- SimpleBeanImpl<TunaFarm> tunaFarmBean = createSimpleWebBean(TunaFarm.class, manager);
+ SimpleBean<TunaFarm> tunaFarmBean = createSimpleWebBean(TunaFarm.class, manager);
Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
manager.addBean(tunaBean);
TunaFarm tunaFarm = tunaFarmBean.create();
@@ -90,7 +90,7 @@
@Test(groups="injection")
public void testFieldMissingBindingAnnotationsAreNotInjected()
{
- SimpleBeanImpl<TunaFarm> tunaFarmBean = createSimpleWebBean(TunaFarm.class, manager);
+ SimpleBean<TunaFarm> tunaFarmBean = createSimpleWebBean(TunaFarm.class, manager);
Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
manager.addBean(tunaBean);
TunaFarm tunaFarm = tunaFarmBean.create();
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-06 11:50:09 UTC (rev 255)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-06 11:52:38 UTC (rev 256)
@@ -4,7 +4,7 @@
import java.util.HashMap;
import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.SimpleBeanImpl;
+import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
@@ -12,9 +12,9 @@
public class Util
{
- public static <T> SimpleBeanImpl<T> createSimpleWebBean(Class<T> clazz, ManagerImpl manager)
+ public static <T> SimpleBean<T> createSimpleWebBean(Class<T> clazz, ManagerImpl manager)
{
- return new SimpleBeanImpl<T>(createSimpleModel(clazz, manager), manager);
+ return new SimpleBean<T>(createSimpleModel(clazz, manager), manager);
}
public static <T> SimpleBeanModel<T> createSimpleModel(Class<T> clazz, ManagerImpl manager)
@@ -36,6 +36,8 @@
{
return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), xmlAnnotatedType, manager);
}
+
+
@Deprecated
public static <T> AnnotatedClass<T> getEmptyAnnotatedType(Class<T> type)
More information about the weld-commits
mailing list