Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore TransactionOperations Kotlin API compatibilty

Browse Source 
This commit renames the Runnable variant to executeWithoutResult
and uses a Consumer<TransactionStatus> parameter for better
consistency with TransactionCallbackWithoutResult.

Closes gh-23724
This commit is contained in:
Sebastien Deleuze
2019-09-28 17:04:57 +02:00
parent 1e0bdc0337
commit b24ac74106
5 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java vendored
View File

@@ -83,22 +83,22 @@ public class JCacheEhCacheAnnotationTests extends AbstractCacheAnnotationTests {
@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));
}

12
spring-context-support/src/test/java/org/springframework/cache/transaction/TransactionAwareCacheDecoratorTests.java vendored
View File

@@ -79,7 +79,7 @@ public class TransactionAwareCacheDecoratorTests {
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 class TransactionAwareCacheDecoratorTests {
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 class TransactionAwareCacheDecoratorTests {
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 class TransactionAwareCacheDecoratorTests {
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 class TransactionAwareCacheDecoratorTests {
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 class TransactionAwareCacheDecoratorTests {
Object key = new Object();
cache.put(key, "123");
txTemplate.execute(() -> {
txTemplate.executeWithoutResult(s -> {
cache.invalidate();
assertThat(target.get(key)).isNull();
});