From 168b145e532b3a16d11271ba28eaf87f36615504 Mon Sep 17 00:00:00 2001 From: George Papadopoulos Date: Wed, 12 Oct 2022 08:58:02 +0300 Subject: [PATCH] Use awaitSingle operator instead of awaitFirst. Operators `awaitFirstXxx` are going to be deprecated. Also, awaitFirst operator has no value on Mono types. Related #25007 Signed-off-by: George Papadopoulos --- .../data/r2dbc/core/ReactiveSelectOperationExtensions.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-data-r2dbc/src/main/kotlin/org/springframework/data/r2dbc/core/ReactiveSelectOperationExtensions.kt b/spring-data-r2dbc/src/main/kotlin/org/springframework/data/r2dbc/core/ReactiveSelectOperationExtensions.kt index 3b97be7b0f..f9f71f9fbf 100644 --- a/spring-data-r2dbc/src/main/kotlin/org/springframework/data/r2dbc/core/ReactiveSelectOperationExtensions.kt +++ b/spring-data-r2dbc/src/main/kotlin/org/springframework/data/r2dbc/core/ReactiveSelectOperationExtensions.kt @@ -17,13 +17,13 @@ package org.springframework.data.r2dbc.core import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow -import kotlinx.coroutines.reactive.awaitFirstOrNull import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingleOrNull /** * Extensions for [ReactiveSelectOperation]. * - * @author Mark Paluch + * @author Mark Paluch, George Papadopoulos * @since 1.1 */ @@ -49,7 +49,7 @@ suspend inline fun ReactiveSelectOperation.TerminatingSelect ReactiveSelectOperation.TerminatingSelect.awaitOneOrNull(): T? = - one().awaitFirstOrNull() + one().awaitSingleOrNull() /** * Non-nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.first]. @@ -61,7 +61,7 @@ suspend inline fun ReactiveSelectOperation.TerminatingSelect ReactiveSelectOperation.TerminatingSelect.awaitFirstOrNull(): T? = - first().awaitFirstOrNull() + first().awaitSingleOrNull() /** * Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.count].