ArcContainer#instance(): use minimal injection point instead of EMPTY

mkouba · mkouba · commit 7b134ce21775 · 2025-09-11T16:05:18.000+02:00
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java
@@ -338,18 +338,18 @@ public <T> Supplier<InstanceHandle<T>> beanInstanceSupplier(Class<T> type, Annot
         if (bean == null) {
             return null;
         }
+        InjectionPoint injectionPoint = InjectionPointImpl.of(type, qualifiers);
         return new Supplier<InstanceHandle<T>>() {
             @Override
             public InstanceHandle<T> get() {
-                return beanInstanceHandle(bean, null);
+                return beanInstanceHandle(bean, null, injectionPoint, null);
             }
         };
     }
 
     @Override
     public <T> InstanceHandle<T> instance(InjectableBean<T> bean) {
-        Objects.requireNonNull(bean);
-        return beanInstanceHandle(bean, null);
+        return beanInstanceHandle(Objects.requireNonNull(bean), null, InjectionPointImpl.EMPTY, null);
     }
 
     @Override
@@ -404,7 +404,7 @@ public <T> InstanceHandle<T> instance(String name) {
         Set<InjectableBean<?>> resolvedBeans = beansByName.getValue(name);
         return resolvedBeans.size() != 1 ? EagerInstanceHandle.unavailable()
                 : (InstanceHandle<T>) beanInstanceHandle(resolvedBeans.iterator()
-                        .next(), null);
+                        .next(), null, InjectionPointImpl.EMPTY, null);
     }
 
     @Override
@@ -552,16 +552,21 @@ private static void addBuiltInBeans(List<InjectableBean<?>> beans, Map<String, L
     }
 
     private <T> InstanceHandle<T> instanceHandle(Type type, Annotation... qualifiers) {
-        return beanInstanceHandle(getBean(type, qualifiers), null);
+        if (qualifiers == null || qualifiers.length == 0) {
+            qualifiers = new Annotation[] { Default.Literal.INSTANCE };
+        } else {
+            registeredQualifiers.verify(qualifiers);
+        }
+        return beanInstanceHandle(getBean(type, qualifiers), null, InjectionPointImpl.of(type, qualifiers), null);
     }
 
     static <T> InstanceHandle<T> beanInstanceHandle(InjectableBean<T> bean, CreationalContextImpl<T> parentContext,
-            boolean resetCurrentInjectionPoint, Consumer<T> destroyLogic) {
-        return beanInstanceHandle(bean, parentContext, resetCurrentInjectionPoint, destroyLogic, false);
+            InjectionPoint resetInjectionPoint, Consumer<T> destroyLogic) {
+        return beanInstanceHandle(bean, parentContext, resetInjectionPoint, destroyLogic, false);
     }
 
     static <T> InstanceHandle<T> beanInstanceHandle(InjectableBean<T> bean, CreationalContextImpl<T> parentContext,
-            boolean resetCurrentInjectionPoint, Consumer<T> destroyLogic, boolean useParentCreationalContextDirectly) {
+            InjectionPoint resetInjectionPoint, Consumer<T> destroyLogic, boolean useParentCreationalContextDirectly) {
         if (bean != null) {
             if (parentContext == null && Dependent.class.equals(bean.getScope())) {
                 parentContext = new CreationalContextImpl<>(null);
@@ -573,14 +578,14 @@ static <T> InstanceHandle<T> beanInstanceHandle(InjectableBean<T> bean, Creation
                 creationalContext = new CreationalContextImpl<>(bean);
             }
             InjectionPoint prev = null;
-            if (resetCurrentInjectionPoint) {
-                prev = InjectionPointProvider.setCurrent(creationalContext, CurrentInjectionPointProvider.EMPTY);
+            if (resetInjectionPoint != null) {
+                prev = InjectionPointProvider.setCurrent(creationalContext, resetInjectionPoint);
             }
             try {
                 return new EagerInstanceHandle<>(bean, bean.get(creationalContext), creationalContext, parentContext,
                         destroyLogic);
             } finally {
-                if (resetCurrentInjectionPoint) {
+                if (resetInjectionPoint != null) {
                     InjectionPointProvider.setCurrent(creationalContext, prev);
                 }
             }
@@ -589,17 +594,8 @@ static <T> InstanceHandle<T> beanInstanceHandle(InjectableBean<T> bean, Creation
         }
     }
 
-    static <T> InstanceHandle<T> beanInstanceHandle(InjectableBean<T> bean, CreationalContextImpl<T> parentContext) {
-        return beanInstanceHandle(bean, parentContext, true, null);
-    }
-
     @SuppressWarnings("unchecked")
     private <T> InjectableBean<T> getBean(Type requiredType, Annotation... qualifiers) {
-        if (qualifiers == null || qualifiers.length == 0) {
-            qualifiers = new Annotation[] { Default.Literal.INSTANCE };
-        } else {
-            registeredQualifiers.verify(qualifiers);
-        }
         Resolvable resolvable = new Resolvable(requiredType, qualifiers);
         Set<InjectableBean<?>> resolvedBeans = resolved.getValue(resolvable);
         if (resolvedBeans.isEmpty()) {
@@ -1055,7 +1051,7 @@ public static ArcContainerImpl instance() {
     <T> EventImpl<T> getEvent(Type eventType, Set<Annotation> eventQualifiers, InjectionPoint ip) {
         if (eventMocks != null) {
             AtomicReference<Event<?>> mock = eventMocks.computeIfAbsent(
-                    new TypeAndQualifiers(eventType, eventQualifiers),
+                    new TypeAndQualifiers(ip.getType(), ip.getQualifiers()),
                     ArcContainerImpl::newEventMockReference);
             return new MockableEventImpl<>(eventType, eventQualifiers, ip, mock);
         } else {
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java
@@ -69,7 +69,7 @@ public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> ctx
             InjectionPoint prev = InjectionPointProvider.setCurrent(ctx, null);
             try {
                 return ArcContainerImpl.beanInstanceHandle((InjectableBean) bean, (CreationalContextImpl) ctx,
-                        false, null, true).get();
+                        null, null, true).get();
             } finally {
                 InjectionPointProvider.setCurrent(ctx, prev);
             }
@@ -93,7 +93,7 @@ public Object getInjectableReference(InjectionPoint ij, CreationalContext<?> ctx
             InjectionPoint prev = InjectionPointProvider.setCurrent(ctx, ij);
             try {
                 return ArcContainerImpl.beanInstanceHandle(bean, (CreationalContextImpl) ctx,
-                        false, null, true).get();
+                        null, null, true).get();
             } finally {
                 InjectionPointProvider.setCurrent(ctx, prev);
             }
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java
@@ -3,7 +3,6 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.lang.reflect.Type;
-import java.util.Collections;
 import java.util.Set;
 import java.util.function.Supplier;
 
@@ -18,14 +17,11 @@
  */
 public class CurrentInjectionPointProvider<T> implements InjectableReferenceProvider<T> {
 
-    static final InjectionPoint EMPTY = new InjectionPointImpl(Object.class, Object.class, Collections.emptySet(), null, null,
-            null, -1, false);
-
     static final Supplier<InjectionPoint> EMPTY_SUPPLIER = new Supplier<InjectionPoint>() {
 
         @Override
         public InjectionPoint get() {
-            return CurrentInjectionPointProvider.EMPTY;
+            return InjectionPointImpl.EMPTY;
         }
     };
 
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointImpl.java
@@ -8,6 +8,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -26,6 +27,18 @@
 
 public class InjectionPointImpl implements InjectionPoint {
 
+    static final InjectionPoint EMPTY = new InjectionPointImpl(Object.class, Object.class, Collections.emptySet(), null, null,
+            null, -1, false);
+
+    /**
+     * @param requiredType
+     * @param qualifiers
+     * @return a new injection point with the given required type and qualifiers
+     */
+    public static InjectionPointImpl of(Type requiredType, Annotation... qualifiers) {
+        return new InjectionPointImpl(null, requiredType, Set.of(qualifiers), null, Set.of(), null, 0, false);
+    }
+
     private final Type requiredType;
     private final Set<Annotation> qualifiers;
     private final InjectableBean<?> bean;
@@ -37,7 +50,7 @@ public InjectionPointImpl(Type injectionPointType, Type requiredType, Set<Annota
             InjectableBean<?> bean, Set<Annotation> annotations, Member javaMember,
             int position, boolean isTransient) {
         this.requiredType = requiredType;
-        this.qualifiers = CollectionHelpers.toImmutableSmallSet(qualifiers);
+        this.qualifiers = qualifiers != null ? Set.copyOf(qualifiers) : null;
         this.bean = bean;
         if (javaMember instanceof Executable) {
             this.annotated = new InjectionPointImpl.AnnotatedParameterImpl<>(injectionPointType, annotations, position,
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injectionpoint/InjectionPointMetadataWithDynamicLookupTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injectionpoint/InjectionPointMetadataWithDynamicLookupTest.java
@@ -32,12 +32,13 @@ public class InjectionPointMetadataWithDynamicLookupTest {
     @Test
     public void arcContainerInstance() {
         // the "current" injection point of `Arc.container().instance(...)` doesn't seem to be well defined
+        // but the injection point used does support the required type and qualifiers
         BeanWithInjectionPointMetadata bean = Arc.container().instance(BeanWithInjectionPointMetadata.class).get();
 
         // this is probably an implementation artifact, not an intentional choice
         bean.assertPresent(ip -> {
-            assertEquals(Object.class, ip.getType());
-            assertEquals(Set.of(), ip.getQualifiers());
+            assertEquals(BeanWithInjectionPointMetadata.class, ip.getType());
+            assertEquals(1, ip.getQualifiers().size()); // @Default
             assertNull(ip.getMember());
             assertNull(ip.getBean());
         });
