From f191b715839099488c23d3f7671f1dd237752f40 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Fri, 27 Sep 2019 19:18:52 +0200 Subject: [PATCH] DATAREDIS-1037 - Remove @ExperimentalCoroutinesApi annotations. Original pull request: #480. --- .../redis/core/ReactiveGeoOperationsExtensions.kt | 5 ----- .../core/ReactiveHashOperationsExtensions.kt | 6 +----- .../core/ReactiveListOperationsExtensions.kt | 2 -- .../core/ReactiveRedisOperationsExtensions.kt | 9 --------- .../redis/core/ReactiveSetOperationsExtensions.kt | 15 --------------- .../core/ReactiveStreamOperationsExtensions.kt | 14 -------------- .../core/ReactiveZSetOperationsExtensions.kt | 9 --------- .../ReactiveGeoOperationsExtensionsUnitTests.kt | 7 ------- .../ReactiveHashOperationsExtensionsUnitTests.kt | 5 ----- .../ReactiveListOperationsExtensionsUnitTests.kt | 2 -- .../ReactiveRedisOperationsExtensionsUnitTests.kt | 9 --------- .../ReactiveSetOperationsExtensionsUnitTests.kt | 15 --------------- ...ReactiveStreamOperationsExtensionsUnitTests.kt | 14 -------------- .../ReactiveZSetOperationsExtensionsUnitTests.kt | 9 --------- 14 files changed, 1 insertion(+), 120 deletions(-) diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensions.kt index 1df9279de..e67c06576 100644 --- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensions.kt +++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.redis.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.awaitFirstOrNull @@ -71,7 +70,6 @@ suspend fun ReactiveGeoOperations.addAndAwait(key: K, l * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveGeoOperations.add(key: K, locations: Flow>>): Flow = add(key, locations.asFlux()).asFlow() @@ -138,7 +136,6 @@ suspend fun ReactiveGeoOperations.positionAndAwait(key: * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveGeoOperations.radiusAsFlow(key: K, within: Circle, args: GeoRadiusCommandArgs? = null): Flow>> = (if (args != null) radius(key, within, args) else radius(key, within)).asFlow() @@ -149,7 +146,6 @@ fun ReactiveGeoOperations.radiusAsFlow(key: K, within: * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveGeoOperations.radiusAsFlow(key: K, member: M, radius: Double): Flow>> = radius(key, member, radius).asFlow() @@ -159,7 +155,6 @@ fun ReactiveGeoOperations.radiusAsFlow(key: K, member: * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveGeoOperations.radiusAsFlow(key: K, member: M, distance: Distance, args: GeoRadiusCommandArgs? = null): Flow>> = (if (args != null) radius(key, member, distance, args) else radius(key, member, distance)).asFlow() diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensions.kt index 648814fdd..055021ac7 100644 --- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensions.kt +++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.redis.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.awaitFirstOrNull @@ -64,7 +63,7 @@ suspend fun ReactiveHashOperations.incr * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi + fun ReactiveHashOperations.keysAsFlow(key: H): Flow = keys(key).asFlow() @@ -119,7 +118,6 @@ suspend fun ReactiveHashOperations.putI * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveHashOperations.valuesAsFlow(key: H): Flow = values(key).asFlow() @@ -129,7 +127,6 @@ fun ReactiveHashOperations.valuesAsFlow * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveHashOperations.entriesAsFlow(key: H): Flow> = entries(key).asFlow() @@ -139,7 +136,6 @@ fun ReactiveHashOperations.entriesAsFlo * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveHashOperations.scanAsFlow(key: H, options: ScanOptions = ScanOptions.NONE): Flow> = scan(key, options).asFlow() diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensions.kt index 93d3ccf3c..33ce27ec4 100644 --- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensions.kt +++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.redis.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.awaitFirstOrNull @@ -28,7 +27,6 @@ import java.time.Duration * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveListOperations.rangeAsFlow(key: K, start: Long, end: Long): Flow = range(key, start, end).asFlow() diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensions.kt index ddbefd330..43e5dcece 100644 --- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensions.kt +++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.redis.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.asPublisher @@ -37,7 +36,6 @@ import java.time.Instant * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRedisOperations.executeAsFlow(action: (ReactiveRedisConnection) -> Flow): Flow = execute { action(it).asPublisher() }.asFlow() @@ -47,7 +45,6 @@ fun ReactiveRedisOperations.executeAsFlow(acti * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRedisOperations.executeAsFlow(script: RedisScript, keys: List = emptyList(), args: List<*> = emptyList()): Flow = execute(script, keys, args).asFlow() @@ -57,7 +54,6 @@ fun ReactiveRedisOperations.executeAsFlow(scri * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRedisOperations.executeAsFlow(script: RedisScript, keys: List = emptyList(), args: List<*> = emptyList(), argsWriter: RedisElementWriter<*>, resultReader: RedisElementReader): Flow = execute(script, keys, args, argsWriter, resultReader).asFlow() @@ -76,7 +72,6 @@ suspend fun ReactiveRedisOperations.sendAndAwait(destin * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRedisOperations.listenToChannelAsFlow(vararg channels: String): Flow> = listenToChannel(*channels).asFlow() @@ -86,7 +81,6 @@ fun ReactiveRedisOperations.listenToChannelAsFlow(varar * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRedisOperations.listenToPatternAsFlow(vararg patterns: String): Flow> = listenToPattern(*patterns).asFlow() @@ -96,7 +90,6 @@ fun ReactiveRedisOperations.listenToPatternAsFlow(varar * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRedisOperations.listenToAsFlow(vararg topics: Topic): Flow> = listenTo(*topics).asFlow() @@ -124,7 +117,6 @@ suspend fun ReactiveRedisOperations.typeAndAwait(key: K * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRedisOperations.keysAsFlow(pattern: K): Flow = keys(pattern).asFlow() @@ -134,7 +126,6 @@ fun ReactiveRedisOperations.keysAsFlow(pattern: K): Flo * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveRedisOperations.scanAsFlow(options: ScanOptions = ScanOptions.NONE): Flow = scan(options).asFlow() diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensions.kt index 8826424ef..0df7bf203 100644 --- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensions.kt +++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.redis.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.awaitFirstOrNull @@ -54,7 +53,6 @@ suspend fun ReactiveSetOperations.popAndAwait(key: K): * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.popAsFlow(key: K, count: Long): Flow = pop(key, count).asFlow() @@ -91,7 +89,6 @@ suspend fun ReactiveSetOperations.isMemberAndAwait(key: * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.intersectAsFlow(key: K, otherKey: K): Flow = intersect(key, otherKey).asFlow() @@ -101,7 +98,6 @@ fun ReactiveSetOperations.intersectAsFlow(key: K, other * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.intersectAsFlow(key: K, otherKeys: Collection): Flow = intersect(key, otherKeys).asFlow() @@ -111,7 +107,6 @@ fun ReactiveSetOperations.intersectAsFlow(key: K, other * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.intersectAsFlow(otherKeys: Collection): Flow = intersect(otherKeys).asFlow() @@ -139,7 +134,6 @@ suspend fun ReactiveSetOperations.intersectAndStoreAndA * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.unionAsFlow(key: K, otherKey: K): Flow = union(key, otherKey).asFlow() @@ -149,7 +143,6 @@ fun ReactiveSetOperations.unionAsFlow(key: K, otherKey: * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.unionAsFlow(key: K, otherKeys: Collection): Flow = union(key, otherKeys).asFlow() @@ -159,7 +152,6 @@ fun ReactiveSetOperations.unionAsFlow(key: K, otherKeys * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.unionAsFlow(otherKeys: Collection): Flow = union(otherKeys).asFlow() @@ -187,7 +179,6 @@ suspend fun ReactiveSetOperations.unionAndStoreAndAwait * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.differenceAsFlow(key: K, otherKey: K): Flow = difference(key, otherKey).asFlow() @@ -197,7 +188,6 @@ fun ReactiveSetOperations.differenceAsFlow(key: K, othe * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.differenceAsFlow(key: K, otherKeys: Collection): Flow = difference(key, otherKeys).asFlow() @@ -207,7 +197,6 @@ fun ReactiveSetOperations.differenceAsFlow(key: K, othe * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.differenceAsFlow(otherKeys: Collection): Flow = difference(otherKeys).asFlow() @@ -235,7 +224,6 @@ suspend fun ReactiveSetOperations.differenceAndStoreAnd * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.membersAsFlow(key: K): Flow = members(key).asFlow() @@ -245,7 +233,6 @@ fun ReactiveSetOperations.membersAsFlow(key: K): Flow ReactiveSetOperations.scanAsFlow(key: K, options: ScanOptions = ScanOptions.NONE): Flow = scan(key, options).asFlow() /** @@ -263,7 +250,6 @@ suspend fun ReactiveSetOperations.randomMemberAndAwait( * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.distinctRandomMembersAsFlow(key: K, count: Long): Flow = distinctRandomMembers(key, count).asFlow() @@ -273,7 +259,6 @@ fun ReactiveSetOperations.distinctRandomMembersAsFlow(k * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveSetOperations.randomMembersAsFlow(key: K, count: Long): Flow = randomMembers(key, count).asFlow() diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt index 0ef6abdcc..e98eae12a 100644 --- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt +++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.redis.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.asPublisher @@ -57,7 +56,6 @@ suspend fun ReactiveStreamOperations.ac * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveStreamOperations.add(key: K, bodyFlow: Flow>): Flow = add(key, bodyFlow.asPublisher()).asFlow() @@ -158,7 +156,6 @@ suspend fun ReactiveStreamOperations.si * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveStreamOperations.rangeAsFlow(key: K, range: Range, limit: Limit = Limit.unlimited()): Flow> = range(key, range, limit).asFlow() @@ -168,7 +165,6 @@ fun ReactiveStreamOperations.rangeAsFlo * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi inline fun ReactiveStreamOperations.rangeWithTypeAsFlow(key: K, range: Range, limit: Limit = Limit.unlimited()): Flow> = range(V::class.java, key, range, limit).asFlow() @@ -178,7 +174,6 @@ inline fun ReactiveStreamOperations.rangeWit * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveStreamOperations.readAsFlow(vararg stream: StreamOffset): Flow> = read(*stream).asFlow() @@ -188,7 +183,6 @@ fun ReactiveStreamOperations.readAsFlow * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveStreamOperations.readAsFlow(readOptions: StreamReadOptions, vararg stream: StreamOffset): Flow> = read(readOptions, *stream).asFlow() @@ -198,7 +192,6 @@ fun ReactiveStreamOperations.readAsFlow * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi inline fun ReactiveStreamOperations.readWithTypeAsFlow(vararg stream: StreamOffset): Flow> = read(V::class.java, *stream).asFlow() @@ -209,7 +202,6 @@ inline fun ReactiveStreamOperations.readWith * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi inline fun ReactiveStreamOperations.readWithTypeAsFlow(readOptions: StreamReadOptions, vararg stream: StreamOffset): Flow> = read(V::class.java, readOptions, *stream).asFlow() @@ -219,7 +211,6 @@ inline fun ReactiveStreamOperations.readWith * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveStreamOperations.readAsFlow(consumer: Consumer, vararg stream: StreamOffset): Flow> = read(consumer, *stream).asFlow() @@ -229,7 +220,6 @@ fun ReactiveStreamOperations.readAsFlow * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveStreamOperations.readAsFlow(consumer: Consumer, readOptions: StreamReadOptions, vararg stream: StreamOffset): Flow> = read(consumer, readOptions, *stream).asFlow() @@ -239,7 +229,6 @@ fun ReactiveStreamOperations.readAsFlow * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi inline fun ReactiveStreamOperations.readWithTypeAsFlow(consumer: Consumer, vararg stream: StreamOffset): Flow> = read(V::class.java, consumer, *stream).asFlow() @@ -249,7 +238,6 @@ inline fun ReactiveStreamOperations.readWith * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi inline fun ReactiveStreamOperations.readWithTypeAsFlow(consumer: Consumer, readOptions: StreamReadOptions, vararg stream: StreamOffset): Flow> = read(V::class.java, consumer, readOptions, *stream).asFlow() @@ -259,7 +247,6 @@ inline fun ReactiveStreamOperations.readWith * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveStreamOperations.reverseRangeAsFlow(key: K, range: Range, limit: Limit = Limit.unlimited()): Flow> = reverseRange(key, range, limit).asFlow() @@ -269,7 +256,6 @@ fun ReactiveStreamOperations.reverseRan * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi inline fun ReactiveStreamOperations.reverseRangeWithTypeAsFlow(key: K, range: Range, limit: Limit = Limit.unlimited()): Flow> = reverseRange(V::class.java, key, range, limit).asFlow() diff --git a/src/main/kotlin/org/springframework/data/redis/core/ReactiveZSetOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/redis/core/ReactiveZSetOperationsExtensions.kt index d77ed679b..7a83d9ef5 100644 --- a/src/main/kotlin/org/springframework/data/redis/core/ReactiveZSetOperationsExtensions.kt +++ b/src/main/kotlin/org/springframework/data/redis/core/ReactiveZSetOperationsExtensions.kt @@ -15,7 +15,6 @@ */ package org.springframework.data.redis.core -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import kotlinx.coroutines.reactive.awaitFirstOrNull @@ -85,7 +84,6 @@ suspend fun ReactiveZSetOperations.reverseRankAndAwait( * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveZSetOperations.rangeAsFlow(key: K, range: Range): Flow = range(key, range).asFlow() @@ -95,7 +93,6 @@ fun ReactiveZSetOperations.rangeAsFlow(key: K, range: R * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveZSetOperations.rangeWithScoresAsFlow(key: K, range: Range): Flow> = rangeWithScores(key, range).asFlow() @@ -105,7 +102,6 @@ fun ReactiveZSetOperations.rangeWithScoresAsFlow(key: K * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveZSetOperations.rangeByScoreAsFlow(key: K, range: Range, limit: Limit? = null): Flow = (if (limit == null) rangeByScore(key, range) else rangeByScore(key, range, limit)).asFlow() @@ -115,7 +111,6 @@ fun ReactiveZSetOperations.rangeByScoreAsFlow(key: K, r * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveZSetOperations.rangeByScoreWithScoresAsFlow(key: K, range: Range, limit: Limit? = null): Flow> = (if (limit == null) rangeByScoreWithScores(key, range) else rangeByScoreWithScores(key, range, limit)).asFlow() @@ -125,7 +120,6 @@ fun ReactiveZSetOperations.rangeByScoreWithScoresAsFlow * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveZSetOperations.reverseRangeAsFlow(key: K, range: Range): Flow = reverseRange(key, range).asFlow() @@ -135,7 +129,6 @@ fun ReactiveZSetOperations.reverseRangeAsFlow(key: K, r * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveZSetOperations.reverseRangeWithScoresAsFlow(key: K, range: Range): Flow> = reverseRangeWithScores(key, range).asFlow() @@ -145,7 +138,6 @@ fun ReactiveZSetOperations.reverseRangeWithScoresAsFlow * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveZSetOperations.reverseRangeByScoreAsFlow(key: K, range: Range, limit: Limit? = null): Flow = (if (limit == null) reverseRangeByScore(key, range) else reverseRangeByScore(key, range, limit)).asFlow() @@ -155,7 +147,6 @@ fun ReactiveZSetOperations.reverseRangeByScoreAsFlow(ke * @author Sebastien Deleuze * @since 2.2 */ -@ExperimentalCoroutinesApi fun ReactiveZSetOperations.reverseRangeByScoreWithScoresAsFlow(key: K, range: Range, limit: Limit? = null): Flow> = (if (limit == null) reverseRangeByScoreWithScores(key, range) else reverseRangeByScoreWithScores(key, range, limit)).asFlow() diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt index 5fd273b21..8df4664d8 100644 --- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt @@ -18,7 +18,6 @@ package org.springframework.data.redis.core import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.toList @@ -106,7 +105,6 @@ class ReactiveGeoOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun addGeoLocationFlow() { val operations = mockk>() @@ -274,7 +272,6 @@ class ReactiveGeoOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun radiusAsFlowCircle() { val operations = mockk>() @@ -292,7 +289,6 @@ class ReactiveGeoOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun radiusAsFlowCircleAndArgs() { val operations = mockk>() @@ -311,7 +307,6 @@ class ReactiveGeoOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun radiusAsFlowMemberAndRadius() { val operations = mockk>() @@ -329,7 +324,6 @@ class ReactiveGeoOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun radiusAsFlowDistance() { val operations = mockk>() @@ -348,7 +342,6 @@ class ReactiveGeoOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun radiusAsFlowDistanceAndArgs() { val operations = mockk>() diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt index 71b533d5f..f833ee2e1 100644 --- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt @@ -18,7 +18,6 @@ package org.springframework.data.redis.core 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 @@ -111,7 +110,6 @@ class ReactiveHashOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun keys() { val operations = mockk>() every { operations.keys(any()) } returns Flux.just("bar", "baz") @@ -201,7 +199,6 @@ class ReactiveHashOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun values() { val operations = mockk>() @@ -217,7 +214,6 @@ class ReactiveHashOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun entries() { val entry = java.util.AbstractMap.SimpleEntry("bar", "baz") @@ -234,7 +230,6 @@ class ReactiveHashOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun scan() { val entry = java.util.AbstractMap.SimpleEntry("bar", "baz") diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt index feebf4265..03a48ed0b 100644 --- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt @@ -18,7 +18,6 @@ package org.springframework.data.redis.core 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 @@ -36,7 +35,6 @@ import java.time.Duration class ReactiveListOperationsExtensionsUnitTests { @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun range() { val operations = mockk>() diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt index e38343a6b..6df9514ff 100644 --- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt @@ -18,7 +18,6 @@ package org.springframework.data.redis.core import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking @@ -45,7 +44,6 @@ import java.time.Instant class ReactiveRedisOperationsExtensionsUnitTests { @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `execute with calllback`() { val operations = mockk>() @@ -61,7 +59,6 @@ class ReactiveRedisOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `execute with script`() { val script = RedisScript.of("foo") @@ -78,7 +75,6 @@ class ReactiveRedisOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `execute with script, argsWriter and resultReader`() { val script = RedisScript.of("foo") @@ -112,7 +108,6 @@ class ReactiveRedisOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun listenToChannel() { val message = ReactiveSubscription.ChannelMessage("a", "b") @@ -129,7 +124,6 @@ class ReactiveRedisOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun listenToPattern() { val message = ReactiveSubscription.ChannelMessage("a", "b") @@ -146,7 +140,6 @@ class ReactiveRedisOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun listenTo() { val topic1 = ChannelTopic.of("foo") @@ -195,7 +188,6 @@ class ReactiveRedisOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun keys() { val operations = mockk>() @@ -211,7 +203,6 @@ class ReactiveRedisOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun scan() { val operations = mockk>() diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt index ce6e4c8c3..7ccb9fc4a 100644 --- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt @@ -18,7 +18,6 @@ package org.springframework.data.redis.core 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 @@ -81,7 +80,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `pop as Flow`() { val operations = mockk>() @@ -157,7 +155,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun intersect() { val operations = mockk>() every { operations.intersect("foo", "bar") } returns Flux.just("baz") @@ -172,7 +169,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `intersect with key and collection`() { val operations = mockk>() every { operations.intersect("foo", listOf("bar")) } returns Flux.just("baz") @@ -187,7 +183,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `intersect with collection`() { val operations = mockk>() every { operations.intersect(listOf("bar")) } returns Flux.just("baz") @@ -232,7 +227,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun union() { val operations = mockk>() @@ -248,7 +242,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `union with key and collection`() { val operations = mockk>() @@ -264,7 +257,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `union with collection`() { val operations = mockk>() @@ -310,7 +302,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun difference() { val operations = mockk>() @@ -326,7 +317,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `difference with key and collection`() { val operations = mockk>() @@ -342,7 +332,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `difference with collection`() { val operations = mockk>() @@ -388,7 +377,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun members() { val operations = mockk>() @@ -404,7 +392,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun scan() { val operations = mockk>() @@ -450,7 +437,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun distinctRandomMembers() { val operations = mockk>() @@ -466,7 +452,6 @@ class ReactiveSetOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun randomMembers() { val operations = mockk>() diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensionsUnitTests.kt index 07d43e06e..a8bf2bb8d 100644 --- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensionsUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensionsUnitTests.kt @@ -18,7 +18,6 @@ package org.springframework.data.redis.core import io.mockk.every import io.mockk.mockk import io.mockk.verify -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking @@ -103,7 +102,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `add as Flow`() { val map = mapOf("a" to "b") @@ -261,7 +259,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun range() { val record = MapRecord.create("foo", mapOf("a" to "b")) @@ -279,7 +276,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun rangeWithType() { val record = ObjectRecord.create("a", "b") @@ -297,7 +293,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `read with StreamOffset vararg`() { val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed()) @@ -316,7 +311,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `read with options and StreamOffset vararg` () { val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed()) @@ -336,7 +330,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `read with type and StreamOffset vararg`() { val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed()) @@ -355,7 +348,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `read with type, options and StreamOffset vararg` () { val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed()) @@ -375,7 +367,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `read with consumer and StreamOffset vararg`() { val consumer = Consumer.from("a", "b") @@ -395,7 +386,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `read with consumer, options and StreamOffset vararg`() { val consumer = Consumer.from("a", "b") @@ -416,7 +406,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `read with type, consumer and StreamOffset vararg`() { val consumer = Consumer.from("a", "b") @@ -436,7 +425,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun `read with type, consumer, options and StreamOffset vararg`() { val consumer = Consumer.from("a", "b") @@ -457,7 +445,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun reverseRange() { val record = MapRecord.create("foo", mapOf("a" to "b")) @@ -475,7 +462,6 @@ class ReactiveStreamOperationsExtensionsUnitTests { } @Test // DATAREDIS-1033 - @ExperimentalCoroutinesApi fun reverseRangeWithType() { val record = ObjectRecord.create("a", "b") diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveZSetOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveZSetOperationsExtensionsUnitTests.kt index e353bede2..5a897d941 100644 --- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveZSetOperationsExtensionsUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveZSetOperationsExtensionsUnitTests.kt @@ -18,7 +18,6 @@ package org.springframework.data.redis.core 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 @@ -159,7 +158,6 @@ class ReactiveZSetOperationsExtensionsUnitTests { } @Test - @ExperimentalCoroutinesApi fun range() { val range = Range.unbounded() @@ -176,7 +174,6 @@ class ReactiveZSetOperationsExtensionsUnitTests { } @Test - @ExperimentalCoroutinesApi fun rangeWithScores() { val tuple = mockk>(relaxed = true) @@ -194,7 +191,6 @@ class ReactiveZSetOperationsExtensionsUnitTests { } @Test - @ExperimentalCoroutinesApi fun rangeByScore() { val range = Range.unbounded() @@ -211,7 +207,6 @@ class ReactiveZSetOperationsExtensionsUnitTests { } @Test - @ExperimentalCoroutinesApi fun rangeByScoreWithScores() { val tuple = mockk>(relaxed = true) @@ -229,7 +224,6 @@ class ReactiveZSetOperationsExtensionsUnitTests { } @Test - @ExperimentalCoroutinesApi fun reverseRange() { val range = Range.unbounded() @@ -246,7 +240,6 @@ class ReactiveZSetOperationsExtensionsUnitTests { } @Test - @ExperimentalCoroutinesApi fun reverseRangeWithScores() { val tuple = mockk>(relaxed = true) @@ -264,7 +257,6 @@ class ReactiveZSetOperationsExtensionsUnitTests { } @Test - @ExperimentalCoroutinesApi fun reverseRangeByScore() { val range = Range.unbounded() @@ -281,7 +273,6 @@ class ReactiveZSetOperationsExtensionsUnitTests { } @Test - @ExperimentalCoroutinesApi fun reverseRangeByScoreWithScores() { val tuple = mockk>(relaxed = true)