From 47e1724d0e8d2c8447112b8d88b516ac514fbb99 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 25 Jul 2015 21:29:57 +0200 Subject: [PATCH] Deprecate TxConfigAttributes alongside @TxConfig Since @TransactionConfiguration is now deprecated, this commit also deprecates TransactionConfigurationAttributes with the intention of completely removing TransactionConfigurationAttributes once @TransactionConfiguration has been removed. Issue: SPR-13277 --- .../transaction/TransactionConfigurationAttributes.java | 3 +++ .../transaction/TransactionalTestExecutionListener.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfigurationAttributes.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfigurationAttributes.java index 60dd05cad5..f172da4dfc 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfigurationAttributes.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfigurationAttributes.java @@ -27,7 +27,10 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 2.5 * @see TransactionConfiguration + * @deprecated As of Spring Framework 4.2, this class is officially deprecated + * and will be removed when {@code @TransactionConfiguration} is removed. */ +@Deprecated public class TransactionConfigurationAttributes { private final String transactionManagerName; diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java index 953d184b85..978dced76e 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java @@ -130,10 +130,12 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis private static final Log logger = LogFactory.getLog(TransactionalTestExecutionListener.class); + @SuppressWarnings("deprecation") private static final TransactionConfigurationAttributes defaultTxConfigAttributes = new TransactionConfigurationAttributes(); protected final TransactionAttributeSource attributeSource = new AnnotationTransactionAttributeSource(); + @SuppressWarnings("deprecation") private TransactionConfigurationAttributes configurationAttributes; @@ -343,6 +345,7 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis * @see #getTransactionManager(TestContext, String) */ protected PlatformTransactionManager getTransactionManager(TestContext testContext) { + @SuppressWarnings("deprecation") String tmName = retrieveConfigurationAttributes(testContext).getTransactionManagerName(); return TestContextTransactionUtils.retrieveTransactionManager(testContext, tmName); } @@ -358,6 +361,7 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis * @return the default rollback flag for the supplied test context * @throws Exception if an error occurs while determining the default rollback flag */ + @SuppressWarnings("deprecation") protected final boolean isDefaultRollback(TestContext testContext) throws Exception { Class testClass = testContext.getTestClass(); Rollback rollback = findAnnotation(testClass, Rollback.class);