Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 44936200CA8 for ; Thu, 15 Jun 2017 14:39:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 43081160BDF; Thu, 15 Jun 2017 12:39:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 87EE6160BC4 for ; Thu, 15 Jun 2017 14:39:49 +0200 (CEST) Received: (qmail 97854 invoked by uid 500); 15 Jun 2017 12:39:48 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 97843 invoked by uid 99); 15 Jun 2017 12:39:48 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2017 12:39:48 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 4972D3A002A for ; Thu, 15 Jun 2017 12:39:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1798821 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/creation/ObserverMethodsBuilder.java event/ObserverMethodImpl.java Date: Thu, 15 Jun 2017 12:39:44 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170615123947.4972D3A002A@svn01-us-west.apache.org> archived-at: Thu, 15 Jun 2017 12:39:50 -0000 Author: struberg Date: Thu Jun 15 12:39:44 2017 New Revision: 1798821 URL: http://svn.apache.org/viewvc?rev=1798821&view=rev Log: OWB-1182 fire ProcessInjectionPoint for observer method parameters Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java?rev=1798821&r1=1798820&r2=1798821&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java Thu Jun 15 12:39:44 2017 @@ -106,27 +106,28 @@ public class ObserverMethodsBuilder { List> parameters = (List>)(List)annotatedMethod.getParameters(); AnnotatedParameter observesParameter = null; - for(AnnotatedParameter parameter : parameters) + for (AnnotatedParameter parameter : parameters) { - if(parameter.isAnnotationPresent(Observes.class) || parameter.isAnnotationPresent(ObservesAsync.class)) + if (parameter.isAnnotationPresent(Observes.class) || parameter.isAnnotationPresent(ObservesAsync.class)) { if (observesParameter != null) { throw new WebBeansConfigurationException("Observer method : " + annotatedMethod.getJavaMember().getName() + " in class : " + annotatedMethod.getJavaMember().getDeclaringClass().getName() - + " must not define two parameters that are annotated with @Observes"); + + " must not define two parameters that are annotated with @Observes or @ObservesAsync"); } observesParameter = parameter; } } - if(observesParameter != null) + if (observesParameter != null) { checkObserverMethodConditions(ownerBean, observesParameter); //Looking for ObserverMethod ObserverMethod definedObserver = webBeansContext.getNotificationManager(). getObservableMethodForAnnotatedMethod(annotatedMethod, observesParameter, ownerBean); + return definedObserver; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=1798821&r1=1798820&r2=1798821&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Thu Jun 15 12:39:44 2017 @@ -24,7 +24,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; @@ -58,7 +57,6 @@ import org.apache.webbeans.container.Bea import org.apache.webbeans.context.creational.CreationalContextImpl; import org.apache.webbeans.exception.WebBeansConfigurationException; import org.apache.webbeans.exception.WebBeansException; -import org.apache.webbeans.inject.impl.InjectionPointFactory; import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.proxy.OwbNormalScopeProxy; import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin; @@ -191,9 +189,7 @@ public class ObserverMethodImpl imple { if (!parameter.isAnnotationPresent(observerAnnotation)) { - Collection qualifierAnnots = getWebBeansContext().getAnnotationManager().getQualifierAnnotations(parameter.getAnnotations()); - - injectionPoints.add(InjectionPointFactory.getPartialInjectionPoint(ownerBean, parameter, qualifierAnnots)); + injectionPoints.add(getWebBeansContext().getInjectionPointFactory().buildInjectionPoint(ownerBean, parameter, true)); } }