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 0127AE2AC for ; Thu, 17 Jan 2013 15:09:58 +0000 (UTC) Received: (qmail 62970 invoked by uid 500); 17 Jan 2013 15:09:57 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 62916 invoked by uid 500); 17 Jan 2013 15:09:57 -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 62888 invoked by uid 99); 17 Jan 2013 15:09:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2013 15:09:56 +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; Thu, 17 Jan 2013 15:09:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0BD3923889DA; Thu, 17 Jan 2013 15:09:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1434707 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: decorator/DecoratorUtil.java decorator/WebBeansDecoratorConfig.java intercept/InterceptorHandlerPleaseRemove.java proxy/ProxyFactory.java Date: Thu, 17 Jan 2013 15:09:32 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130117150933.0BD3923889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: struberg Date: Thu Jan 17 15:09:32 2013 New Revision: 1434707 URL: http://svn.apache.org/viewvc?rev=1434707&view=rev Log: OWB-344 remove unnecessary WebBeansDecorator casts Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=1434707&r1=1434706&r2=1434707&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java Thu Jan 17 15:09:32 2013 @@ -21,7 +21,6 @@ package org.apache.webbeans.decorator; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.logging.Level; @@ -106,11 +105,9 @@ public final class DecoratorUtil if (!method.isSynthetic() && !method.isBridge() && !Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && Modifier.isFinal(modifiers)) { // Check decorator implements this - Iterator> itDecorator = decoratorList.iterator(); - while (itDecorator.hasNext()) + for (Decorator decorator : decoratorList) { - WebBeansDecorator decorator = (WebBeansDecorator) itDecorator.next(); - Class decClazz = decorator.getClazz(); + Class decClazz = decorator.getBeanClass(); try { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java?rev=1434707&r1=1434706&r2=1434707&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java Thu Jan 17 15:09:32 2013 @@ -76,7 +76,9 @@ public final class WebBeansDecoratorConf { logger.log(Level.FINE, "Configuring decorator class : [{0}]", delegate.getReturnType()); } + //X TODO no more delegation! WebBeansDecorator decorator = new WebBeansDecorator(delegate); + delegate.getWebBeansContext().getDecoratorsManager().addDecorator(decorator); } @@ -97,13 +99,9 @@ public final class WebBeansDecoratorConf if(decoratorList != null && !decoratorList.isEmpty()) { DecoratorUtil.checkManagedBeanDecoratorConditions(component, decoratorList); - Iterator> itList = decoratorList.iterator(); - while (itList.hasNext()) - { - WebBeansDecorator decorator = (WebBeansDecorator) itList.next(); - component.getDecoratorStack().add(decorator); - } + component.getDecoratorStack().addAll(decoratorList); + filterDecoratorsPerBDA(component,component.getDecoratorStack()); } } @@ -120,15 +118,13 @@ public final class WebBeansDecoratorConf String beanBDABeansXML = beansXMLScanner.getBeansXml(component.getBeanClass()); Set> definedDecorators = beansXMLScanner.getDecorators(beanBDABeansXML); - WebBeansDecorator dec; - if (stack != null && stack.size() > 0) { Iterator> it = stack.iterator(); while (it.hasNext()) { - dec = (WebBeansDecorator) it.next(); - if (!definedDecorators.contains(dec.getClazz())) + Decorator dec = it.next(); + if (!definedDecorators.contains(dec.getBeanClass())) { it.remove(); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java?rev=1434707&r1=1434706&r2=1434707&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java Thu Jan 17 15:09:32 2013 @@ -136,9 +136,6 @@ import org.apache.webbeans.util.ClassUti * * @see WebBeansInterceptorConfig * @see WebBeansDecoratorConfig - * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove - * @see org.apache.webbeans.decorator.WebBeansDecorator - * @see org.apache.webbeans.intercept.ejb.EJBInterceptorConfig * * @deprecated the whole interceptor stack will be changed to the new ASM based proxying. */ Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java?rev=1434707&r1=1434706&r2=1434707&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java Thu Jan 17 15:09:32 2013 @@ -163,7 +163,7 @@ public final class ProxyFactory result = createProxyRemove(proxyClass); - + if (!(bean instanceof WebBeansDecorator) && !(bean instanceof WebBeansInterceptorBeanPleaseRemove)) { InterceptorHandlerPleaseRemove interceptorHandler = createInterceptorHandlerRemove(bean, creationalContext);