From 9c26859c0401526c7d8803d8ed18dddda36d5e7b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 9 Apr 2019 16:24:27 +0200 Subject: [PATCH] DATAMONGO-2255 - Polishing. Add ticket references. Rename allAsFlow() to flow() to simplify naming. Original pull request: #736. --- .../core/ExecutableFindOperationExtensions.kt | 8 +++---- .../ReactiveAggregationOperationExtensions.kt | 2 +- .../core/ReactiveFindOperationExtensions.kt | 6 ++--- .../core/ReactiveInsertOperationExtensions.kt | 2 +- .../ReactiveMapReduceOperationExtensions.kt | 2 +- ...tiveAggregationOperationExtensionsTests.kt | 6 ++--- .../ReactiveFindOperationExtensionsTests.kt | 24 +++++++++---------- .../ReactiveInsertOperationExtensionsTests.kt | 4 ++-- ...activeMapReduceOperationExtensionsTests.kt | 6 ++--- .../ReactiveRemoveOperationExtensionsTests.kt | 2 +- 10 files changed, 30 insertions(+), 32 deletions(-) diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensions.kt index 1e593e0fc..7bff01703 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensions.kt @@ -39,7 +39,7 @@ inline fun ExecutableFindOperation.query(): ExecutableFindOper query(T::class.java) /** - * Extension for [ExecutableFindOperation.FindWithProjection. as] providing a [KClass] based variant. + * Extension for [ExecutableFindOperation.FindWithProjection.as] providing a [KClass] based variant. * * @author Sebastien Deleuze * @author Mark Paluch @@ -50,7 +50,7 @@ fun ExecutableFindOperation.FindWithProjection<*>.asType(resultType: K `as`(resultType.java) /** - * Extension for [ExecutableFindOperation.FindWithProjection. as] leveraging reified type parameters. + * Extension for [ExecutableFindOperation.FindWithProjection.as] leveraging reified type parameters. * * @author Sebastien Deleuze * @author Mark Paluch @@ -60,7 +60,7 @@ inline fun ExecutableFindOperation.FindWithProjection<*>.asTyp `as`(T::class.java) /** - * Extension for [ExecutableFindOperation.DistinctWithProjection. as] providing a [KClass] based variant. + * Extension for [ExecutableFindOperation.DistinctWithProjection.as] providing a [KClass] based variant. * * @author Christoph Strobl * @since 2.1 @@ -70,7 +70,7 @@ fun ExecutableFindOperation.DistinctWithProjection.asType(resultType: `as`(resultType.java); /** - * Extension for [ExecutableFindOperation.DistinctWithProjection. as] leveraging reified type parameters. + * Extension for [ExecutableFindOperation.DistinctWithProjection.as] leveraging reified type parameters. * * @author Christoph Strobl * @since 2.1 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 f23f9ee2d..3a6d30541 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 @@ -49,5 +49,5 @@ inline fun ReactiveAggregationOperation.aggregateAndReturn(): * @since 2.2 */ @FlowPreview -fun ReactiveAggregationOperation.TerminatingAggregationOperation.allAsFlow(batchSize: Int = 1): Flow = +fun ReactiveAggregationOperation.TerminatingAggregationOperation.flow(batchSize: Int = 1): Flow = all().asFlow(batchSize) 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 4c3cfdc2b..4cdb04a27 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 @@ -143,7 +143,7 @@ suspend fun ReactiveFindOperation.TerminatingFind.awaitExists(): Bo * @author Sebastien Deleuze */ @FlowPreview -fun ReactiveFindOperation.TerminatingFind.allAsFlow(batchSize: Int = 1): Flow = +fun ReactiveFindOperation.TerminatingFind.flow(batchSize: Int = 1): Flow = all().asFlow(batchSize) /** @@ -167,7 +167,7 @@ fun ReactiveFindOperation.TerminatingFind.tailAsFlow(batchSize: Int * @author Sebastien Deleuze */ @FlowPreview -fun ReactiveFindOperation.TerminatingFindNear.allAsFlow(batchSize: Int = 1): Flow> = +fun ReactiveFindOperation.TerminatingFindNear.flow(batchSize: Int = 1): Flow> = all().asFlow(batchSize) /** @@ -180,5 +180,5 @@ fun ReactiveFindOperation.TerminatingFindNear.allAsFlow(batchSize: * @since 2.2 */ @FlowPreview -fun ReactiveFindOperation.TerminatingDistinct.allAsFlow(batchSize: Int = 1): Flow = +fun ReactiveFindOperation.TerminatingDistinct.flow(batchSize: Int = 1): Flow = all().asFlow(batchSize) 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 6324b8401..faf4033b2 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 @@ -60,5 +60,5 @@ suspend inline fun ReactiveInsertOperation.TerminatingInsert * @since 2.2 */ @FlowPreview -fun ReactiveInsertOperation.TerminatingInsert.allAsFlow(objects: Collection, batchSize: Int = 1): Flow = +fun ReactiveInsertOperation.TerminatingInsert.flow(objects: Collection, batchSize: Int = 1): Flow = all(objects).asFlow(batchSize) 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 16ca00307..daaca8348 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 @@ -69,5 +69,5 @@ inline fun ReactiveMapReduceOperation.MapReduceWithProjection< * @since 2.2 */ @FlowPreview -fun ReactiveMapReduceOperation.TerminatingMapReduce.allAsFlow(batchSize: Int = 1): Flow = +fun ReactiveMapReduceOperation.TerminatingMapReduce.flow(batchSize: Int = 1): Flow = all().asFlow(batchSize) 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 2c59ffcc2..80723cad9 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 @@ -22,7 +22,7 @@ import io.mockk.verify import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.Test import reactor.core.publisher.Flux @@ -48,7 +48,7 @@ class ReactiveAggregationOperationExtensionsTests { verify { operation.aggregateAndReturn(First::class.java) } } - @Test + @Test // DATAMONGO-2255 @FlowPreview fun terminatingAggregationOperationAllAsFlow() { @@ -56,7 +56,7 @@ class ReactiveAggregationOperationExtensionsTests { every { spec.all() } returns Flux.just("foo", "bar", "baz") runBlocking { - Assertions.assertThat(spec.allAsFlow().toList()).contains("foo", "bar", "baz") + assertThat(spec.flow().toList()).contains("foo", "bar", "baz") } verify { 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 a2848a087..23874858a 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 @@ -20,6 +20,7 @@ import io.mockk.every import io.mockk.mockk import io.mockk.verify import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.take import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat @@ -34,6 +35,7 @@ import reactor.core.publisher.Mono * @author Mark Paluch * @author Sebastien Deleuze */ +@FlowPreview class ReactiveFindOperationExtensionsTests { val operation = mockk(relaxed = true) @@ -234,15 +236,14 @@ class ReactiveFindOperationExtensionsTests { } } - @Test - @FlowPreview + @Test // DATAMONGO-2255 fun terminatingFindAllAsFlow() { val spec = mockk>() every { spec.all() } returns Flux.just("foo", "bar", "baz") runBlocking { - assertThat(spec.allAsFlow().toList()).contains("foo", "bar", "baz") + assertThat(spec.flow().toList()).contains("foo", "bar", "baz") } verify { @@ -250,15 +251,14 @@ class ReactiveFindOperationExtensionsTests { } } - @Test - @FlowPreview + @Test // DATAMONGO-2255 fun terminatingFindTailAsFlow() { val spec = mockk>() - every { spec.tail() } returns Flux.just("foo", "bar", "baz") + every { spec.tail() } returns Flux.just("foo", "bar", "baz").concatWith(Flux.never()) runBlocking { - assertThat(spec.tailAsFlow().toList()).contains("foo", "bar", "baz") + assertThat(spec.tailAsFlow().take(3).toList()).contains("foo", "bar", "baz") } verify { @@ -266,8 +266,7 @@ class ReactiveFindOperationExtensionsTests { } } - @Test - @FlowPreview + @Test // DATAMONGO-2255 fun terminatingFindNearAllAsFlow() { val spec = mockk>() @@ -277,7 +276,7 @@ class ReactiveFindOperationExtensionsTests { every { spec.all() } returns Flux.just(foo, bar, baz) runBlocking { - assertThat(spec.allAsFlow().toList()).contains(foo, bar, baz) + assertThat(spec.flow().toList()).contains(foo, bar, baz) } verify { @@ -285,15 +284,14 @@ class ReactiveFindOperationExtensionsTests { } } - @Test - @FlowPreview + @Test // DATAMONGO-2255 fun terminatingDistinctAllAsFlow() { val spec = mockk>() every { spec.all() } returns Flux.just("foo", "bar", "baz") runBlocking { - assertThat(spec.allAsFlow().toList()).contains("foo", "bar", "baz") + assertThat(spec.flow().toList()).contains("foo", "bar", "baz") } verify { 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 227e4c92a..5d680dfaf 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 @@ -64,7 +64,7 @@ class ReactiveInsertOperationExtensionsTests { } } - @Test + @Test // DATAMONGO-2255 @FlowPreview fun terminatingInsertAllAsFlow() { @@ -73,7 +73,7 @@ class ReactiveInsertOperationExtensionsTests { every { insert.all(any()) } returns Flux.fromIterable(list) runBlocking { - assertThat(insert.allAsFlow(list).toList()).containsAll(list) + assertThat(insert.flow(list).toList()).containsAll(list) } verify { 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 e63cc675b..de59c53fb 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 @@ -22,7 +22,7 @@ import io.mockk.verify import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.Test import reactor.core.publisher.Flux @@ -64,7 +64,7 @@ class ReactiveMapReduceOperationExtensionsTests { verify { operationWithProjection.`as`(User::class.java) } } - @Test + @Test // DATAMONGO-2255 @FlowPreview fun terminatingMapReduceAllAsFlow() { @@ -72,7 +72,7 @@ class ReactiveMapReduceOperationExtensionsTests { every { spec.all() } returns Flux.just("foo", "bar", "baz") runBlocking { - Assertions.assertThat(spec.allAsFlow().toList()).contains("foo", "bar", "baz") + assertThat(spec.flow().toList()).contains("foo", "bar", "baz") } verify { 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 4e4ecf2f5..2d17c2eb1 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 @@ -66,7 +66,7 @@ class ReactiveRemoveOperationExtensionsTests { } } - @Test + @Test // DATAMONGO-2255 @FlowPreview fun terminatingRemoveFindAndRemoveAsFlow() {