WELD-975 Programmatic lookup with @New qualifier not working

impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java

@@ -314,14 +314,20 @@ public void addNewBeansFromInjectionPoints(AbstractBean<?, ?> bean) {
 
     public void addNewBeansFromInjectionPoints(Set<WeldInjectionPoint<?, ?>> newInjectionPoints) {
         for (WeldInjectionPoint<?, ?> injectionPoint : newInjectionPoints) {
-            // FIXME: better check
             Class<?> rawType = Reflections.getRawType(injectionPoint.getType());
-            if (Instance.class.equals(rawType) || Event.class.equals(rawType)) {
+            if (Event.class.equals(rawType)) {
                 continue;
             }
             New _new = injectionPoint.getQualifier(New.class);
             if (_new.value().equals(New.class)) {
-                addNewBeanFromInjecitonPoint(rawType, injectionPoint.getType());
+                if (rawType.equals(Instance.class)) {
+                    // e.g. @Inject @New(ChequePaymentProcessor.class) Instance<PaymentProcessor> chequePaymentProcessor;
+                    // see WELD-975
+                    Type typeParameter = Reflections.getActualTypeArguments(injectionPoint.getType())[0];
+                    addNewBeanFromInjecitonPoint(Reflections.getRawType(typeParameter), typeParameter);
+                } else {
+                    addNewBeanFromInjecitonPoint(rawType, injectionPoint.getType());
+                }
             } else {
                 addNewBeanFromInjecitonPoint(_new.value(), _new.value());
             }

tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/lookup/AnotherProgrammaticLookupOfNewBeanTest.java

@@ -0,0 +1,67 @@
+/*
+ * 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.managed.newBean.lookup;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import javax.enterprise.inject.Instance;
+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.literal.NewLiteral;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @see WELD-975
+ * @author Jozef Hartinger
+ *
+ */
+@RunWith(Arquillian.class)
+public class AnotherProgrammaticLookupOfNewBeanTest {
+
+    @Deployment
+    public static Archive<?> getDeployment() {
+        return ShrinkWrap.create(BeanArchive.class).addClasses(PaymentProcessor.class, ChequePaymentProcessor.class, InjectedBean2.class);
+    }
+
+    @Test
+    public void testProgrammaticLookupOfNewBean(InjectedBean2 bean, BeanManager manager) {
+        assertEquals(1, manager.getBeans(ChequePaymentProcessor.class, new NewLiteral()).size());
+        Instance<PaymentProcessor> instance = bean.getInstance();
+        assertNotNull(instance);
+        assertFalse(instance.isAmbiguous());
+        assertFalse(instance.isUnsatisfied());
+
+        PaymentProcessor processor1 = instance.get();
+        assertTrue(processor1 instanceof PaymentProcessor);
+        assertTrue(processor1 instanceof ChequePaymentProcessor);
+        assertEquals("foo", processor1.getValue());
+        processor1.setValue("bar");
+
+        // verify that this is a @New bean and not the @ApplicationScoped one
+        PaymentProcessor processor2 = instance.get();
+        assertEquals("foo", processor2.getValue());
+    }
+}

tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/lookup/ChequePaymentProcessor.java

@@ -0,0 +1,24 @@
+/*
+ * 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.managed.newBean.lookup;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class ChequePaymentProcessor extends PaymentProcessor {
+
+}

tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/lookup/InjectedBean1.java

@@ -0,0 +1,42 @@
+/*
+ * 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.managed.newBean.lookup;
+
+import java.util.ArrayList;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+public class InjectedBean1 {
+
+    @Inject
+    @New
+    private Instance<PaymentProcessor> instance;
+
+    @Inject
+    @New
+    private Instance<ArrayList<String>> strings;
+
+    public Instance<PaymentProcessor> getInstance() {
+        return instance;
+    }
+
+    public Instance<ArrayList<String>> getStrings() {
+        return strings;
+    }
+}

tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/lookup/InjectedBean2.java

@@ -0,0 +1,32 @@
+/*
+ * 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.managed.newBean.lookup;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+public class InjectedBean2 {
+
+    @Inject
+    @New(ChequePaymentProcessor.class)
+    private Instance<PaymentProcessor> instance;
+
+    public Instance<PaymentProcessor> getInstance() {
+        return instance;
+    }
+}

tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/lookup/PaymentProcessor.java

@@ -0,0 +1,33 @@
+/*
+ * 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.managed.newBean.lookup;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class PaymentProcessor {
+
+    private String value = "foo";
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/lookup/ProgrammaticLookupOfNewBeanTest.java

@@ -0,0 +1,75 @@
+/*
+ * 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.managed.newBean.lookup;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import javax.enterprise.inject.Instance;
+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.literal.NewLiteral;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @see WELD-975
+ * @author Jozef Hartinger
+ *
+ */
+@RunWith(Arquillian.class)
+public class ProgrammaticLookupOfNewBeanTest {
+
+    @Deployment
+    public static Archive<?> getDeployment() {
+        return ShrinkWrap.create(BeanArchive.class).addClasses(PaymentProcessor.class, ChequePaymentProcessor.class, InjectedBean1.class);
+    }
+
+    @Test
+    public void testProgrammaticLookupOfNewBean(InjectedBean1 bean, BeanManager manager) {
+        assertEquals(1, manager.getBeans(PaymentProcessor.class, new NewLiteral()).size());
+        Instance<PaymentProcessor> instance = bean.getInstance();
+        assertNotNull(instance);
+        assertFalse(instance.isAmbiguous());
+        assertFalse(instance.isUnsatisfied());
+
+        PaymentProcessor processor1 = instance.get();
+        assertTrue(processor1 instanceof PaymentProcessor);
+        assertFalse(processor1 instanceof ChequePaymentProcessor);
+        assertEquals("foo", processor1.getValue());
+        processor1.setValue("bar");
+
+        // verify that this is a @New bean and not the @ApplicationScoped one
+        PaymentProcessor processor2 = instance.get();
+        assertEquals("foo", processor2.getValue());
+    }
+
+    @Test
+    public void testProgrammaticLookupOfParameterizedNewBean(InjectedBean1 bean) {
+        assertNotNull(bean.getStrings());
+        assertFalse(bean.getStrings().isAmbiguous());
+        assertFalse(bean.getStrings().isUnsatisfied());
+        assertNotNull(bean.getStrings().get());
+    }
+}