From b1dcb38ad84f4b78f0e8a728500912e9aac19dde Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 3 Sep 2019 17:31:44 +0200 Subject: [PATCH] #170 - Migrate off deprecated Mono/Flux.usingWhen methods. --- .../r2dbc/connectionfactory/init/DatabasePopulatorUtils.java | 1 + .../data/r2dbc/core/DefaultDatabaseClient.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/r2dbc/connectionfactory/init/DatabasePopulatorUtils.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/init/DatabasePopulatorUtils.java index d8a10c4a..f7d1f197 100644 --- a/src/main/java/org/springframework/data/r2dbc/connectionfactory/init/DatabasePopulatorUtils.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/init/DatabasePopulatorUtils.java @@ -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); diff --git a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java index 2b2ccb6e..e59c23b0 100644 --- a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java @@ -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)); }