Skip to content

Commit c4741de

Browse files
astiobschauder
authored andcommitted
Remove unnecessary reification from Kotlin R2DBC extensions.
This allows calling the extensions from generic code that has erased types. Original pull request #1496
1 parent c4ce708 commit c4741de

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import kotlinx.coroutines.reactive.awaitSingle
2121
* Extensions for [ReactiveInsertOperation].
2222
*
2323
* @author Mark Paluch
24+
* @author Oleg Oshmyan
2425
* @since 1.1
2526
*/
2627

@@ -33,5 +34,5 @@ inline fun <reified T : Any> ReactiveInsertOperation.insert(): ReactiveInsertOpe
3334
/**
3435
* Coroutines variant of [ReactiveInsertOperation.TerminatingInsert.using].
3536
*/
36-
suspend inline fun <reified T : Any> ReactiveInsertOperation.TerminatingInsert<T>.usingAndAwait(o: T): T =
37+
suspend fun <T : Any> ReactiveInsertOperation.TerminatingInsert<T>.usingAndAwait(o: T): T =
3738
using(o).awaitSingle()

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import kotlinx.coroutines.reactive.awaitSingle
2424
* Extensions for [ReactiveSelectOperation].
2525
*
2626
* @author Mark Paluch
27+
* @author Oleg Oshmyan
2728
* @since 1.1
2829
*/
2930

@@ -42,25 +43,25 @@ inline fun <reified T : Any> ReactiveSelectOperation.SelectWithProjection<*>.asT
4243
/**
4344
* Non-nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.one].
4445
*/
45-
suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitOne(): T =
46+
suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitOne(): T =
4647
one().awaitSingle()
4748

4849
/**
4950
* Nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.one].
5051
*/
51-
suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitOneOrNull(): T? =
52+
suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitOneOrNull(): T? =
5253
one().awaitFirstOrNull()
5354

5455
/**
5556
* Non-nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.first].
5657
*/
57-
suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitFirst(): T =
58+
suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitFirst(): T =
5859
first().awaitSingle()
5960

6061
/**
6162
* Nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.first].
6263
*/
63-
suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitFirstOrNull(): T? =
64+
suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitFirstOrNull(): T? =
6465
first().awaitFirstOrNull()
6566

6667
/**

0 commit comments

Comments
 (0)