Resolve and call TransactionManagerCustomizers as late as possible.

narayana-spring-boot-core/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>4.0.0.Beta1</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-core</artifactId>

narayana-spring-boot-samples/narayana-spring-boot-sample-2ds/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-samples</artifactId>
-    <version>4.0.0.Beta1</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-sample-2ds</artifactId>

narayana-spring-boot-samples/narayana-spring-boot-sample-2pc/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-samples</artifactId>
-    <version>4.0.0.Beta1</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-sample-2pc</artifactId>

narayana-spring-boot-samples/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>4.0.0.Beta1</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-samples</artifactId>

narayana-spring-boot-starter-it/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>4.0.0.Beta1</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-starter-it</artifactId>

narayana-spring-boot-starter/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>4.0.0.Beta1</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-starter</artifactId>

narayana-spring-boot-starter/src/main/java/dev/snowdrop/boot/narayana/autoconfigure/NarayanaAutoConfiguration.java

@@ -70,12 +70,6 @@
 @ConditionalOnMissingBean(PlatformTransactionManager.class)
 public class NarayanaAutoConfiguration {
 
-    private final TransactionManagerCustomizers transactionManagerCustomizers;
-
-    public NarayanaAutoConfiguration(ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) {
-        this.transactionManagerCustomizers = transactionManagerCustomizers.getIfAvailable();
-    }
-
     @Bean
     @ConditionalOnMissingBean
     public static NarayanaBeanFactoryPostProcessor narayanaBeanFactoryPostProcessor() {
@@ -114,12 +108,11 @@ public TransactionSynchronizationRegistry narayanaTransactionSynchronizationRegi
     @ConditionalOnMissingBean
     public JtaTransactionManager transactionManager(UserTransaction userTransaction,
             TransactionManager transactionManager,
-            TransactionSynchronizationRegistry transactionSynchronizationRegistry) {
+            TransactionSynchronizationRegistry transactionSynchronizationRegistry,
+            ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) {
         JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(userTransaction, transactionManager);
         jtaTransactionManager.setTransactionSynchronizationRegistry(transactionSynchronizationRegistry);
-        if (this.transactionManagerCustomizers != null) {
-            this.transactionManagerCustomizers.customize(jtaTransactionManager);
-        }
+        transactionManagerCustomizers.ifAvailable(customizer -> customizer.customize(jtaTransactionManager));
         return jtaTransactionManager;
     }
 

narayana-spring-boot-starter/src/test/java/dev/snowdrop/boot/narayana/autoconfigure/NarayanaAutoConfigurationTest.java

@@ -17,6 +17,7 @@
 package dev.snowdrop.boot.narayana.autoconfigure;
 
 import java.io.File;
+import java.util.stream.Stream;
 
 import jakarta.transaction.TransactionManager;
 import jakarta.transaction.TransactionSynchronizationRegistry;
@@ -27,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.system.ApplicationHome;
@@ -36,6 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -45,7 +48,7 @@
 @ExtendWith(MockitoExtension.class)
 class NarayanaAutoConfigurationTest {
 
-    @Mock
+    @Spy
     private ObjectProvider<TransactionManagerCustomizers> mockTransactionManagerCustomizersProvider;
 
     @Mock
@@ -67,7 +70,7 @@ class NarayanaAutoConfigurationTest {
 
     @BeforeEach
     void before() {
-        this.configuration = new NarayanaAutoConfiguration(this.mockTransactionManagerCustomizersProvider);
+        this.configuration = new NarayanaAutoConfiguration();
     }
 
     @Test
@@ -86,22 +89,14 @@ void narayanaPropertiesInitializerShouldUseDefaultLogDir() {
     }
 
     @Test
-    void jtaTransactionManagerShouldBeCreated() {
+    void jtaTransactionManagerShouldBeCreatedAndCustomized() {
+        doReturn(Stream.of(this.mockTransactionManagerCustomizers)).when(this.mockTransactionManagerCustomizersProvider).stream();
         JtaTransactionManager jtaTransactionManager = this.configuration.transactionManager(
-                this.mockUserTransaction, this.mockTransactionManager, this.mockTransactionSynchronizationRegistry);
+                this.mockUserTransaction, this.mockTransactionManager, this.mockTransactionSynchronizationRegistry, this.mockTransactionManagerCustomizersProvider);
         assertThat(jtaTransactionManager.getUserTransaction()).isEqualTo(this.mockUserTransaction);
         assertThat(jtaTransactionManager.getTransactionManager()).isEqualTo(this.mockTransactionManager);
         assertThat(jtaTransactionManager.getTransactionSynchronizationRegistry())
                 .isEqualTo(this.mockTransactionSynchronizationRegistry);
-    }
-
-    @Test
-    void jtaTransactionManagerShouldBeCustomized() {
-        given(this.mockTransactionManagerCustomizersProvider.getIfAvailable()).willReturn(
-                this.mockTransactionManagerCustomizers);
-        this.configuration = new NarayanaAutoConfiguration(this.mockTransactionManagerCustomizersProvider);
-        JtaTransactionManager jtaTransactionManager = this.configuration.transactionManager(
-                this.mockUserTransaction, this.mockTransactionManager, this.mockTransactionSynchronizationRegistry);
         verify(this.mockTransactionManagerCustomizers).customize(jtaTransactionManager);
     }
 }

openshift/recovery-controller/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>4.0.0.Beta1</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

pom.xml

@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>dev.snowdrop</groupId>
   <artifactId>narayana-spring-boot-parent</artifactId>
-  <version>4.0.0.Beta1</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Narayana Spring Boot :: parent</name>