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 EEC72200C82 for ; Sat, 27 May 2017 10:05:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ED76A160BD7; Sat, 27 May 2017 08:05:33 +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 17356160BC6 for ; Sat, 27 May 2017 10:05:32 +0200 (CEST) Received: (qmail 57735 invoked by uid 500); 27 May 2017 08:05:32 -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 57724 invoked by uid 99); 27 May 2017 08:05:32 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 May 2017 08:05:32 +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 6C3393A047C for ; Sat, 27 May 2017 08:05:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1796370 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/... Date: Sat, 27 May 2017 08:05:31 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170527080531.6C3393A047C@svn01-us-west.apache.org> archived-at: Sat, 27 May 2017 08:05:34 -0000 Author: struberg Date: Sat May 27 08:05:30 2017 New Revision: 1796370 URL: http://svn.apache.org/viewvc?rev=1796370&view=rev Log: OWB-1182 Decorators and Interceptors with non-Dependent scope now leads to Exception per spec Added: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenInterceptorTest.java - copied, changed from r1796369, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenTest.java Removed: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenTest.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/BrokenDecoratorTest.java openwebbeans/trunk/webbeans-tck/standalone-suite.xml Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java?rev=1796370&r1=1796369&r2=1796370&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java Sat May 27 08:05:30 2017 @@ -369,6 +369,17 @@ public abstract class BeanAttributesBuil } } + if (found && annotated.getAnnotation(Interceptor.class) != null && scope != Dependent.class) + { + throw new WebBeansConfigurationException("An Interceptor must declare any other Scope than @Dependent: " + ClassUtil.getClass(annotated.getBaseType()).getName()); + } + + if (found && annotated.getAnnotation(Decorator.class) != null && scope != Dependent.class) + { + throw new WebBeansConfigurationException("A Decorator must declare any other Scope than @Dependent: " + ClassUtil.getClass(annotated.getBaseType()).getName()); + } + + if (!found && declaringClass != null && !hasDeclaredNonInheritedScope(declaringClass)) { defineScope(declaringClass.getSuperclass(), onlyScopedBeans, errorMessage); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/BrokenDecoratorTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/BrokenDecoratorTest.java?rev=1796370&r1=1796369&r2=1796370&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/BrokenDecoratorTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/BrokenDecoratorTest.java Sat May 27 08:05:30 2017 @@ -37,8 +37,8 @@ public class BrokenDecoratorTest extends { public static final String PACKAGE_NAME = BrokenDecoratorTest.class.getPackage().getName(); - @Test - public void testWarnings() + @Test(expected = WebBeansConfigurationException.class) + public void testDecoratorWithNonDependentScope() { Collection> classes = new ArrayList>(); classes.add(SomeBrokenDecorated.class); @@ -50,10 +50,6 @@ public class BrokenDecoratorTest extends xmls.add(getXmlPath(PACKAGE_NAME, "BrokenDecoratorTest")); startContainer(classes, xmls); - - - - shutDownContainer(); } @Test(expected = WebBeansConfigurationException.class) Copied: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenInterceptorTest.java (from r1796369, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenTest.java) URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenInterceptorTest.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenInterceptorTest.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenTest.java&r1=1796369&r2=1796370&rev=1796370&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/broken/BrokenInterceptorTest.java Sat May 27 08:05:30 2017 @@ -21,20 +21,20 @@ package org.apache.webbeans.test.interce import java.util.ArrayList; import java.util.Collection; +import org.apache.webbeans.exception.WebBeansConfigurationException; import org.apache.webbeans.test.AbstractUnitTest; import org.junit.Test; -public class BrokenTest extends AbstractUnitTest +public class BrokenInterceptorTest extends AbstractUnitTest { - public static final String PACKAGE_NAME = BrokenTest.class.getPackage().getName(); + public static final String PACKAGE_NAME = BrokenInterceptorTest.class.getPackage().getName(); @Test public void testWarnings() { Collection> classes = new ArrayList>(); classes.add(BrokenBean.class); - classes.add(BrokenScope.class); classes.add(BrokenAlternative.class); classes.add(BrokenName.class); @@ -47,4 +47,10 @@ public class BrokenTest extends Abstract } + @Test(expected = WebBeansConfigurationException.class) + public void testBrokenScopeOnInterceptor() + { + startContainer(BrokenScope.class); + } + } Modified: openwebbeans/trunk/webbeans-tck/standalone-suite.xml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/standalone-suite.xml?rev=1796370&r1=1796369&r2=1796370&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-tck/standalone-suite.xml (original) +++ openwebbeans/trunk/webbeans-tck/standalone-suite.xml Sat May 27 08:05:30 2017 @@ -73,7 +73,11 @@ - + + + + +