Merge pull request quarkusio#14351 from gwenneg/issue-14333-artemis-j…

…ms-npe

Produce Artemis JMS connection factory as a synthetic bean

extensions/artemis-jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java

@@ -1,11 +1,12 @@
 package io.quarkus.artemis.jms.deployment;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import javax.enterprise.context.ApplicationScoped;
+import javax.jms.ConnectionFactory;
+
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.artemis.core.deployment.ArtemisBuildTimeConfig;
 import io.quarkus.artemis.core.deployment.ArtemisJmsBuildItem;
 import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
-import io.quarkus.artemis.jms.runtime.ArtemisJmsProducer;
 import io.quarkus.artemis.jms.runtime.ArtemisJmsRecorder;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -18,12 +19,10 @@
 public class ArtemisJmsProcessor {
 
     @BuildStep
-    void load(BuildProducer<AdditionalBeanBuildItem> additionalBean, BuildProducer<FeatureBuildItem> feature,
-            BuildProducer<ArtemisJmsBuildItem> artemisJms) {
+    void load(BuildProducer<FeatureBuildItem> feature, BuildProducer<ArtemisJmsBuildItem> artemisJms) {
 
         artemisJms.produce(new ArtemisJmsBuildItem());
         feature.produce(new FeatureBuildItem(Feature.ARTEMIS_JMS));
-        additionalBean.produce(AdditionalBeanBuildItem.unremovableOf(ArtemisJmsProducer.class));
     }
 
     @BuildStep
@@ -36,9 +35,17 @@ HealthBuildItem health(ArtemisBuildTimeConfig buildConfig) {
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
     ArtemisJmsConfiguredBuildItem configure(ArtemisJmsRecorder recorder, ArtemisRuntimeConfig runtimeConfig,
-            BeanContainerBuildItem beanContainer) {
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeanProducer) {
+
+        SyntheticBeanBuildItem connectionFactory = SyntheticBeanBuildItem.configure(ConnectionFactory.class)
+                .supplier(recorder.getConnectionFactorySupplier(runtimeConfig))
+                .scope(ApplicationScoped.class)
+                .defaultBean()
+                .unremovable()
+                .setRuntimeInit()
+                .done();
+        syntheticBeanProducer.produce(connectionFactory);
 
-        recorder.setConfig(runtimeConfig, beanContainer.getValue());
         return new ArtemisJmsConfiguredBuildItem();
     }
 }

extensions/artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java

@@ -1,13 +1,23 @@
 package io.quarkus.artemis.jms.runtime;
 
-import io.quarkus.arc.runtime.BeanContainer;
+import java.util.function.Supplier;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+
 import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
 import io.quarkus.runtime.annotations.Recorder;
 
 @Recorder
 public class ArtemisJmsRecorder {
 
-    public void setConfig(ArtemisRuntimeConfig config, BeanContainer container) {
-        container.instance(ArtemisJmsProducer.class).setConfig(config);
+    public Supplier<ConnectionFactory> getConnectionFactorySupplier(ArtemisRuntimeConfig config) {
+        return new Supplier<ConnectionFactory>() {
+            @Override
+            public ConnectionFactory get() {
+                return new ActiveMQJMSConnectionFactory(config.url, config.username.orElse(null), config.password.orElse(null));
+            }
+        };
     }
 }