mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-2295 - Adapt to renamed TransactionSynchronizationManager.forCurrentTransaction().

Browse Source
This commit is contained in:
Mark Paluch
2019-06-05 14:42:57 +02:00
parent b353bb6165
commit d819028e46
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java
View File

@@ -62,7 +62,7 @@ public class ReactiveMongoDatabaseUtils {
return Mono.just(true);
}
return TransactionSynchronizationManager.currentTransaction() //
return TransactionSynchronizationManager.forCurrentTransaction() //
.map(it -> {
ReactiveMongoResourceHolder holder = (ReactiveMongoResourceHolder) it.getResource(databaseFactory);
@@ -137,7 +137,7 @@ public class ReactiveMongoDatabaseUtils {
Assert.notNull(factory, "DatabaseFactory must not be null!");
return TransactionSynchronizationManager.currentTransaction()
return TransactionSynchronizationManager.forCurrentTransaction()
.filter(TransactionSynchronizationManager::isSynchronizationActive) //
.flatMap(synchronizationManager -> {
@@ -210,7 +210,7 @@ public class ReactiveMongoDatabaseUtils {
this.resourceHolder = resourceHolder;
}
/*
/*
* (non-Javadoc)
* @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#shouldReleaseBeforeCompletion()
*/
@@ -219,7 +219,7 @@ public class ReactiveMongoDatabaseUtils {
return false;
}
/*
/*
* (non-Javadoc)
* @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#processResourceAfterCommit(java.lang.Object)
*/
@@ -233,7 +233,7 @@ public class ReactiveMongoDatabaseUtils {
return Mono.empty();
}
/*
/*
* (non-Javadoc)
* @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#afterCompletion(int)
*/
@@ -252,7 +252,7 @@ public class ReactiveMongoDatabaseUtils {
});
}
/*
/*
* (non-Javadoc)
* @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#releaseResource(java.lang.Object, java.lang.Object)
*/

2
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtilsUnitTests.java
View File

@@ -116,7 +116,7 @@ public class ReactiveMongoDatabaseUtilsUnitTests {
operator.execute(tx -> {
return TransactionSynchronizationManager.currentTransaction().doOnNext(synchronizationManager -> {
return TransactionSynchronizationManager.forCurrentTransaction().doOnNext(synchronizationManager -> {
assertThat(synchronizationManager.isSynchronizationActive()).isTrue();
assertThat(tx.isNewTransaction()).isTrue();