When XA support is requested, return a ActiveMQXAConnectionFactory

quarkiverse · Jan 31, 2024 · 32b94d5 · 32b94d5
1 parent 6117bca
commit 32b94d5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java b/jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java
@@ -10,6 +10,7 @@
 import jakarta.jms.XAConnectionFactory;
 
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory;
 
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.artemis.core.deployment.ArtemisBootstrappedBuildItem;
@@ -108,7 +109,8 @@ private static SyntheticBeanBuildItem toSyntheticBeanBuildItem(
     private static SyntheticBeanBuildItem.ExtendedBeanConfigurator initializeConfigurator(boolean isXaEnable) {
         SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator;
         if (isXaEnable) {
-            configurator = SyntheticBeanBuildItem.configure(ActiveMQConnectionFactory.class);
+            configurator = SyntheticBeanBuildItem.configure(ActiveMQXAConnectionFactory.class);
+            configurator.addType(ActiveMQConnectionFactory.class);
             /*
              * Since {@link ActiveMQConnectionFactory} implements both {@link ConnectionFactory} and
              * {@link XAConnectionFactory},

diff --git a/jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java b/jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java
@@ -7,6 +7,7 @@
 import jakarta.jms.ConnectionFactory;
 
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory;
 
 import io.quarkus.artemis.core.runtime.ArtemisBuildTimeConfig;
 import io.quarkus.artemis.core.runtime.ArtemisBuildTimeConfigs;
@@ -30,18 +31,26 @@ public Supplier<ConnectionFactory> getConnectionFactoryProducer(
         ArtemisRuntimeConfig runtimeConfig = runtimeConfigs.configs().get(name);
         ArtemisBuildTimeConfig buildTimeConfig = buildTimeConfigs.configs().get(name);
         ArtemisUtil.validateIntegrity(name, runtimeConfig, buildTimeConfig);
-        final ConnectionFactory connectionFactory = Objects.requireNonNull(extractConnectionFactory(runtimeConfig, wrapper));
+        final ConnectionFactory connectionFactory = Objects
+                .requireNonNull(extractConnectionFactory(buildTimeConfig.isXaEnabled(), runtimeConfig, wrapper));
         return () -> connectionFactory;
     }
 
-    private ConnectionFactory extractConnectionFactory(ArtemisRuntimeConfig runtimeConfig,
+    private ConnectionFactory extractConnectionFactory(boolean isXAenabled, ArtemisRuntimeConfig runtimeConfig,
             Function<ConnectionFactory, Object> wrapper) {
         String url = runtimeConfig.getUrl();
         if (url != null) {
-            return (ConnectionFactory) wrapper.apply(new ActiveMQConnectionFactory(
-                    url,
-                    runtimeConfig.getUsername(),
-                    runtimeConfig.getPassword()));
+            if (isXAenabled) {
+                return (ConnectionFactory) wrapper.apply(new ActiveMQXAConnectionFactory(
+                        url,
+                        runtimeConfig.getUsername(),
+                        runtimeConfig.getPassword()));
+            } else {
+                return (ConnectionFactory) wrapper.apply(new ActiveMQConnectionFactory(
+                        url,
+                        runtimeConfig.getUsername(),
+                        runtimeConfig.getPassword()));
+            }
         } else {
             return null;
         }