#3556: Supplier Bridge does not take into account @nAmed qualifier.

Change-Id: Idbefc45ff68508e715b252684d6ae4e5df6bcce7

Author: Petr Bouda

inject/hk2/src/main/java/org/glassfish/jersey/inject/hk2/Hk2Helper.java

@@ -199,6 +199,7 @@ private static void bindSupplierInstanceBinding(ServiceLocator locator, Supplier
                 }
             });
             // Always call SupplierFactoryBridge.
+            supplierBuilder.setName(binding.getName());
             binding.getQualifiers().forEach(supplierBuilder::addQualifierAnnotation);
             binder.bind(supplierBuilder);
 
@@ -234,6 +235,7 @@ private static void bindSupplierClassBinding(ServiceLocator locator, SupplierCla
                 }
             });
             binding.getQualifiers().forEach(supplierBuilder::qualifiedBy);
+            supplierBuilder.named(binding.getName());
             supplierBuilder.in(transformScope(binding.getSupplierScope()));
             binder.bind(supplierBuilder);
 
@@ -245,7 +247,8 @@ private static void bindSupplierClassBinding(ServiceLocator locator, SupplierCla
                 contract = binding.getContracts().iterator().next();
             }
 
-            ServiceBindingBuilder<?> builder = binder.bindFactory(new SupplierFactoryBridge<>(locator, contract, disposable));
+            ServiceBindingBuilder<?> builder = binder.bindFactory(
+                    new SupplierFactoryBridge<>(locator, contract, binding.getName(), disposable));
             setupSupplierFactoryBridge(binding, builder);
             if (binding.getImplementationType() != null) {
                 builder.asType(binding.getImplementationType());

inject/hk2/src/main/java/org/glassfish/jersey/inject/hk2/SupplierFactoryBridge.java

@@ -67,7 +67,8 @@
 public class SupplierFactoryBridge<T> implements Factory<T> {
 
     private ServiceLocator locator;
-    private ParameterizedType type;
+    private ParameterizedType beanType;
+    private String beanName;
     private boolean disposable;
 
     // This bridge can create multiple instances using the method 'provide' therefore must map created suppliers because of
@@ -79,21 +80,23 @@ public class SupplierFactoryBridge<T> implements Factory<T> {
      * Constructor for a new bridge.
      *
      * @param locator    currently used locator, all factory invocations will be delegated to this locator.
-     * @param type       generic type of a {@link Supplier} which is looked for in locator and on which the creation of
+     * @param beanType   generic type of a {@link Supplier} which is looked for in locator and on which the creation of
      *                   the new instance is delegated.
+     * @param beanName   name of the bean that is provided by supplier.
      * @param disposable flag whether the bridge is set up for disposing the created object.
      */
-    SupplierFactoryBridge(ServiceLocator locator, Type type, boolean disposable) {
+    SupplierFactoryBridge(ServiceLocator locator, Type beanType, String beanName, boolean disposable) {
         this.locator = locator;
-        this.type = new ParameterizedTypeImpl(Supplier.class, type);
+        this.beanType = new ParameterizedTypeImpl(Supplier.class, beanType);
+        this.beanName = beanName;
         this.disposable = disposable;
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public T provide() {
-        if (type != null) {
-            Supplier<T> supplier = locator.getService(type);
+        if (beanType != null) {
+            Supplier<T> supplier = locator.getService(beanType, beanName);
             T instance = supplier.get();
             if (disposable) {
                 disposableSuppliers.put(instance, (DisposableSupplier<T>) supplier);

inject/hk2/src/test/java/org/glassfish/jersey/inject/hk2/SupplierClassBindingTest.java

@@ -172,4 +172,28 @@ public void testSupplierSingletonInstanceSingleton() {
         assertSame(supplier1, supplier2);
         assertSame(supplier2, supplier3);
     }
+
+    @Test
+    public void testSupplierBeanNamed() {
+        BindingTestHelper.bind(injectionManager, binder -> {
+            binder.bindFactory(TestSuppliers.TestSupplier.class).named(TestSuppliers.TEST).to(String.class);
+            binder.bindFactory(TestSuppliers.OtherTestSupplier.class).named(TestSuppliers.OTHER_TEST).to(String.class);
+            binder.bindAsContract(TestSuppliers.TargetSupplierBean.class);
+        });
+
+        TestSuppliers.TargetSupplierBean instance = injectionManager.getInstance(TestSuppliers.TargetSupplierBean.class);
+        assertEquals(TestSuppliers.OTHER_TEST, instance.obj);
+    }
+
+    @Test
+    public void testSupplierNamed() {
+        BindingTestHelper.bind(injectionManager, binder -> {
+            binder.bindFactory(TestSuppliers.TestSupplier.class).named(TestSuppliers.TEST).to(String.class);
+            binder.bindFactory(TestSuppliers.OtherTestSupplier.class).named(TestSuppliers.OTHER_TEST).to(String.class);
+            binder.bindAsContract(TestSuppliers.TargetSupplier.class);
+        });
+
+        TestSuppliers.TargetSupplier instance = injectionManager.getInstance(TestSuppliers.TargetSupplier.class);
+        assertEquals(TestSuppliers.OTHER_TEST, instance.supplier.get());
+    }
 }

inject/hk2/src/test/java/org/glassfish/jersey/inject/hk2/SupplierInstanceBindingTest.java

@@ -152,4 +152,28 @@ public void testSupplierSingletonInstanceSingleton() {
         assertSame(supplier1, supplier2);
         assertSame(supplier2, supplier3);
     }
+
+    @Test
+    public void testSupplierBeanNamed() {
+        BindingTestHelper.bind(injectionManager, binder -> {
+            binder.bindFactory(new TestSuppliers.TestSupplier()).named(TestSuppliers.TEST).to(String.class);
+            binder.bindFactory(new TestSuppliers.OtherTestSupplier()).named(TestSuppliers.OTHER_TEST).to(String.class);
+            binder.bindAsContract(TestSuppliers.TargetSupplierBean.class);
+        });
+
+        TestSuppliers.TargetSupplierBean instance = injectionManager.getInstance(TestSuppliers.TargetSupplierBean.class);
+        assertEquals(TestSuppliers.OTHER_TEST, instance.obj);
+    }
+
+    @Test
+    public void testSupplierNamed() {
+        BindingTestHelper.bind(injectionManager, binder -> {
+            binder.bindFactory(new TestSuppliers.TestSupplier()).named(TestSuppliers.TEST).to(String.class);
+            binder.bindFactory(new TestSuppliers.OtherTestSupplier()).named(TestSuppliers.OTHER_TEST).to(String.class);
+            binder.bindAsContract(TestSuppliers.TargetSupplier.class);
+        });
+
+        TestSuppliers.TargetSupplier instance = injectionManager.getInstance(TestSuppliers.TargetSupplier.class);
+        assertEquals(TestSuppliers.OTHER_TEST, instance.supplier.get());
+    }
 }

inject/hk2/src/test/java/org/glassfish/jersey/inject/hk2/TestSuppliers.java

@@ -0,0 +1,81 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package org.glassfish.jersey.inject.hk2;
+
+import java.util.function.Supplier;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ * Set of suppliers to inject.
+ */
+public class TestSuppliers {
+
+    static final String TEST = "Test";
+    static final String OTHER_TEST = "OtherTest";
+
+    public static class TargetSupplierBean {
+        @Inject
+        @Named(OTHER_TEST)
+        public String obj;
+    }
+
+    public static class TargetSupplier {
+        @Inject
+        @Named(OTHER_TEST)
+        public Supplier<String> supplier;
+    }
+
+    public static class TestSupplier implements Supplier<String> {
+        @Override
+        public String get() {
+            return TEST;
+        }
+    }
+
+    public static class OtherTestSupplier implements Supplier<String> {
+        @Override
+        public String get() {
+            return OTHER_TEST;
+        }
+    }
+}