#170 - Migrate off deprecated Mono/Flux.usingWhen methods.
This commit is contained in:
@@ -49,6 +49,7 @@ public abstract class DatabasePopulatorUtils {
|
||||
return Mono.usingWhen(ConnectionFactoryUtils.getConnection(connectionFactory), //
|
||||
populator::populate, //
|
||||
it -> ConnectionFactoryUtils.releaseConnection(it, connectionFactory), //
|
||||
(it, err) -> ConnectionFactoryUtils.releaseConnection(it, connectionFactory),
|
||||
it -> ConnectionFactoryUtils.releaseConnection(it, connectionFactory))
|
||||
.onErrorMap(ex -> !(ex instanceof ScriptException), ex -> {
|
||||
return new UncategorizedScriptException("Failed to execute database script", ex);
|
||||
|
||||
@@ -157,7 +157,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
|
||||
Connection connectionToUse = createConnectionProxy(it.connection);
|
||||
|
||||
return doInConnection(connectionToUse, action);
|
||||
}, ConnectionCloseHolder::close, ConnectionCloseHolder::close, ConnectionCloseHolder::close) //
|
||||
}, ConnectionCloseHolder::close, (it, err) -> it.close(), ConnectionCloseHolder::close) //
|
||||
.onErrorMap(R2dbcException.class, ex -> translateException("execute", getSql(action), ex));
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
|
||||
Connection connectionToUse = createConnectionProxy(it.connection);
|
||||
|
||||
return doInConnectionMany(connectionToUse, action);
|
||||
}, ConnectionCloseHolder::close, ConnectionCloseHolder::close, ConnectionCloseHolder::close) //
|
||||
}, ConnectionCloseHolder::close, (it, err) -> it.close(), ConnectionCloseHolder::close) //
|
||||
.onErrorMap(R2dbcException.class, ex -> translateException("executeMany", getSql(action), ex));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user