Restore TransactionOperations Kotlin API compatibilty

sdeleuze · sdeleuze · commit b24ac741063e · 2019-09-29T19:31:12.000+02:00
This commit renames the Runnable variant to executeWithoutResult and uses a Consumer<TransactionStatus> parameter for better consistency with TransactionCallbackWithoutResult. Closes spring-projectsgh-23724
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
@@ -83,22 +83,22 @@ public void testCustomCacheManager() {
 
 	@Test
 	public void testEvictWithTransaction() {
-		txTemplate.execute(() -> testEvict(this.cs, false));
+		txTemplate.executeWithoutResult(s -> testEvict(this.cs, false));
 	}
 
 	@Test
 	public void testEvictEarlyWithTransaction() {
-		txTemplate.execute(() -> testEvictEarly(this.cs));
+		txTemplate.executeWithoutResult(s -> testEvictEarly(this.cs));
 	}
 
 	@Test
 	public void testEvictAllWithTransaction() {
-		txTemplate.execute(() -> testEvictAll(this.cs, false));
+		txTemplate.executeWithoutResult(s -> testEvictAll(this.cs, false));
 	}
 
 	@Test
 	public void testEvictAllEarlyWithTransaction() {
-		txTemplate.execute(() -> testEvictAllEarly(this.cs));
+		txTemplate.executeWithoutResult(s -> testEvictAllEarly(this.cs));
 	}
 
 
diff --git a/spring-context-support/src/test/java/org/springframework/cache/transaction/TransactionAwareCacheDecoratorTests.java b/spring-context-support/src/test/java/org/springframework/cache/transaction/TransactionAwareCacheDecoratorTests.java
@@ -79,7 +79,7 @@ public void putTransactional() {
 		Cache cache = new TransactionAwareCacheDecorator(target);
 		Object key = new Object();
 
-		txTemplate.execute(() -> {
+		txTemplate.executeWithoutResult(s -> {
 			cache.put(key, "123");
 			assertThat(target.get(key)).isNull();
 		});
@@ -106,7 +106,7 @@ public void putIfAbsentTransactional() {  // no transactional support for putIfA
 		Cache cache = new TransactionAwareCacheDecorator(target);
 		Object key = new Object();
 
-		txTemplate.execute(() -> {
+		txTemplate.executeWithoutResult(s -> {
 			assertThat(cache.putIfAbsent(key, "123")).isNull();
 			assertThat(target.get(key, String.class)).isEqualTo("123");
 			assertThat(cache.putIfAbsent(key, "456").get()).isEqualTo("123");
@@ -135,7 +135,7 @@ public void evictTransactional() {
 		Object key = new Object();
 		cache.put(key, "123");
 
-		txTemplate.execute(() -> {
+		txTemplate.executeWithoutResult(s -> {
 			cache.evict(key);
 			assertThat(target.get(key, String.class)).isEqualTo("123");
 		});
@@ -161,7 +161,7 @@ public void evictIfPresentTransactional() {  // no transactional support for evi
 		Object key = new Object();
 		cache.put(key, "123");
 
-		txTemplate.execute(() -> {
+		txTemplate.executeWithoutResult(s -> {
 			cache.evictIfPresent(key);
 			assertThat(target.get(key)).isNull();
 		});
@@ -187,7 +187,7 @@ public void clearTransactional() {
 		Object key = new Object();
 		cache.put(key, "123");
 
-		txTemplate.execute(() -> {
+		txTemplate.executeWithoutResult(s -> {
 			cache.clear();
 			assertThat(target.get(key, String.class)).isEqualTo("123");
 		});
@@ -213,7 +213,7 @@ public void invalidateTransactional() {  // no transactional support for invalid
 		Object key = new Object();
 		cache.put(key, "123");
 
-		txTemplate.execute(() -> {
+		txTemplate.executeWithoutResult(s -> {
 			cache.invalidate();
 			assertThat(target.get(key)).isNull();
 		});
diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java
@@ -260,7 +260,7 @@ private void executeSqlScripts(
 					TransactionDefinition.PROPAGATION_REQUIRED);
 			TransactionAttribute txAttr = TestContextTransactionUtils.createDelegatingTransactionAttribute(
 					testContext, new DefaultTransactionAttribute(propagation));
-			new TransactionTemplate(txMgr, txAttr).execute(() -> populator.execute(finalDataSource));
+			new TransactionTemplate(txMgr, txAttr).executeWithoutResult(s -> populator.execute(finalDataSource));
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
@@ -16,8 +16,11 @@
 
 package org.springframework.transaction.support;
 
+import java.util.function.Consumer;
+
 import org.springframework.lang.Nullable;
 import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
 
 /**
  * Interface specifying basic transaction execution operations.
@@ -40,6 +43,7 @@ public interface TransactionOperations {
 	 * @return a result object returned by the callback, or {@code null} if none
 	 * @throws TransactionException in case of initialization, rollback, or system errors
 	 * @throws RuntimeException if thrown by the TransactionCallback
+	 * @see #executeWithoutResult(Consumer)
 	 */
 	@Nullable
 	<T> T execute(TransactionCallback<T> action) throws TransactionException;
@@ -59,9 +63,9 @@ public interface TransactionOperations {
 	 * @see #execute(TransactionCallback)
 	 * @see TransactionCallbackWithoutResult
 	 */
-	default void execute(Runnable action) throws TransactionException {
+	default void executeWithoutResult(Consumer<TransactionStatus> action) throws TransactionException {
 		execute(status -> {
-			action.run();
+			action.accept(status);
 			return null;
 		});
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/WithoutTransactionOperations.java b/spring-tx/src/main/java/org/springframework/transaction/support/WithoutTransactionOperations.java
@@ -16,8 +16,11 @@
 
 package org.springframework.transaction.support;
 
+import java.util.function.Consumer;
+
 import org.springframework.lang.Nullable;
 import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
 
 /**
  * A {@link TransactionOperations} implementation which executes a given
@@ -43,8 +46,8 @@ public <T> T execute(TransactionCallback<T> action) throws TransactionException
 	}
 
 	@Override
-	public void execute(Runnable action) throws TransactionException {
-		action.run();
+	public void executeWithoutResult(Consumer<TransactionStatus> action) throws TransactionException {
+		action.accept(new SimpleTransactionStatus(false));
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -83,22 +83,22 @@ public void testCustomCacheManager() {`
`83`	`83`
`84`	`84`	`@Test`
`85`	`85`	`public void testEvictWithTransaction() {`
`86`		`- txTemplate.execute(() -> testEvict(this.cs, false));`
	`86`	`+ txTemplate.executeWithoutResult(s -> testEvict(this.cs, false));`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Test`
`90`	`90`	`public void testEvictEarlyWithTransaction() {`
`91`		`- txTemplate.execute(() -> testEvictEarly(this.cs));`
	`91`	`+ txTemplate.executeWithoutResult(s -> testEvictEarly(this.cs));`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Test`
`95`	`95`	`public void testEvictAllWithTransaction() {`
`96`		`- txTemplate.execute(() -> testEvictAll(this.cs, false));`
	`96`	`+ txTemplate.executeWithoutResult(s -> testEvictAll(this.cs, false));`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`@Test`
`100`	`100`	`public void testEvictAllEarlyWithTransaction() {`
`101`		`- txTemplate.execute(() -> testEvictAllEarly(this.cs));`
	`101`	`+ txTemplate.executeWithoutResult(s -> testEvictAllEarly(this.cs));`
`102`	`102`	`}`
`103`	`103`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ private void executeSqlScripts(`
`260`	`260`	`TransactionDefinition.PROPAGATION_REQUIRED);`
`261`	`261`	`TransactionAttribute txAttr = TestContextTransactionUtils.createDelegatingTransactionAttribute(`
`262`	`262`	`testContext, new DefaultTransactionAttribute(propagation));`
`263`		`- new TransactionTemplate(txMgr, txAttr).execute(() -> populator.execute(finalDataSource));`
	`263`	`+ new TransactionTemplate(txMgr, txAttr).executeWithoutResult(s -> populator.execute(finalDataSource));`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,11 @@`
`16`	`16`
`17`	`17`	`package org.springframework.transaction.support;`
`18`	`18`
	`19`	`+import java.util.function.Consumer;`
	`20`	`+`
`19`	`21`	`import org.springframework.lang.Nullable;`
`20`	`22`	`import org.springframework.transaction.TransactionException;`
	`23`	`+import org.springframework.transaction.TransactionStatus;`
`21`	`24`
`22`	`25`	`/**`
`23`	`26`	`* A {@link TransactionOperations} implementation which executes a given`
`@@ -43,8 +46,8 @@ public <T> T execute(TransactionCallback<T> action) throws TransactionException`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`@Override`
`46`		`- public void execute(Runnable action) throws TransactionException {`
`47`		`- action.run();`
	`49`	`+ public void executeWithoutResult(Consumer<TransactionStatus> action) throws TransactionException {`
	`50`	`+ action.accept(new SimpleTransactionStatus(false));`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`}`