diff --git a/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt b/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt index 004b567a51e..1130868a0bc 100644 --- a/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt +++ b/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt @@ -19,7 +19,7 @@ package org.springframework.messaging.rsocket import io.rsocket.transport.ClientTransport import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle import kotlinx.coroutines.reactor.awaitSingleOrNull import org.reactivestreams.Publisher import org.springframework.core.ParameterizedTypeReference diff --git a/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt b/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt index ee2f2f9f48e..5a20ba13343 100644 --- a/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt +++ b/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt @@ -16,7 +16,7 @@ package org.springframework.r2dbc.core -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle /** * Coroutines variant of [UpdatedRowsFetchSpec.rowsUpdated]. diff --git a/spring-web/src/main/kotlin/org/springframework/web/server/ServerWebExchangeExtensions.kt b/spring-web/src/main/kotlin/org/springframework/web/server/ServerWebExchangeExtensions.kt index 06081a7c622..471f65cf6dd 100644 --- a/spring-web/src/main/kotlin/org/springframework/web/server/ServerWebExchangeExtensions.kt +++ b/spring-web/src/main/kotlin/org/springframework/web/server/ServerWebExchangeExtensions.kt @@ -17,7 +17,7 @@ package org.springframework.web.server import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle import kotlinx.coroutines.reactor.mono import org.springframework.http.codec.multipart.Part import org.springframework.util.MultiValueMap diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt index b922a0aaf80..59850b490cc 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt @@ -18,7 +18,7 @@ package org.springframework.web.reactive.function.client import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactor.awaitSingleOrNull -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle import kotlinx.coroutines.reactive.asFlow import org.springframework.core.ParameterizedTypeReference import org.springframework.http.ResponseEntity diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt index 10089857790..75e8e70fc16 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt @@ -19,7 +19,7 @@ package org.springframework.web.reactive.function.client import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle import kotlinx.coroutines.reactor.awaitSingleOrNull import kotlinx.coroutines.reactor.asFlux import kotlinx.coroutines.reactor.mono diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/CoRouterFunctionDsl.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/CoRouterFunctionDsl.kt index a0e366b19df..0acb769e062 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/CoRouterFunctionDsl.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/CoRouterFunctionDsl.kt @@ -17,7 +17,7 @@ package org.springframework.web.reactive.function.server import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle import kotlinx.coroutines.reactor.mono import org.springframework.core.io.Resource import org.springframework.http.HttpMethod diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RenderingResponseExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RenderingResponseExtensions.kt index 3fe7b447295..49e449813e5 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RenderingResponseExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RenderingResponseExtensions.kt @@ -16,7 +16,7 @@ package org.springframework.web.reactive.function.server -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle /** * Coroutines variant of [RenderingResponse.Builder.build]. diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt index e446d51bfb3..2b88be362cd 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt @@ -18,7 +18,7 @@ package org.springframework.web.reactive.function.server import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactor.awaitSingleOrNull -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle import kotlinx.coroutines.reactive.asFlow import org.springframework.core.ParameterizedTypeReference import org.springframework.http.MediaType diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerResponseExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerResponseExtensions.kt index 8f8b8a33c73..eca3135132f 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerResponseExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerResponseExtensions.kt @@ -17,7 +17,7 @@ package org.springframework.web.reactive.function.server import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle import org.reactivestreams.Publisher import org.springframework.core.ParameterizedTypeReference import org.springframework.http.MediaType diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/server/ServerWebExchangeExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/server/ServerWebExchangeExtensions.kt index adb93ac0188..4ec128082f3 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/server/ServerWebExchangeExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/server/ServerWebExchangeExtensions.kt @@ -17,7 +17,7 @@ package org.springframework.web.reactive.server import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.reactive.awaitSingle +import kotlinx.coroutines.reactor.awaitSingle import kotlinx.coroutines.reactor.mono import org.springframework.http.codec.multipart.Part import org.springframework.util.MultiValueMap