#170 - Migrate off deprecated Mono/Flux.usingWhen methods.

This commit is contained in:
Mark Paluch
2019-09-03 17:31:44 +02:00
parent af52bc1a53
commit b1dcb38ad8
2 changed files with 3 additions and 2 deletions

View File

@@ -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);

View File

@@ -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));
}