Weld SVN: r4451 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/interceptors/definition/custom and 2 other directories.
by weld-commits＠lists.jboss.org
Author: jharting
Date: 2009-10-30 10:43:40 -0400 (Fri, 30 Oct 2009)
New Revision: 4451
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorImplementation.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/InterceptorClass.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/Secure.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/Transactional.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/beans.xml
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/javax.enterprise.inject.spi.Extension
Log:
Test for custom implementation of the Interceptor interface
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/AfterBeanDiscoveryObserver.java 2009-10-30 14:43:40 UTC (rev 4451)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.custom;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+
+
+public class AfterBeanDiscoveryObserver implements Extension
+{
+ public void addInterceptors(@Observes AfterBeanDiscovery event) {
+ event.addBean(new CustomInterceptorImplementation());
+ }
+
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorImplementation.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorImplementation.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorImplementation.java 2009-10-30 14:43:40 UTC (rev 4451)
@@ -0,0 +1,108 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.custom;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InterceptionType;
+import javax.enterprise.inject.spi.Interceptor;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.interceptor.InvocationContext;
+
+class CustomInterceptorImplementation implements Interceptor<InterceptorClass>
+{
+
+ private Set<Annotation> interceptorBindingTypes = new HashSet<Annotation>();
+
+ public CustomInterceptorImplementation()
+ {
+ interceptorBindingTypes.add(new AnnotationLiteral<Secure>()
+ {
+ });
+ interceptorBindingTypes.add(new AnnotationLiteral<Transactional>()
+ {
+ });
+ }
+
+ public Set<Annotation> getInterceptorBindingTypes()
+ {
+ return Collections.unmodifiableSet(interceptorBindingTypes);
+ }
+
+ public Set<InjectionPoint> getInjectionPoints()
+ {
+ return Collections.emptySet();
+ }
+
+ public String getName()
+ {
+ return null;
+ }
+
+ public Set<Annotation> getQualifiers()
+ {
+ return Collections.emptySet();
+ }
+
+ public Class<? extends Annotation> getScope()
+ {
+ return Dependent.class;
+ }
+
+ public Set<Class<? extends Annotation>> getStereotypes()
+ {
+ return Collections.emptySet();
+ }
+
+ public Set<Type> getTypes()
+ {
+ Set<Type> types = new HashSet<Type>();
+ types.add(Object.class);
+ types.add(getBeanClass());
+ return types;
+ }
+
+ public boolean isAlternative()
+ {
+ return false;
+ }
+
+ public boolean isNullable()
+ {
+ return false;
+ }
+
+ public Object intercept(InterceptionType type, InterceptorClass instance, InvocationContext ctx)
+ {
+ try {
+ return instance.intercept(ctx);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public boolean intercepts(InterceptionType type)
+ {
+ return type.equals(InterceptionType.AROUND_INVOKE);
+ }
+
+ public Class<?> getBeanClass()
+ {
+ return InterceptorClass.class;
+ }
+
+ public InterceptorClass create(CreationalContext<InterceptorClass> creationalContext)
+ {
+ return new InterceptorClass();
+ }
+
+ public void destroy(InterceptorClass instance, CreationalContext<InterceptorClass> creationalContext)
+ {
+ creationalContext.release();
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorTest.java 2009-10-30 14:43:40 UTC (rev 4451)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.interceptors.definition.custom;
+
+import javax.enterprise.inject.spi.InterceptionType;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+@SpecVersion(spec = "cdi", version = "20091018")
+@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
+@IntegrationTest
+@BeansXml("beans.xml")
+public class CustomInterceptorTest extends AbstractJSR299Test
+{
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "9.5", id = "fe")
+ // WELD-238
+ public void testCustomAroundInvokeInterceptor()
+ {
+ assert !getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, new AnnotationLiteral<Secure>()
+ {
+ }, new AnnotationLiteral<Transactional>()
+ {
+ }).isEmpty();
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/InterceptorClass.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/InterceptorClass.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/InterceptorClass.java 2009-10-30 14:43:40 UTC (rev 4451)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.custom;
+
+import javax.interceptor.InvocationContext;
+
+class InterceptorClass
+{
+ public Object intercept(InvocationContext ctx) throws Exception {
+ return ctx.proceed();
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/Secure.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/Secure.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/Secure.java 2009-10-30 14:43:40 UTC (rev 4451)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.custom;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+@interface Secure
+{
+
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/Transactional.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/Transactional.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/Transactional.java 2009-10-30 14:43:40 UTC (rev 4451)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.custom;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+@interface Transactional
+{
+
+}
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/beans.xml 2009-10-30 14:43:40 UTC (rev 4451)
@@ -0,0 +1,5 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.custom.InterceptorClass</class>
+ </interceptors>
+</beans>
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/javax.enterprise.inject.spi.Extension
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/javax.enterprise.inject.spi.Extension (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/custom/javax.enterprise.inject.spi.Extension 2009-10-30 14:43:40 UTC (rev 4451)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.interceptors.definition.custom.AfterBeanDiscoveryObserver
\ No newline at end of file
14 years, 6 months
Weld SVN: r4450 - api/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 10:42:51 -0400 (Fri, 30 Oct 2009)
New Revision: 4450
Modified:
api/trunk/pom.xml
Log:
enforce no-snapshots
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-10-30 14:31:20 UTC (rev 4449)
+++ api/trunk/pom.xml 2009-10-30 14:42:51 UTC (rev 4450)
@@ -48,6 +48,25 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireReleaseDeps>
+ <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+ </requireReleaseDeps>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
14 years, 6 months
Weld SVN: r4449 - in core/trunk/impl/src/main/java/org/jboss/weld: bean and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 10:31:20 -0400 (Fri, 30 Oct 2009)
New Revision: 4449
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
Log:
fix method name on BeanManager
Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-10-30 14:31:05 UTC (rev 4448)
+++ core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-10-30 14:31:20 UTC (rev 4449)
@@ -1059,7 +1059,7 @@
{
if (uniqueInterceptorBindings.contains(interceptorBinding.annotationType()))
throw new IllegalArgumentException("Duplicate interceptor binding type: " + interceptorBinding.annotationType());
- if (!isInterceptorBindingType(interceptorBinding.annotationType()))
+ if (!isInterceptorBinding(interceptorBinding.annotationType()))
throw new IllegalArgumentException("Trying to resolve interceptors with non-binding type: " + interceptorBinding.annotationType());
uniqueInterceptorBindings.add(interceptorBinding.annotationType());
}
@@ -1314,7 +1314,7 @@
return getServices().get(MetaAnnotationStore.class).getBindingTypeModel(annotationType).isValid();
}
- public boolean isInterceptorBindingType(Class<? extends Annotation> annotationType)
+ public boolean isInterceptorBinding(Class<? extends Annotation> annotationType)
{
return getServices().get(MetaAnnotationStore.class).getInterceptorBindingModel(annotationType).isValid();
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-10-30 14:31:05 UTC (rev 4448)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-10-30 14:31:20 UTC (rev 4449)
@@ -399,7 +399,7 @@
Set<Annotation> foundInterceptionBindingTypes = new HashSet<Annotation>();
for (Annotation annotation: annotations)
{
- if (manager.isInterceptorBindingType(annotation.annotationType()))
+ if (manager.isInterceptorBinding(annotation.annotationType()))
{
foundInterceptionBindingTypes.add(annotation);
foundInterceptionBindingTypes.addAll(manager.getServices().get(MetaAnnotationStore.class).getInterceptorBindingModel(annotation.annotationType()).getInheritedInterceptionBindingTypes());
14 years, 6 months
Weld SVN: r4448 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 10:31:05 -0400 (Fri, 30 Oct 2009)
New Revision: 4448
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
Log:
fix method name on BeanManager
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-10-30 14:31:05 UTC (rev 4447)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-10-30 14:31:05 UTC (rev 4448)
@@ -272,7 +272,7 @@
* @return true if the annotationType is a {@linkplain Interceptor
* interceptor} binding type
*/
- public boolean isInterceptorBindingType(Class<? extends Annotation> annotationType);
+ public boolean isInterceptorBinding(Class<? extends Annotation> annotationType);
/**
* Tests the given annotationType to determine if it is a
14 years, 6 months
Weld SVN: r4447 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 10:31:05 -0400 (Fri, 30 Oct 2009)
New Revision: 4447
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
Log:
fix method name on BeanManager
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-30 14:25:03 UTC (rev 4446)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-30 14:31:05 UTC (rev 4447)
@@ -149,10 +149,10 @@
@SpecAssertion(section = "11.3.13", id = "ad")
public void testDetermineInterceptorBindingType()
{
- assert getCurrentManager().isInterceptorBindingType(Transactional.class);
- assert !getCurrentManager().isInterceptorBindingType(Tame.class);
- assert !getCurrentManager().isInterceptorBindingType(AnimalStereotype.class);
- assert !getCurrentManager().isInterceptorBindingType(ApplicationScoped.class);
+ assert getCurrentManager().isInterceptorBinding(Transactional.class);
+ assert !getCurrentManager().isInterceptorBinding(Tame.class);
+ assert !getCurrentManager().isInterceptorBinding(AnimalStereotype.class);
+ assert !getCurrentManager().isInterceptorBinding(ApplicationScoped.class);
}
@Test(groups = { "rewrite"})
14 years, 6 months
Weld SVN: r4446 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/interceptors/definition/member and 3 other directories.
by weld-commits＠lists.jboss.org
Author: jharting
Date: 2009-10-30 10:25:03 -0400 (Fri, 30 Oct 2009)
New Revision: 4446
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/AnimalCountInterceptorBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/DecreasingInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/Farm.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/IncreasingInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/VehicleCountInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/VehicleCountInterceptorBinding.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/member/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/member/beans.xml
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
Tests for section 9.5.2
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/AnimalCountInterceptorBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/AnimalCountInterceptorBinding.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/AnimalCountInterceptorBinding.java 2009-10-30 14:25:03 UTC (rev 4446)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.member;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+@interface AnimalCountInterceptorBinding
+{
+ Operation value();
+
+ enum Operation {
+ INCREASE, DECREASE
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/DecreasingInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/DecreasingInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/DecreasingInterceptor.java 2009-10-30 14:25:03 UTC (rev 4446)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.member;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.jboss.jsr299.tck.tests.interceptors.definition.member.AnimalCountInterceptorBinding.Operation;
+
+@Interceptor
+(a)AnimalCountInterceptorBinding(Operation.DECREASE)
+class DecreasingInterceptor
+{
+ private static boolean intercepted = false;
+
+ @AroundInvoke
+ public Object aroundInvoke(InvocationContext ctx) throws Exception
+ {
+ intercepted = true;
+ return ((Integer) ctx.proceed()) - 10;
+ }
+
+ public static boolean isIntercepted()
+ {
+ return intercepted;
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/Farm.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/Farm.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/Farm.java 2009-10-30 14:25:03 UTC (rev 4446)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.member;
+
+import org.jboss.jsr299.tck.tests.interceptors.definition.member.AnimalCountInterceptorBinding.Operation;
+
+class Farm
+{
+ @AnimalCountInterceptorBinding(Operation.INCREASE)
+ public int getAnimalCount() {
+ return 10;
+ }
+
+ @VehicleCountInterceptorBinding(comment = "foo")
+ public int getVehicleCount() {
+ return 10;
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/IncreasingInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/IncreasingInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/IncreasingInterceptor.java 2009-10-30 14:25:03 UTC (rev 4446)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.member;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.jboss.jsr299.tck.tests.interceptors.definition.member.AnimalCountInterceptorBinding.Operation;
+
+@Interceptor
+(a)AnimalCountInterceptorBinding(Operation.INCREASE)
+class IncreasingInterceptor
+{
+ private static boolean intercepted = false;
+
+ @AroundInvoke
+ public Object aroundInvoke(InvocationContext ctx) throws Exception
+ {
+ intercepted = true;
+ return ((Integer) ctx.proceed()) + 10;
+ }
+
+ public static boolean isIntercepted()
+ {
+ return intercepted;
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java 2009-10-30 14:25:03 UTC (rev 4446)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.interceptors.definition.member;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for interceptor bindings types with members.
+ * @author Jozef Hartinger
+ *
+ */
+@Artifact
+@SpecVersion(spec="cdi", version="20091018")
+@BeansXml("beans.xml")
+public class InterceptorBindingTypeWithMemberTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "9.5.2", id = "a")
+ public void testInterceptorBindingTypeWithMember() {
+ Farm farm = getInstanceByType(Farm.class);
+ assert farm.getAnimalCount() == 20;
+ assert IncreasingInterceptor.isIntercepted();
+ assert !DecreasingInterceptor.isIntercepted();
+ }
+
+ @Test
+ @SpecAssertion(section = "9.5.2", id = "b")
+ public void testInterceptorBindingTypeWithNonBindingMember() {
+ Farm farm = getInstanceByType(Farm.class);
+ assert farm.getVehicleCount() == 20;
+ assert VehicleCountInterceptor.isIntercepted();
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/VehicleCountInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/VehicleCountInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/VehicleCountInterceptor.java 2009-10-30 14:25:03 UTC (rev 4446)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.member;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@VehicleCountInterceptorBinding(comment = "bar")
+class VehicleCountInterceptor
+{
+ private static boolean intercepted = false;
+
+ @AroundInvoke
+ public Object aroundInvoke(InvocationContext ctx) throws Exception
+ {
+ intercepted = true;
+ return ((Integer) ctx.proceed()) + 10;
+ }
+
+ public static boolean isIntercepted()
+ {
+ return intercepted;
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/VehicleCountInterceptorBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/VehicleCountInterceptorBinding.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/member/VehicleCountInterceptorBinding.java 2009-10-30 14:25:03 UTC (rev 4446)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.member;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.Nonbinding;
+import javax.interceptor.InterceptorBinding;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+@interface VehicleCountInterceptorBinding
+{
+ @Nonbinding
+ String comment();
+}
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/member/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/member/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/member/beans.xml 2009-10-30 14:25:03 UTC (rev 4446)
@@ -0,0 +1,7 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.member.IncreasingInterceptor</class>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.member.DecreasingInterceptor</class>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.member.VehicleCountInterceptor</class>
+ </interceptors>
+</beans>
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-30 13:46:54 UTC (rev 4445)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-30 14:25:03 UTC (rev 4446)
@@ -4469,7 +4469,7 @@
<text>An annotation member may be excluded from consideration using the @Nonbinding annotation.</text>
</assertion>
- <assertion id="ca">
+ <assertion id="ca" testable="false">
<text>Array-valued or annotation-valued members of an interceptor binding type should be annotated |@Nonbinding| in a portable application. If an array-valued or annotation-valued member of an interceptor binding type is not annotated |@Nonbinding|, non-portable behavior results.</text>
</assertion>
14 years, 6 months
Weld SVN: r4445 - core/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 09:46:54 -0400 (Fri, 30 Oct 2009)
New Revision: 4445
Added:
core/tags/glassfish-integration/
Log:
subdir for gf integration tags
14 years, 6 months
Weld SVN: r4444 - in core/trunk/impl/src/main/java/org/jboss/weld: bootstrap/events and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 09:18:26 -0400 (Fri, 30 Oct 2009)
New Revision: 4444
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java
core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java
core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverFactory.java
core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java
Log:
WELD-217, part 2
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-10-30 13:18:12 UTC (rev 4443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-10-30 13:18:26 UTC (rev 4444)
@@ -231,9 +231,9 @@
}
}
- protected <X, T> void createObserverMethod(RIBean<X> declaringBean, WeldMethod<T, X> method)
+ protected <T, X> void createObserverMethod(RIBean<X> declaringBean, WeldMethod<T, X> method)
{
- ObserverMethodImpl<X, T> observer = ObserverFactory.create(method, declaringBean, manager);
+ ObserverMethodImpl<T, X> observer = ObserverFactory.create(method, declaringBean, manager);
getEnvironment().addObserverMethod(observer);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java 2009-10-30 13:18:12 UTC (rev 4443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java 2009-10-30 13:18:26 UTC (rev 4444)
@@ -35,20 +35,20 @@
* @author David Allen
*
*/
-public class ProcessObserverMethodImpl<X, T> extends AbstractDefinitionContainerEvent implements ProcessObserverMethod<X, T>
+public class ProcessObserverMethodImpl<T, X> extends AbstractDefinitionContainerEvent implements ProcessObserverMethod<T, X>
{
- public static <X, T> void fire(BeanManagerImpl beanManager, ObserverMethodImpl<X, T> observer)
+ public static <T, X> void fire(BeanManagerImpl beanManager, ObserverMethodImpl<T, X> observer)
{
- new ProcessObserverMethodImpl<X, T>(beanManager, observer.getMethod(), observer) {}.fire();
+ new ProcessObserverMethodImpl<T, X>(beanManager, observer.getMethod(), observer) {}.fire();
}
private final AnnotatedMethod<X> beanMethod;
private final ObserverMethod<T> observerMethod;
- public ProcessObserverMethodImpl(BeanManagerImpl beanManager, AnnotatedMethod<X> beanMethod, ObserverMethodImpl<X, T> observerMethod)
+ public ProcessObserverMethodImpl(BeanManagerImpl beanManager, AnnotatedMethod<X> beanMethod, ObserverMethodImpl<T, X> observerMethod)
{
- super(beanManager, ProcessObserverMethod.class, new Type[] { observerMethod.getMethod().getDeclaringType().getBaseType(), observerMethod.getObservedType() });
+ super(beanManager, ProcessObserverMethod.class, new Type[] { observerMethod.getObservedType(), observerMethod.getMethod().getDeclaringType().getBaseType() });
this.beanMethod = beanMethod;
this.observerMethod = observerMethod;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java 2009-10-30 13:18:12 UTC (rev 4443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/AsynchronousTransactionalEventNotification.java 2009-10-30 13:18:26 UTC (rev 4444)
@@ -38,7 +38,7 @@
private static final LocLogger log = loggerFactory().getLogger(EVENT);
private static final XLogger xLog = loggerFactory().getXLogger(EVENT);
- public AsynchronousTransactionalEventNotification(T event, ObserverMethodImpl<?, T> observer)
+ public AsynchronousTransactionalEventNotification(T event, ObserverMethodImpl<T, ?> observer)
{
super(event, observer);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java 2009-10-30 13:18:12 UTC (rev 4443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java 2009-10-30 13:18:26 UTC (rev 4444)
@@ -41,7 +41,7 @@
private static final XLogger xLog = loggerFactory().getXLogger(EVENT);
// The observer
- protected final ObserverMethodImpl<?, T> observer;
+ protected final ObserverMethodImpl<T, ?> observer;
// The event object
protected final T event;
@@ -51,7 +51,7 @@
* @param observer The observer to be notified
* @param event The event being fired
*/
- public DeferredEventNotification(T event, ObserverMethodImpl<?, T> observer)
+ public DeferredEventNotification(T event, ObserverMethodImpl<T, ?> observer)
{
this.observer = observer;
this.event = event;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverFactory.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverFactory.java 2009-10-30 13:18:12 UTC (rev 4443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverFactory.java 2009-10-30 13:18:26 UTC (rev 4444)
@@ -41,17 +41,17 @@
* @param manager The Bean manager
* @return An observer implementation built from the method abstraction
*/
- public static <X, T> ObserverMethodImpl<X, T> create(WeldMethod<T, X> method, RIBean<X> declaringBean, BeanManagerImpl manager)
+ public static <T, X> ObserverMethodImpl<T, X> create(WeldMethod<T, X> method, RIBean<X> declaringBean, BeanManagerImpl manager)
{
- ObserverMethodImpl<X, T> result = null;
+ ObserverMethodImpl<T, X> result = null;
TransactionPhase transactionPhase = getTransactionalPhase(method);
if (manager.getServices().contains(TransactionServices.class) && !transactionPhase.equals(TransactionPhase.IN_PROGRESS))
{
- result = new TransactionalObserverMethodImpl<X, T>(method, declaringBean, transactionPhase, manager);
+ result = new TransactionalObserverMethodImpl<T, X>(method, declaringBean, transactionPhase, manager);
}
else
{
- result = new ObserverMethodImpl<X, T>(method, declaringBean, manager);
+ result = new ObserverMethodImpl<T, X>(method, declaringBean, manager);
}
return result;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-30 13:18:12 UTC (rev 4443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-30 13:18:26 UTC (rev 4444)
@@ -59,7 +59,7 @@
* @author David Allen
*
*/
-public class ObserverMethodImpl<X, T> implements ObserverMethod<T>
+public class ObserverMethodImpl<T, X> implements ObserverMethod<T>
{
private final Set<Annotation> bindings;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java 2009-10-30 13:18:12 UTC (rev 4443)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java 2009-10-30 13:18:26 UTC (rev 4444)
@@ -28,7 +28,7 @@
* @author David Allen
*
*/
-class TransactionalObserverMethodImpl<X, T> extends ObserverMethodImpl<X, T>
+class TransactionalObserverMethodImpl<T, X> extends ObserverMethodImpl<T, X>
{
/**
14 years, 6 months
Weld SVN: r4443 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer: broken/definitionError and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 09:18:12 -0400 (Fri, 30 Oct 2009)
New Revision: 4443
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java
Log:
WELD-217, part 2
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-10-30 13:16:38 UTC (rev 4442)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-10-30 13:18:12 UTC (rev 4443)
@@ -41,7 +41,6 @@
public class ProcessObserverMethodEventTest extends AbstractJSR299Test
{
@Test
- // Event resolution seems to be broken here
@SpecAssertion(section = "11.5.9", id = "aaa")
public void testProcessObserverMethodEventsSent()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java 2009-10-30 13:16:38 UTC (rev 4442)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java 2009-10-30 13:18:12 UTC (rev 4443)
@@ -15,7 +15,7 @@
private static AnnotatedMethod<?> annotatedMethod;
private static ObserverMethod<?> observerMethod;
- public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventAObserver, EventA> event)
+ public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventA, EventAObserver> event)
{
eventTypes.add(event.getObserverMethod().getObservedType());
annotatedMethod = event.getAnnotatedMethod();
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java 2009-10-30 13:16:38 UTC (rev 4442)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java 2009-10-30 13:18:12 UTC (rev 4443)
@@ -7,7 +7,7 @@
class ProcessObserverMethodObserver implements Extension
{
- public void observeObserverMethodForEventB(@Observes ProcessObserverMethod<?, EventB> event)
+ public void observeObserverMethodForEventB(@Observes ProcessObserverMethod<EventB, ?> event)
{
event.addDefinitionError(new RuntimeException("Definition error for EventB"));
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java 2009-10-30 13:16:38 UTC (rev 4442)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java 2009-10-30 13:18:12 UTC (rev 4443)
@@ -6,7 +6,7 @@
class ProcessObserverMethodObserver implements Extension
{
- public void observeObserverMethodForEventC(@Observes ProcessObserverMethod<?, EventC> event)
+ public void observeObserverMethodForEventC(@Observes ProcessObserverMethod<EventC, ?> event)
{
throw new RuntimeException("Definition error for EventC");
}
14 years, 6 months
Weld SVN: r4442 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 09:16:38 -0400 (Fri, 30 Oct 2009)
New Revision: 4442
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
Log:
WELD-217, part 2
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java 2009-10-30 12:27:32 UTC (rev 4441)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java 2009-10-30 13:16:38 UTC (rev 4442)
@@ -33,7 +33,7 @@
* @param <X> The bean type containing the observer method
* @param <T> The type of the event being observed
*/
-public interface ProcessObserverMethod<X, T>
+public interface ProcessObserverMethod<T, X>
{
/**
* The {@link javax.enterprise.inject.spi.AnnotatedMethod} representing the
14 years, 6 months