Merge pull request quarkusio#49992 from mkouba/mockable-event

Tests: support InjectMock for built-in Event

Author: manovotn

extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java

@@ -621,11 +621,12 @@ public void registerSubclass(DotName beanClassName, String subclassName) {
     @Consume(ResourcesGeneratedPhaseBuildItem.class)
     @Record(STATIC_INIT)
     public ArcContainerBuildItem initializeContainer(ArcConfig config, ArcRecorder recorder,
-            ShutdownContextBuildItem shutdown, Optional<CurrentContextFactoryBuildItem> currentContextFactory)
+            ShutdownContextBuildItem shutdown, Optional<CurrentContextFactoryBuildItem> currentContextFactory,
+            LaunchModeBuildItem launchMode)
             throws Exception {
         ArcContainer container = recorder.initContainer(shutdown,
                 currentContextFactory.isPresent() ? currentContextFactory.get().getFactory() : null,
-                config.strictCompatibility());
+                config.strictCompatibility(), launchMode.isTest());
         return new ArcContainerBuildItem(container);
     }
 

extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcRecorder.java

@@ -45,10 +45,11 @@ public class ArcRecorder {
     public static volatile Map<String, Supplier<ActiveResult>> syntheticBeanCheckActive;
 
     public ArcContainer initContainer(ShutdownContext shutdown, RuntimeValue<CurrentContextFactory> currentContextFactory,
-            boolean strictCompatibility) throws Exception {
-        ArcInitConfig.Builder builder = ArcInitConfig.builder();
-        builder.setCurrentContextFactory(currentContextFactory != null ? currentContextFactory.getValue() : null);
-        builder.setStrictCompatibility(strictCompatibility);
+            boolean strictCompatibility, boolean testMode) throws Exception {
+        ArcInitConfig.Builder builder = ArcInitConfig.builder()
+                .setCurrentContextFactory(currentContextFactory != null ? currentContextFactory.getValue() : null)
+                .setStrictCompatibility(strictCompatibility)
+                .setTestMode(testMode);
         ArcContainer container = Arc.initialize(builder.build());
         shutdown.addShutdownTask(new Runnable() {
             @Override

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java

@@ -106,7 +106,7 @@ static List<InjectionPointInfo> fromMethod(MethodInfo method, ClassInfo beanClas
         return injectionPoints;
     }
 
-    static InjectionPointInfo fromSyntheticInjectionPoint(TypeAndQualifiers typeAndQualifiers) {
+    public static InjectionPointInfo fromSyntheticInjectionPoint(TypeAndQualifiers typeAndQualifiers) {
         return new InjectionPointInfo(typeAndQualifiers, InjectionPointKind.CDI, null, null, false, false);
     }
 

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Arc.java

@@ -35,7 +35,8 @@ public static ArcContainer initialize(ArcInitConfig config) {
                 container = INSTANCE.get();
                 if (container == null) {
                     // Set the container instance first because Arc.container() can be used within ArcContainerImpl.init()
-                    container = new ArcContainerImpl(config.getCurrentContextFactory(), config.isStrictCompatibility());
+                    container = new ArcContainerImpl(config.getCurrentContextFactory(), config.isStrictCompatibility(),
+                            config.isTestMode());
                     INSTANCE.set(container);
                     container.init();
                 }

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInitConfig.java

@@ -24,10 +24,12 @@ public static Builder builder() {
     private ArcInitConfig(Builder builder) {
         this.currentContextFactory = builder.currentContextFactory;
         this.strictCompatibility = builder.strictCompatibility;
+        this.testMode = builder.testMode;
     }
 
     private final boolean strictCompatibility;
     private final CurrentContextFactory currentContextFactory;
+    private final boolean testMode;
 
     public boolean isStrictCompatibility() {
         return strictCompatibility;
@@ -37,14 +39,17 @@ public CurrentContextFactory getCurrentContextFactory() {
         return currentContextFactory;
     }
 
+    public boolean isTestMode() {
+        return testMode;
+    }
+
     public static class Builder {
+
         private boolean strictCompatibility;
         private CurrentContextFactory currentContextFactory;
+        private boolean testMode;
 
         private Builder() {
-            // init all values with their defaults
-            this.strictCompatibility = false;
-            this.currentContextFactory = null;
         }
 
         public Builder setStrictCompatibility(boolean strictCompatibility) {
@@ -57,6 +62,11 @@ public Builder setCurrentContextFactory(CurrentContextFactory currentContextFact
             return this;
         }
 
+        public Builder setTestMode(boolean testMode) {
+            this.testMode = testMode;
+            return this;
+        }
+
         public ArcInitConfig build() {
             return new ArcInitConfig(this);
         }

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java

@@ -19,10 +19,13 @@
 import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -105,7 +108,10 @@ public class ArcContainerImpl implements ArcContainer {
 
     private final boolean strictMode;
 
-    public ArcContainerImpl(CurrentContextFactory currentContextFactory, boolean strictMode) {
+    // An event mock reference is shared by identical injection points
+    private final ConcurrentMap<TypeAndQualifiers, AtomicReference<Event<?>>> eventMocks;
+
+    public ArcContainerImpl(CurrentContextFactory currentContextFactory, boolean strictMode, boolean testMode) {
         this.strictMode = strictMode;
         id = String.valueOf(ID_GENERATOR.incrementAndGet());
         running = new AtomicBoolean(true);
@@ -123,6 +129,7 @@ public ArcContainerImpl(CurrentContextFactory currentContextFactory, boolean str
         Supplier<ContextInstances> requestContextInstances = null;
         this.currentContextFactory = currentContextFactory == null ? new ThreadLocalCurrentContextFactory()
                 : currentContextFactory;
+        this.eventMocks = testMode ? new ConcurrentHashMap<>() : null;
 
         List<Components> components = new ArrayList<>();
         for (ComponentsProvider componentsProvider : ServiceLoader.load(ComponentsProvider.class)) {
@@ -331,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
@@ -397,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
@@ -480,6 +487,9 @@ public synchronized void shutdown() {
             resolved.clear();
             running.set(false);
             InterceptedStaticMethods.clear();
+            if (eventMocks != null) {
+                eventMocks.clear();
+            }
 
             LOGGER.debugf("ArC DI container shut down");
         }
@@ -542,16 +552,16 @@ 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);
+        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);
@@ -563,14 +573,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);
                 }
             }
@@ -579,10 +589,6 @@ 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) {
@@ -1042,6 +1048,21 @@ public static ArcContainerImpl instance() {
         return unwrap(Arc.container());
     }
 
+    <T> EventImpl<T> getEvent(Type eventType, Set<Annotation> eventQualifiers, InjectionPoint ip) {
+        if (eventMocks != null) {
+            AtomicReference<Event<?>> mock = eventMocks.computeIfAbsent(
+                    new TypeAndQualifiers(ip.getType(), ip.getQualifiers()),
+                    ArcContainerImpl::newEventMockReference);
+            return new MockableEventImpl<>(eventType, eventQualifiers, ip, mock);
+        } else {
+            return new EventImpl<>(eventType, eventQualifiers, ip);
+        }
+    }
+
+    private static AtomicReference<Event<?>> newEventMockReference(TypeAndQualifiers typeAndQualifiers) {
+        return new AtomicReference<>();
+    }
+
     private static final class Resolvable {
 
         private static final Annotation[] ANY_QUALIFIER = { Any.Literal.INSTANCE };
@@ -1096,4 +1117,7 @@ public boolean equals(Object obj) {
         }
 
     }
+
+    private record TypeAndQualifiers(Type requiredType, Set<Annotation> qualifiers) {
+    }
 }

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);
             }

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;
         }
     };
 

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java

@@ -20,7 +20,7 @@ public Set<Type> getTypes() {
     public Event<?> get(CreationalContext<Event<?>> creationalContext) {
         // Obtain current IP to get the required type and qualifiers
         InjectionPoint ip = InjectionPointProvider.getCurrent(creationalContext);
-        return new EventImpl<>(ip.getType(), ip.getQualifiers(), ip);
+        return ArcContainerImpl.instance().getEvent(ip.getType(), ip.getQualifiers(), ip);
     }
 
     @Override

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java

@@ -28,7 +28,7 @@ public EventProvider(Type eventType, Set<Annotation> eventQualifiers, InjectionP
 
     @Override
     public Event<T> get(CreationalContext<Event<T>> creationalContext) {
-        return new EventImpl<>(eventType, eventQualifiers, injectionPoint);
+        return ArcContainerImpl.instance().getEvent(eventType, eventQualifiers, injectionPoint);
     }
 
 }