Skip to content

Commit ac80e51

Browse files
GeorgePap-719mp911de
authored andcommitted
Use awaitSingle operator instead of awaitFirst.
Operators `awaitFirstXxx` are going to be deprecated. Also, awaitFirst operator has no value on Mono types. Closes: #1355 Signed-off-by: George Papadopoulos <[email protected]>
1 parent 2b84f7d commit ac80e51

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

spring-data-r2dbc/src/main/kotlin/org/springframework/data/r2dbc/core/ReactiveSelectOperationExtensions.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ package org.springframework.data.r2dbc.core
1717

1818
import kotlinx.coroutines.flow.Flow
1919
import kotlinx.coroutines.reactive.asFlow
20-
import kotlinx.coroutines.reactive.awaitFirstOrNull
2120
import kotlinx.coroutines.reactive.awaitSingle
21+
import kotlinx.coroutines.reactor.awaitSingleOrNull
2222

2323
/**
2424
* Extensions for [ReactiveSelectOperation].
2525
*
2626
* @author Mark Paluch
2727
* @author Oleg Oshmyan
28+
* @author George Papadopoulos
2829
* @since 1.1
2930
*/
3031

@@ -50,7 +51,7 @@ suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitOne(): T
5051
* Nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.one].
5152
*/
5253
suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitOneOrNull(): T? =
53-
one().awaitFirstOrNull()
54+
one().awaitSingleOrNull()
5455

5556
/**
5657
* Non-nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.first].
@@ -62,7 +63,7 @@ suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitFirst():
6263
* Nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.first].
6364
*/
6465
suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitFirstOrNull(): T? =
65-
first().awaitFirstOrNull()
66+
first().awaitSingleOrNull()
6667

6768
/**
6869
* Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.count].

0 commit comments

Comments
 (0)