From e26478e3de0c726b1e23db2e3c1076e8b7ca71c8 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 3 May 2016 20:26:11 +0200 Subject: [PATCH] Polish Javadoc regarding @Commit support --- .../test/context/transaction/TransactionConfiguration.java | 7 ++++--- .../transaction/TransactionalTestExecutionListener.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java index 98857e5a052..e35e862e3e3 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +40,9 @@ import java.lang.annotation.Target; * @see org.springframework.test.context.jdbc.SqlConfig * @see org.springframework.test.context.jdbc.SqlConfig#transactionManager * @see org.springframework.test.context.ContextConfiguration - * @deprecated As of Spring Framework 4.2, use {@code @Rollback} at the class - * level and the {@code transactionManager} qualifier in {@code @Transactional}. + * @deprecated As of Spring Framework 4.2, use {@code @Rollback} or + * {@code @Commit} at the class level and the {@code transactionManager} + * qualifier in {@code @Transactional}. */ @Deprecated @Documented 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 adb3cfa144e..356eb3d053e 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 @@ -364,7 +364,7 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis /** * Determine whether or not to rollback transactions by default for the * supplied {@linkplain TestContext test context}. - *

Supports {@link Rollback @Rollback} or + *

Supports {@link Rollback @Rollback}, {@link Commit @Commit}, or * {@link TransactionConfiguration @TransactionConfiguration} at the * class-level. * @param testContext the test context for which the default rollback flag