Merge pull request #257 from graben/firstResource

Add NamedFirstXAResource for completeness of configuration. Remove obsolete unnamed implementations as resources are named by default.

Author: geoand

narayana-spring-boot-core/src/main/java/dev/snowdrop/boot/narayana/core/jms/PooledXAConnectionFactoryWrapper.java

@@ -61,8 +61,12 @@ public PooledXAConnectionFactoryWrapper(TransactionManager transactionManager, X
 
     @Override
     protected ConnectionFactory wrapConnectionFactoryInternal(XAConnectionFactory xaConnectionFactory) {
+        if (this.properties.isFirstResource() && this.properties.isLastResource()) {
+            throw new IllegalArgumentException("Setting both firstResource and lastResource is not allowed");
+        }
         JmsPoolNarayanaConnectionFactory pooledConnectionFactory = new JmsPoolNarayanaConnectionFactory();
         pooledConnectionFactory.setName(this.properties.getName());
+        pooledConnectionFactory.setFirstResource(this.properties.isFirstResource());
         pooledConnectionFactory.setLastResource(this.properties.isLastResource());
         pooledConnectionFactory.setTransactionManager(this.transactionManager);
         pooledConnectionFactory.setConnectionFactory(xaConnectionFactory);

narayana-spring-boot-core/src/main/java/dev/snowdrop/boot/narayana/core/jms/pool/JmsPoolNarayanaConnectionFactory.java

@@ -30,6 +30,7 @@ public class JmsPoolNarayanaConnectionFactory extends JmsPoolXAConnectionFactory
     private static final long serialVersionUID = 1709204966732828338L;
 
     private String name;
+    private boolean firstResource;
     private boolean lastResource;
 
     public String getName() {
@@ -40,6 +41,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public boolean isFirstResource() {
+        return this.firstResource;
+    }
+
+    public void setFirstResource(boolean firstResource) {
+        this.firstResource = firstResource;
+    }
+
     public boolean isLastResource() {
         return this.lastResource;
     }
@@ -50,11 +59,11 @@ public void setLastResource(boolean lastResource) {
 
     @Override
     protected PooledNarayanaConnection createPooledConnection(Connection connection) {
-        return new PooledNarayanaConnection(connection, getTransactionManager(), getName(), isLastResource());
+        return new PooledNarayanaConnection(connection, getTransactionManager(), getName(), isFirstResource(), isLastResource());
     }
 
     @Override
     protected JmsPoolXAJMSContext newPooledConnectionContext(JmsPoolConnection connection, int sessionMode) {
-        return new JmsPoolNarayanaJmsContext(connection, sessionMode, getName(), isLastResource());
+        return new JmsPoolNarayanaJmsContext(connection, sessionMode, getName(), isFirstResource(), isLastResource());
     }
 }

narayana-spring-boot-core/src/main/java/dev/snowdrop/boot/narayana/core/jms/pool/JmsPoolNarayanaJmsContext.java

@@ -24,25 +24,25 @@
 public class JmsPoolNarayanaJmsContext extends JmsPoolXAJMSContext {
 
     private final String name;
+    private final boolean firstResource;
     private final boolean lastResource;
 
-    public JmsPoolNarayanaJmsContext(JmsPoolConnection connection, int sessionMode, String name, boolean lastResource) {
+    public JmsPoolNarayanaJmsContext(JmsPoolConnection connection, int sessionMode, String name, boolean firstResource, boolean lastResource) {
         super(connection, sessionMode);
         this.name = name;
+        this.firstResource = firstResource;
         this.lastResource = lastResource;
     }
 
     @Override
     public XAResource getXAResource() {
         XAResource xares = super.getXAResource();
-        if (this.name != null) {
-            if (this.lastResource) {
-                xares = new NamedLastXAResource(xares, this.name);
-            } else {
-                xares = new NamedXAResource(xares, this.name);
-            }
+        if (this.firstResource) {
+            xares = new NamedFirstXAResource(xares, this.name);
         } else if (this.lastResource) {
-            xares = new LastXAResource(xares);
+            xares = new NamedLastXAResource(xares, this.name);
+        } else {
+            xares = new NamedXAResource(xares, this.name);
         }
         return xares;
     }

narayana-spring-boot-core/src/main/java/dev/snowdrop/boot/narayana/core/jms/pool/LastXAResource.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020 Red Hat, Inc, and individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.snowdrop.boot.narayana.core.jms.pool;
+
+import javax.transaction.xa.XAResource;
+
+import org.jboss.tm.FirstResource;
+
+public class NamedFirstXAResource extends NamedXAResource implements FirstResource {
+
+    public NamedFirstXAResource(XAResource xaResource, String name) {
+        super(xaResource, name);
+    }
+}

narayana-spring-boot-core/src/main/java/dev/snowdrop/boot/narayana/core/jms/pool/NamedFirstXAResource.java

@@ -21,6 +21,7 @@
 import org.jboss.tm.LastResource;
 
 public class NamedLastXAResource extends NamedXAResource implements LastResource {
+
     public NamedLastXAResource(XAResource xaResource, String name) {
         super(xaResource, name);
     }

narayana-spring-boot-core/src/main/java/dev/snowdrop/boot/narayana/core/jms/pool/NamedLastXAResource.java

@@ -28,25 +28,25 @@
 public class PooledNarayanaConnection extends PooledXAConnection {
 
     private final String name;
+    private final boolean firstResource;
     private final boolean lastResource;
 
-    public PooledNarayanaConnection(Connection connection, TransactionManager transactionManager, String name, boolean lastResource) {
+    public PooledNarayanaConnection(Connection connection, TransactionManager transactionManager, String name, boolean firstResource, boolean lastResource) {
         super(connection, transactionManager);
         this.name = name;
+        this.firstResource = firstResource;
         this.lastResource = lastResource;
     }
 
     @Override
     protected XAResource createXaResource(JmsPoolSession session) throws JMSException {
         XAResource xares = super.createXaResource(session);
-        if (this.name != null) {
-            if (this.lastResource) {
-                xares = new NamedLastXAResource(xares, this.name);
-            } else {
-                xares = new NamedXAResource(xares, this.name);
-            }
+        if (this.firstResource) {
+            xares = new NamedFirstXAResource(xares, this.name);
         } else if (this.lastResource) {
-            xares = new LastXAResource(xares);
+            xares = new NamedLastXAResource(xares, this.name);
+        } else {
+            xares = new NamedXAResource(xares, this.name);
         }
         return xares;
     }

narayana-spring-boot-core/src/main/java/dev/snowdrop/boot/narayana/core/jms/pool/PooledNarayanaConnection.java

@@ -22,6 +22,7 @@ public class MessagingHubConnectionFactoryProperties {
 
     private boolean enabled = false;
     private String name = "jms";
+    private boolean firstResource = false;
     private boolean lastResource = false;
     private int maxConnections = 1;
     private Duration connectionIdleTimeout = Duration.ofSeconds(30);
@@ -48,6 +49,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public boolean isFirstResource() {
+        return this.firstResource;
+    }
+
+    public void setFirstResource(boolean firstResource) {
+        this.firstResource = firstResource;
+    }
+
     public boolean isLastResource() {
         return this.lastResource;
     }

narayana-spring-boot-core/src/main/java/dev/snowdrop/boot/narayana/core/properties/MessagingHubConnectionFactoryProperties.java

@@ -31,6 +31,7 @@
 import dev.snowdrop.boot.narayana.core.properties.MessagingHubConnectionFactoryProperties;
 import dev.snowdrop.boot.narayana.core.properties.RecoveryCredentialsProperties;
 import org.jboss.narayana.jta.jms.JmsXAResourceRecoveryHelper;
+import org.jboss.tm.FirstResource;
 import org.jboss.tm.LastResource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -42,6 +43,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
@@ -95,6 +97,26 @@ void wrapWithCredentials() throws Exception {
         verify(this.mockRecoveryCredentialsProperties).getPassword();
     }
 
+    @Test
+    void wrapWithFirstResource() throws Exception {
+        given(this.spyMessagingHubConnectionFactoryProperties.isFirstResource()).willReturn(true);
+        given(this.mockRecoveryCredentialsProperties.isValid()).willReturn(false);
+        ConnectionFactory connectionFactory = this.wrapper.wrapConnectionFactory(this.mockXaConnectionFactory);
+
+        XAConnection mockXaConnection = mock(XAConnection.class);
+        given(this.mockXaConnectionFactory.createXAConnection()).willReturn(mockXaConnection);
+        given(mockXaConnection.getMetaData()).willReturn(mock(ConnectionMetaData.class));
+        try (Connection connection = connectionFactory.createConnection()) {
+            Transaction mockTransaction = mock(Transaction.class);
+            given(this.mockTransactionManager.getTransaction()).willReturn(mockTransaction);
+            ArgumentCaptor<XAResource> captorXaResource = ArgumentCaptor.captor();
+            given(mockTransaction.enlistResource(captorXaResource.capture())).willReturn(true);
+            try (Session ignored = connection.createSession()) {
+                assertThat(captorXaResource.getValue()).isInstanceOf(FirstResource.class);
+            }
+        }
+    }
+
     @Test
     void wrapWithLastResource() throws Exception {
         given(this.spyMessagingHubConnectionFactoryProperties.isLastResource()).willReturn(true);
@@ -114,4 +136,14 @@ void wrapWithLastResource() throws Exception {
             }
         }
     }
+
+    @Test
+    void invalidFirstLastResourceConfiguration() throws Exception {
+        given(this.spyMessagingHubConnectionFactoryProperties.isFirstResource()).willReturn(true);
+        given(this.spyMessagingHubConnectionFactoryProperties.isLastResource()).willReturn(true);
+        given(this.mockRecoveryCredentialsProperties.isValid()).willReturn(false);
+        assertThatThrownBy(() -> this.wrapper.wrapConnectionFactory(this.mockXaConnectionFactory))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Setting both firstResource and lastResource is not allowed");
+    }
 }