Browse Source

Rename TransactionManagementConfigurer callback

Renamed TransactionManagementConfigurer#createTransactionManager()
to #annotationDrivenTransactionManager() to better reflect the fact
that the implemented method is optionally eligible for @Bean annotation.

See Javadoc for details.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4409 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/merge
Chris Beams 15 years ago
parent
commit
28520fd5db
  1. 2
      org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
  2. 2
      org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
  3. 2
      org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
  4. 2
      org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java

2
org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java

@ -181,7 +181,7 @@ public class EnableTransactionManagementIntegrationTests { @@ -181,7 +181,7 @@ public class EnableTransactionManagementIntegrationTests {
return new CallCountingTransactionManager();
}
public PlatformTransactionManager createTransactionManager() {
public PlatformTransactionManager annotationDrivenTransactionManager() {
return txManager1();
}

2
org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java

@ -58,7 +58,7 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo @@ -58,7 +58,7 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo
}
TransactionManagementConfigurer configurer = configurers.iterator().next();
this.txManager = configurer.createTransactionManager();
this.txManager = configurer.annotationDrivenTransactionManager();
}
}

2
org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java

@ -20,6 +20,6 @@ import org.springframework.transaction.PlatformTransactionManager; @@ -20,6 +20,6 @@ import org.springframework.transaction.PlatformTransactionManager;
public interface TransactionManagementConfigurer {
PlatformTransactionManager createTransactionManager();
PlatformTransactionManager annotationDrivenTransactionManager();
}

2
org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java

@ -127,7 +127,7 @@ public class EnableTransactionManagementTests { @@ -127,7 +127,7 @@ public class EnableTransactionManagementTests {
return new CallCountingTransactionManager();
}
public PlatformTransactionManager createTransactionManager() {
public PlatformTransactionManager annotationDrivenTransactionManager() {
return txManager2();
}
}

Loading…
Cancel
Save