diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java index 230a48d3815..e5e59cdee57 100644 --- a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java +++ b/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java @@ -181,7 +181,7 @@ public class EnableTransactionManagementIntegrationTests { return new CallCountingTransactionManager(); } - public PlatformTransactionManager createTransactionManager() { + public PlatformTransactionManager annotationDrivenTransactionManager() { return txManager1(); } diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java index eca12ccb2eb..1c7676af56f 100644 --- a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java +++ b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java @@ -58,7 +58,7 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo } TransactionManagementConfigurer configurer = configurers.iterator().next(); - this.txManager = configurer.createTransactionManager(); + this.txManager = configurer.annotationDrivenTransactionManager(); } } diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java index 145db37d12e..7effb75a295 100644 --- a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java +++ b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java @@ -20,6 +20,6 @@ import org.springframework.transaction.PlatformTransactionManager; public interface TransactionManagementConfigurer { - PlatformTransactionManager createTransactionManager(); + PlatformTransactionManager annotationDrivenTransactionManager(); } diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java index 4f90653f158..f9727cc54c6 100644 --- a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java +++ b/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java @@ -127,7 +127,7 @@ public class EnableTransactionManagementTests { return new CallCountingTransactionManager(); } - public PlatformTransactionManager createTransactionManager() { + public PlatformTransactionManager annotationDrivenTransactionManager() { return txManager2(); } }