Author: struberg
Date: Tue Jan 8 11:27:59 2013
New Revision: 1430220
URL: http://svn.apache.org/viewvc?rev=1430220&view=rev
Log:
OWB-344 InjectableMethod(s) only handles a singular method...
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
(contents, props changed)
- copied, changed from r1430161,
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/Injectable.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=1430220&r1=1430219&r2=1430220&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
Tue Jan 8 11:27:59 2013
@@ -45,7 +45,7 @@ import org.apache.webbeans.decorator.Web
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.inject.InjectableField;
-import org.apache.webbeans.inject.InjectableMethods;
+import org.apache.webbeans.inject.InjectableMethod;
import org.apache.webbeans.intercept.InterceptorData;
import javax.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.intercept.InvocationContextImpl;
@@ -386,7 +386,7 @@ public abstract class AbstractInjectionT
@SuppressWarnings("unchecked")
private void injectMethod(Method method, Object instance,
CreationalContext<?> creationalContext)
{
- InjectableMethods m = new InjectableMethods(method, instance, this,
creationalContext);
+ InjectableMethod m = new InjectableMethod(method, instance, this,
creationalContext);
m.doInjection();
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java?rev=1430220&r1=1430219&r2=1430220&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
Tue Jan 8 11:27:59 2013
@@ -35,7 +35,7 @@ import org.apache.webbeans.context.creat
import
org.apache.webbeans.context.creational.DependentCreationalContext.DependentType;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.inject.AbstractInjectable;
-import org.apache.webbeans.inject.InjectableMethods;
+import org.apache.webbeans.inject.InjectableMethod;
import org.apache.webbeans.util.WebBeansUtil;
/**
@@ -143,7 +143,7 @@ public class ProducerMethodBean<T> exten
T instance = null;
Object parentInstance = null;
CreationalContext<?> parentCreational = null;
- InjectableMethods<T> m;
+ InjectableMethod<T> m;
List<DependentCreationalContext<Object>> oldDependents =
dependentInstanceOfProducerMethods.get();
@@ -158,7 +158,7 @@ public class ProducerMethodBean<T> exten
parentInstance = getParentInstance(parentCreational);
}
- m = new InjectableMethods<T>(creatorMethod, parentInstance, this,
creationalContext);
+ m = new InjectableMethod<T>(creatorMethod, parentInstance, this,
creationalContext);
//Injection of parameters
instance = m.doInjection();
@@ -287,7 +287,7 @@ public class ProducerMethodBean<T> exten
{
Object parentInstance = null;
CreationalContext<?> parentCreational = null;
- InjectableMethods<T> m = null;
+ InjectableMethod<T> m = null;
try
{
parentCreational =
getManager().createCreationalContext(ownerComponent);
@@ -297,7 +297,7 @@ public class ProducerMethodBean<T> exten
parentInstance = getParentInstance(parentCreational);
}
- m = new InjectableMethods<T>(disposalMethod, parentInstance,
ownerComponent, creationalContext);
+ m = new InjectableMethod<T>(disposalMethod, parentInstance,
ownerComponent, creationalContext);
m.setDisposable(true);
m.setProducerMethodInstance(instance);
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=1430220&r1=1430219&r2=1430220&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
Tue Jan 8 11:27:59 2013
@@ -26,7 +26,7 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.inject.InjectableField;
-import org.apache.webbeans.inject.InjectableMethods;
+import org.apache.webbeans.inject.InjectableMethod;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.util.AnnotationUtil;
import org.apache.webbeans.util.ClassUtil;
@@ -421,7 +421,7 @@ public class WebBeansDecorator<T> extend
@SuppressWarnings("unchecked")
private void injectMethod(Method method, Object instance,
CreationalContext<?> creationalContext)
{
- InjectableMethods m = new InjectableMethods(method, instance,
wrappedBean, creationalContext);
+ InjectableMethod m = new InjectableMethod(method, instance,
wrappedBean, creationalContext);
m.doInjection();
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=1430220&r1=1430219&r2=1430220&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
Tue Jan 8 11:27:59 2013
@@ -51,7 +51,7 @@ import org.apache.webbeans.util.WebBeans
*
* @see InjectableField
* @see InjectableConstructor
- * @see InjectableMethods
+ * @see InjectableMethod
*/
public abstract class AbstractInjectable implements Injectable
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/Injectable.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/Injectable.java?rev=1430220&r1=1430219&r2=1430220&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/Injectable.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/Injectable.java
Tue Jan 8 11:27:59 2013
@@ -33,7 +33,7 @@ package org.apache.webbeans.inject;
* @since 1.0
* @see InjectableConstructor
* @see InjectableField
- * @see InjectableMethods
+ * @see InjectableMethod
* @see AbstractInjectable
*/
public interface Injectable
Copied:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
(from r1430161,
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java&r1=1430161&r2=1430220&rev=1430220&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
Tue Jan 8 11:27:59 2013
@@ -39,7 +39,7 @@ import org.apache.webbeans.container.Inj
import org.apache.webbeans.exception.WebBeansException;
@SuppressWarnings("unchecked")
-public class InjectableMethods<T> extends AbstractInjectable
+public class InjectableMethod<T> extends AbstractInjectable
{
/** Injectable method */
protected Method method;
@@ -61,7 +61,7 @@ public class InjectableMethods<T> extend
* @param m injectable method
* @param instance component instance
*/
- public InjectableMethods(Method m, Object instance, OwbBean<?>
owner,CreationalContext<?> creationalContext)
+ public InjectableMethod(Method m, Object instance, OwbBean<?> owner,
CreationalContext<?> creationalContext)
{
super(owner,creationalContext);
method = m;
Propchange:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java?rev=1430220&r1=1430219&r2=1430220&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java
Tue Jan 8 11:27:59 2013
@@ -27,7 +27,7 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.inject.InjectableField;
-import org.apache.webbeans.inject.InjectableMethods;
+import org.apache.webbeans.inject.InjectableMethod;
import org.apache.webbeans.intercept.OwbInterceptor;
import org.apache.webbeans.util.AnnotationUtil;
@@ -322,7 +322,7 @@ public class WebBeansInterceptorBeanPlea
@SuppressWarnings("unchecked")
private void injectMethod(Method method, Object instance,
CreationalContext<?> creationalContext)
{
- InjectableMethods m = new InjectableMethods(method, instance,
delegateBean, creationalContext);
+ InjectableMethod m = new InjectableMethod(method, instance,
delegateBean, creationalContext);
m.doInjection();
}
