You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ar...@apache.org on 2013/01/04 19:16:32 UTC
svn commit: r1429015 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/creation/ config/ util/
Author: arne
Date: Fri Jan 4 18:16:32 2013
New Revision: 1429015
URL: http://svn.apache.org/viewvc?rev=1429015&view=rev
Log:
OWB-745: Removed DefinitionUtil.defineObserverMethods
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java?rev=1429015&r1=1429014&r2=1429015&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java Fri Jan 4 18:16:32 2013
@@ -80,15 +80,7 @@ public abstract class AbstractInjectedTa
*/
public Set<ObserverMethod<?>> defineObserverMethods()
{
- AbstractInjectionTargetBean bean = getBean();
- if(isDefaultMetaDataProvider())
- {
- return bean.getWebBeansContext().getDefinitionUtil().defineObserverMethods(bean, bean.getReturnType());
- }
- else
- {
- return bean.getWebBeansContext().getAnnotatedTypeUtil().defineObserverMethods(bean, getAnnotatedType());
- }
+ return webBeansContext.getAnnotatedTypeUtil().defineObserverMethods(getBean(), getAnnotatedType());
}
/**
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=1429015&r1=1429014&r2=1429015&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Fri Jan 4 18:16:32 2013
@@ -32,7 +32,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.enterprise.context.Dependent;
import javax.enterprise.context.NormalScope;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Disposes;
@@ -43,7 +42,6 @@ import javax.enterprise.inject.spi.Annot
import javax.enterprise.inject.spi.AnnotatedParameter;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ObserverMethod;
import javax.enterprise.util.Nonbinding;
import javax.inject.Inject;
import javax.inject.Named;
@@ -68,7 +66,6 @@ import org.apache.webbeans.config.inheri
import org.apache.webbeans.container.ExternalScope;
import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
import org.apache.webbeans.event.EventUtil;
-import org.apache.webbeans.event.NotificationManager;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.intercept.InterceptorData;
import org.apache.webbeans.spi.api.ResourceReference;
@@ -885,47 +882,6 @@ public final class DefinitionUtil
WebBeansDecoratorConfig.configureDecorators(bean);
}
- public <T> Set<ObserverMethod<?>> defineObserverMethods(InjectionTargetBean<T> component, Class<T> clazz)
- {
- Asserts.assertNotNull(component, "component parameter can not be null");
- Asserts.nullCheckForClass(clazz);
-
- NotificationManager manager = webBeansContext.getBeanManagerImpl().getNotificationManager();
-
- Method[] candidateMethods = AnnotationUtil.getMethodsWithParameterAnnotation(clazz, Observes.class);
-
- // From normal
- createObserverMethods(component, clazz, candidateMethods);
-
- return manager.addObservableComponentMethods(component);
-
- }
-
- private <T> void createObserverMethods(InjectionTargetBean<T> component, Class<?> clazz, Method[] candidateMethods)
- {
- // TODO Overriding an event method disables it (cdi 1.0: section 4.2)
- for (Method candidateMethod : candidateMethods)
- {
-
- EventUtil.checkObserverMethodConditions(candidateMethod, clazz);
- AbstractOwbBean<?> bean = (AbstractOwbBean<?>) component;
- if(bean.getScope().equals(Dependent.class))
- {
- //Check Reception
- if(EventUtil.isReceptionIfExist(candidateMethod))
- {
- throw new WebBeansConfigurationException("Dependent Bean : " + bean + " can not define observer method with @Receiver = IF_EXIST");
- }
- }
-
-
- component.addObservableMethod(candidateMethod);
-
- addMethodInjectionPointMetaData((AbstractOwbBean<T>) component, candidateMethod);
- }
-
- }
-
public <T> void defineSerializable(AbstractOwbBean<T> component)
{
Asserts.assertNotNull(component, "component parameter can not be null");
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java?rev=1429015&r1=1429014&r2=1429015&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java Fri Jan 4 18:16:32 2013
@@ -179,7 +179,7 @@ public final class ManagedBeanConfigurat
webBeansContext.getAnnotatedTypeUtil().defineDisposalMethods(component, component.getAnnotatedType());
webBeansContext.getAnnotatedTypeUtil().defineInjectedFields(component, component.getAnnotatedType());
webBeansContext.getAnnotatedTypeUtil().defineInjectedMethods(component, component.getAnnotatedType());
- definitionUtil.defineObserverMethods(component, clazz);
+ webBeansContext.getAnnotatedTypeUtil().defineObserverMethods(component, component.getAnnotatedType());
return component;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1429015&r1=1429014&r2=1429015&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Fri Jan 4 18:16:32 2013
@@ -1237,7 +1237,7 @@ public final class ClassUtil
if (subClassMethod.getName().equals(superClassMethod.getName()) && Arrays.equals(subClassMethod.getParameterTypes(), superClassMethod.getParameterTypes()))
{
int modifiers = superClassMethod.getModifiers();
- if(Modifier.isPrivate(modifiers))
+ if(Modifier.isPrivate(modifiers) || Modifier.isStatic(modifiers))
{
return false;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1429015&r1=1429014&r2=1429015&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Fri Jan 4 18:16:32 2013
@@ -636,7 +636,7 @@ public final class WebBeansUtil
comp.setImplScopeType(new ApplicationScopeLiteral());
comp.addQualifier(new DefaultLiteral());
- definitionUtil.defineObserverMethods(comp, clazz);
+ webBeansContext.getAnnotatedTypeUtil().defineObserverMethods(comp, comp.getAnnotatedType());
return comp;
}