WELD-1117 Disposer method check too strict

Conflicts:

	impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java

impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java

@@ -16,7 +16,6 @@
  */
 package org.jboss.weld.bean;
 
-import static org.jboss.weld.logging.messages.BeanMessage.DISPOSE_NOT_FIRST_PARAM;
 import static org.jboss.weld.logging.messages.BeanMessage.INCONSISTENT_ANNOTATIONS_ON_METHOD;
 import static org.jboss.weld.logging.messages.BeanMessage.METHOD_NOT_BUSINESS_METHOD;
 import static org.jboss.weld.logging.messages.BeanMessage.MULTIPLE_DISPOSE_PARAMS;
@@ -163,9 +162,6 @@ public void invokeDisposeMethod(Object instance) {
     }
 
     private void checkDisposalMethod() {
-        if (!disposalMethodInjectionPoint.getWeldParameters().get(0).isAnnotationPresent(Disposes.class)) {
-            throw new DefinitionException(DISPOSE_NOT_FIRST_PARAM, disposalMethodInjectionPoint);
-        }
         if (disposalMethodInjectionPoint.getAnnotatedParameters(Disposes.class).size() > 1) {
             throw new DefinitionException(MULTIPLE_DISPOSE_PARAMS, disposalMethodInjectionPoint);
         }

tests-arquillian/src/test/java/org/jboss/weld/tests/disposer/parameter/position/DisposedParameterPositionTest.java

@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012, Red Hat, Inc., 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.weld.tests.disposer.parameter.position;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.BeanArchive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.weld.util.reflection.Reflections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @see https://issues.jboss.org/browse/WELD-1117
+ * @author Jozef Hartinger
+ *
+ */
+@RunWith(Arquillian.class)
+public class DisposedParameterPositionTest {
+
+    @Deployment
+    public static Archive<?> getDeployment() {
+        return ShrinkWrap.create(BeanArchive.class).addClasses(Producer.class, Product.class);
+    }
+
+    @Test
+    public void testDisposedParameterIsNotFirstParameter(BeanManager manager) {
+        Product.reset();
+
+        Bean<Product> bean = Reflections.cast(manager.resolve(manager.getBeans(Product.class)));
+        CreationalContext<Product> ctx = manager.createCreationalContext(bean);
+        Product instance = bean.create(ctx);
+
+        assertTrue(Product.isCreated());
+        assertFalse(Product.isDisposed());
+
+        bean.destroy(instance, ctx);
+
+        assertTrue(Product.isCreated());
+        assertTrue(Product.isDisposed());
+    }
+}

tests-arquillian/src/test/java/org/jboss/weld/tests/disposer/parameter/position/Producer.java

@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012, Red Hat, Inc., 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.weld.tests.disposer.parameter.position;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+
+public class Producer {
+
+    @Produces
+    public Product produceProduct() {
+        return new Product(true);
+    }
+
+    public void disposeProduct(BeanManager manager, @Disposes @Any Product product, Event<Product> event) {
+        product.dispose();
+    }
+}

tests-arquillian/src/test/java/org/jboss/weld/tests/disposer/parameter/position/Product.java

@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012, Red Hat, Inc., 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.weld.tests.disposer.parameter.position;
+
+public class Product {
+
+    private static boolean created;
+    private static boolean disposed;
+
+    public Product(boolean bool) {
+        created = true;
+    }
+
+    public void dispose() {
+        disposed = true;
+    }
+
+    public static boolean isCreated() {
+        return created;
+    }
+
+    public static boolean isDisposed() {
+        return disposed;
+    }
+
+    public static void reset() {
+        created = false;
+        disposed = false;
+    }
+}