From 928134c6e1cc5a44a7dde0b3b3face6176e1f6b8 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Fri, 27 Sep 2019 19:13:48 +0200 Subject: [PATCH] DATAMONGO-2380 - Remove @ExperimentalCoroutinesApi annotations. Original pull request: #795. --- .../mongodb/core/ReactiveAggregationOperationExtensions.kt | 2 -- .../mongodb/core/ReactiveChangeStreamOperationExtensions.kt | 2 -- .../data/mongodb/core/ReactiveFindOperationExtensions.kt | 5 ----- .../data/mongodb/core/ReactiveInsertOperationExtensions.kt | 2 -- .../mongodb/core/ReactiveMapReduceOperationExtensions.kt | 2 -- .../data/mongodb/core/ReactiveRemoveOperationExtensions.kt | 2 -- .../core/ReactiveAggregationOperationExtensionsTests.kt | 2 -- .../core/ReactiveChangeStreamOperationExtensionsTests.kt | 2 -- .../mongodb/core/ReactiveFindOperationExtensionsTests.kt | 2 -- .../mongodb/core/ReactiveInsertOperationExtensionsTests.kt | 2 -- .../core/ReactiveMapReduceOperationExtensionsTests.kt | 2 -- .../mongodb/core/ReactiveRemoveOperationExtensionsTests.kt | 2 -- 12 files changed, 27 deletions(-) diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensions.kt index 5ddc856f7..8d585ab74 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.mongodb.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlin.reflect.KClass @@ -45,6 +44,5 @@ inline fun ReactiveAggregationOperation.aggregateAndReturn(): * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveAggregationOperation.TerminatingAggregationOperation.flow(): Flow = all().asFlow() diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensions.kt index c8afa0b76..264184e38 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.mongodb.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow @@ -44,7 +43,6 @@ inline fun ReactiveChangeStreamOperation.ChangeStreamWithFilte * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveChangeStreamOperation.TerminatingChangeStream.flow(): Flow> = listen().asFlow() diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensions.kt index ae7ae6602..23885fc09 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.mongodb.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.awaitFirstOrNull @@ -139,7 +138,6 @@ suspend fun ReactiveFindOperation.TerminatingFind.awaitExists(): Bo * * @author Sebastien Deleuze */ -@ExperimentalCoroutinesApi fun ReactiveFindOperation.TerminatingFind.flow(): Flow = all().asFlow() @@ -148,7 +146,6 @@ fun ReactiveFindOperation.TerminatingFind.flow(): Flow = * * @author Sebastien Deleuze */ -@ExperimentalCoroutinesApi fun ReactiveFindOperation.TerminatingFind.tailAsFlow(): Flow = tail().asFlow() @@ -157,7 +154,6 @@ fun ReactiveFindOperation.TerminatingFind.tailAsFlow(): Flow = * * @author Sebastien Deleuze */ -@ExperimentalCoroutinesApi fun ReactiveFindOperation.TerminatingFindNear.flow(): Flow> = all().asFlow() @@ -167,6 +163,5 @@ fun ReactiveFindOperation.TerminatingFindNear.flow(): Flow ReactiveFindOperation.TerminatingDistinct.flow(): Flow = all().asFlow() diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensions.kt index b3e7c071c..04425dc09 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.mongodb.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.awaitSingle @@ -56,6 +55,5 @@ suspend inline fun ReactiveInsertOperation.TerminatingInsert * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveInsertOperation.TerminatingInsert.flow(objects: Collection): Flow = all(objects).asFlow() diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensions.kt index 4686998ae..772c64390 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.mongodb.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlin.reflect.KClass @@ -65,6 +64,5 @@ inline fun ReactiveMapReduceOperation.MapReduceWithProjection< * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveMapReduceOperation.TerminatingMapReduce.flow(): Flow = all().asFlow() diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensions.kt index d2a2353d5..d855f6d94 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensions.kt @@ -16,7 +16,6 @@ package org.springframework.data.mongodb.core import com.mongodb.client.result.DeleteResult -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.awaitSingle @@ -57,6 +56,5 @@ suspend fun ReactiveRemoveOperation.TerminatingRemove.allAndAwait() * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRemoveOperation.TerminatingRemove.findAndRemoveAsFlow(): Flow = findAndRemove().asFlow() diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt index 0a5d8e61a..02390898d 100644 --- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt +++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt @@ -19,7 +19,6 @@ import example.first.First import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat @@ -50,7 +49,6 @@ class ReactiveAggregationOperationExtensionsTests { } @Test // DATAMONGO-2255 - @ExperimentalCoroutinesApi fun terminatingAggregationOperationAllAsFlow() { val spec = mockk>() diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensionsTests.kt index 751558444..1ce033725 100644 --- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensionsTests.kt +++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensionsTests.kt @@ -19,7 +19,6 @@ import example.first.First import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat @@ -44,7 +43,6 @@ class ReactiveChangeStreamOperationExtensionsTests { } @Test // DATAMONGO-2089 - @ExperimentalCoroutinesApi fun `TerminatingChangeStream#listen() flow extension`() { val doc1 = mockk>() diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt index 895025055..117b95383 100644 --- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt +++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt @@ -19,7 +19,6 @@ import example.first.First import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.take import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking @@ -35,7 +34,6 @@ import reactor.core.publisher.Mono * @author Mark Paluch * @author Sebastien Deleuze */ -@ExperimentalCoroutinesApi class ReactiveFindOperationExtensionsTests { val operation = mockk(relaxed = true) diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt index 1d9cdb6af..0a2ab286e 100644 --- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt +++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt @@ -19,7 +19,6 @@ import example.first.First import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat @@ -66,7 +65,6 @@ class ReactiveInsertOperationExtensionsTests { } @Test // DATAMONGO-2255 - @ExperimentalCoroutinesApi fun terminatingInsertAllAsFlow() { val insert = mockk>() diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt index 964f0b3d7..e17748ab4 100644 --- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt +++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt @@ -19,7 +19,6 @@ import example.first.First import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat @@ -67,7 +66,6 @@ class ReactiveMapReduceOperationExtensionsTests { } @Test // DATAMONGO-2255 - @ExperimentalCoroutinesApi fun terminatingMapReduceAllAsFlow() { val spec = mockk>() diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt index bb9d70c8a..819272235 100644 --- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt +++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt @@ -20,7 +20,6 @@ import example.first.First import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat @@ -68,7 +67,6 @@ class ReactiveRemoveOperationExtensionsTests { } @Test // DATAMONGO-2255 - @ExperimentalCoroutinesApi fun terminatingRemoveFindAndRemoveAsFlow() { val spec = mockk>()