Fix TransactionOperations API compat is Kotlin

This commit introduces a Supplier variant to execute and renames the
Runnable variant to executeWithoutResult.

Closes spring-projectsgh-23724

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(() -> testEvict(this.cs, false));
 	}
 
 	@Test
 	public void testEvictEarlyWithTransaction() {
-		txTemplate.execute(() -> testEvictEarly(this.cs));
+		txTemplate.executeWithoutResult(() -> testEvictEarly(this.cs));
 	}
 
 	@Test
 	public void testEvictAllWithTransaction() {
-		txTemplate.execute(() -> testEvictAll(this.cs, false));
+		txTemplate.executeWithoutResult(() -> testEvictAll(this.cs, false));
 	}
 
 	@Test
 	public void testEvictAllEarlyWithTransaction() {
-		txTemplate.execute(() -> testEvictAllEarly(this.cs));
+		txTemplate.executeWithoutResult(() -> testEvictAllEarly(this.cs));
 	}
 
 

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(() -> {
 			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(() -> {
 			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(() -> {
 			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(() -> {
 			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(() -> {
 			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(() -> {
 			cache.invalidate();
 			assertThat(target.get(key)).isNull();
 		});

spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java

@@ -16,6 +16,8 @@
 
 package org.springframework.transaction.support;
 
+import java.util.function.Supplier;
+
 import org.springframework.lang.Nullable;
 import org.springframework.transaction.TransactionException;
 
@@ -40,10 +42,31 @@ 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 #execute(Supplier)
+	 * @see #executeWithoutResult(Runnable)
 	 */
 	@Nullable
 	<T> T execute(TransactionCallback<T> action) throws TransactionException;
 
+	/**
+	 * Execute the action specified by the given callback object within a transaction.
+	 * <p>Allows for returning a result object created within the transaction, that is,
+	 * a domain object or a collection of domain objects. A RuntimeException thrown
+	 * by the callback is treated as a fatal exception that enforces a rollback.
+	 * Such an exception gets propagated to the caller of the template.
+	 * @param action the Supplier that specifies the transactional action
+	 * @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
+	 * @since 5.2
+	 * @see #execute(TransactionCallback)
+	 * @see #executeWithoutResult(Runnable)
+	 */
+	@Nullable
+	default <T> T execute(Supplier<T> action) throws TransactionException {
+		return execute(status -> action.get());
+	}
+
 	/**
 	 * Execute the action specified by the given {@link Runnable} within a transaction.
 	 * <p>If you need to return an object from the callback or access the
@@ -57,10 +80,11 @@ public interface TransactionOperations {
 	 * @throws RuntimeException if thrown by the Runnable
 	 * @since 5.2
 	 * @see #execute(TransactionCallback)
+	 * @see #execute(Supplier)
 	 * @see TransactionCallbackWithoutResult
 	 */
-	default void execute(Runnable action) throws TransactionException {
-		execute(status -> {
+	default void executeWithoutResult(Runnable action) throws TransactionException {
+		execute(() -> {
 			action.run();
 			return null;
 		});

spring-tx/src/main/java/org/springframework/transaction/support/WithoutTransactionOperations.java

@@ -16,6 +16,8 @@
 
 package org.springframework.transaction.support;
 
+import java.util.function.Supplier;
+
 import org.springframework.lang.Nullable;
 import org.springframework.transaction.TransactionException;
 
@@ -43,7 +45,12 @@ public <T> T execute(TransactionCallback<T> action) throws TransactionException
 	}
 
 	@Override
-	public void execute(Runnable action) throws TransactionException {
+	public <T> T execute(Supplier<T> action) throws TransactionException {
+		return action.get();
+	}
+
+	@Override
+	public void executeWithoutResult(Runnable action) throws TransactionException {
 		action.run();
 	}