Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4DFD1113CD for ; Mon, 8 Sep 2014 19:19:07 +0000 (UTC) Received: (qmail 42453 invoked by uid 500); 8 Sep 2014 19:19:07 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 42426 invoked by uid 500); 8 Sep 2014 19:19:07 -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 42412 invoked by uid 99); 8 Sep 2014 19:19:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2014 19:19:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2014 19:19:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DEA792388AA6; Mon, 8 Sep 2014 19:18:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1623478 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/BeansDeployer.java portable/ProducerMethodProducer.java Date: Mon, 08 Sep 2014 19:18:45 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140908191845.DEA792388AA6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Mon Sep 8 19:18:45 2014 New Revision: 1623478 URL: http://svn.apache.org/r1623478 Log: validating @Disposes injection points Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1623478&r1=1623477&r2=1623478&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Mon Sep 8 19:18:45 2014 @@ -61,6 +61,7 @@ import org.apache.webbeans.intercept.Int import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.portable.AbstractProducer; import org.apache.webbeans.portable.AnnotatedElementFactory; +import org.apache.webbeans.portable.ProducerMethodProducer; import org.apache.webbeans.portable.events.ProcessAnnotatedTypeImpl; import org.apache.webbeans.portable.events.ProcessBeanImpl; import org.apache.webbeans.portable.events.ProcessSyntheticAnnotatedTypeImpl; @@ -95,6 +96,7 @@ import javax.enterprise.inject.spi.Decor import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.spi.Interceptor; import javax.enterprise.inject.spi.ObserverMethod; +import javax.enterprise.inject.spi.Producer; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; @@ -250,6 +252,7 @@ public class BeansDeployer // Validate injection Points validateInjectionPoints(); + validateDisposeParameters(); validateDecoratorGenericTypes(); @@ -295,6 +298,26 @@ public class BeansDeployer } } + private void validateDisposeParameters() + { + final WebBeansUtil webBeansUtil = webBeansContext.getWebBeansUtil(); + for (final Bean bean : webBeansContext.getBeanManagerImpl().getBeans()) + { + if (ProducerMethodBean.class.isInstance(bean)) + { + final Producer producer = ProducerMethodBean.class.cast(bean).getProducer(); + if (ProducerMethodProducer.class.isInstance(producer)) + { + final Set disposalIPs = ProducerMethodProducer.class.cast(producer).getDisposalIPs(); + if (disposalIPs != null) + { + webBeansUtil.validate(disposalIPs, bean); + } + } // else? + } + } + } + // avoid delegate implementing Foo and decorator implementing Foo with no link between A and B private void validateDecoratorGenericTypes() { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java?rev=1623478&r1=1623477&r2=1623478&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java Mon Sep 8 19:18:45 2014 @@ -157,4 +157,9 @@ public class ProducerMethodProducer getDisposalIPs() + { + return disposalIPs; + } }