Skip to content

Commit f191b71

Browse files
sdeleuzemp911de
sdeleuze
authored and
mp911de
committed
Original pull request: #480.
1 parent 0bef525 commit f191b71

14 files changed

+1
-120
lines changed

‎src/main/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensions.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.redis.core
1717

18-
import kotlinx.coroutines.ExperimentalCoroutinesApi
1918
import kotlinx.coroutines.flow.Flow
2019
import kotlinx.coroutines.reactive.asFlow
2120
import kotlinx.coroutines.reactive.awaitFirstOrNull
@@ -71,7 +70,6 @@ suspend fun <K : Any, M : Any> ReactiveGeoOperations<K, M>.addAndAwait(key: K, l
7170
* @author Sebastien Deleuze
7271
* @since 2.2
7372
*/
74-
@ExperimentalCoroutinesApi
7573
fun <K : Any, M : Any> ReactiveGeoOperations<K, M>.add(key: K, locations: Flow<Collection<GeoLocation<M>>>): Flow<Long> =
7674
add(key, locations.asFlux()).asFlow()
7775

@@ -138,7 +136,6 @@ suspend fun <K : Any, M : Any> ReactiveGeoOperations<K, M>.positionAndAwait(key:
138136
* @author Sebastien Deleuze
139137
* @since 2.2
140138
*/
141-
@ExperimentalCoroutinesApi
142139
fun <K : Any, M : Any> ReactiveGeoOperations<K, M>.radiusAsFlow(key: K, within: Circle, args: GeoRadiusCommandArgs? = null): Flow<GeoResult<GeoLocation<M>>> =
143140
(if (args != null) radius(key, within, args) else radius(key, within)).asFlow()
144141

@@ -149,7 +146,6 @@ fun <K : Any, M : Any> ReactiveGeoOperations<K, M>.radiusAsFlow(key: K, within:
149146
* @author Sebastien Deleuze
150147
* @since 2.2
151148
*/
152-
@ExperimentalCoroutinesApi
153149
fun <K : Any, M : Any> ReactiveGeoOperations<K, M>.radiusAsFlow(key: K, member: M, radius: Double): Flow<GeoResult<GeoLocation<M>>> =
154150
radius(key, member, radius).asFlow()
155151

@@ -159,7 +155,6 @@ fun <K : Any, M : Any> ReactiveGeoOperations<K, M>.radiusAsFlow(key: K, member:
159155
* @author Sebastien Deleuze
160156
* @since 2.2
161157
*/
162-
@ExperimentalCoroutinesApi
163158
fun <K : Any, M : Any> ReactiveGeoOperations<K, M>.radiusAsFlow(key: K, member: M, distance: Distance, args: GeoRadiusCommandArgs? = null): Flow<GeoResult<GeoLocation<M>>> =
164159
(if (args != null) radius(key, member, distance, args) else radius(key, member, distance)).asFlow()
165160

‎src/main/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensions.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.redis.core
1717

18-
import kotlinx.coroutines.ExperimentalCoroutinesApi
1918
import kotlinx.coroutines.flow.Flow
2019
import kotlinx.coroutines.reactive.asFlow
2120
import kotlinx.coroutines.reactive.awaitFirstOrNull
@@ -64,7 +63,7 @@ suspend fun <H : Any, HK : Any, HV : Any> ReactiveHashOperations<H, HK, HV>.incr
6463
* @author Sebastien Deleuze
6564
* @since 2.2
6665
*/
67-
@ExperimentalCoroutinesApi
66+
6867
fun <H : Any, HK : Any, HV : Any> ReactiveHashOperations<H, HK, HV>.keysAsFlow(key: H): Flow<HK> =
6968
keys(key).asFlow()
7069

@@ -119,7 +118,6 @@ suspend fun <H : Any, HK : Any, HV : Any> ReactiveHashOperations<H, HK, HV>.putI
119118
* @author Sebastien Deleuze
120119
* @since 2.2
121120
*/
122-
@ExperimentalCoroutinesApi
123121
fun <H : Any, HK : Any, HV : Any> ReactiveHashOperations<H, HK, HV>.valuesAsFlow(key: H): Flow<HV> =
124122
values(key).asFlow()
125123

@@ -129,7 +127,6 @@ fun <H : Any, HK : Any, HV : Any> ReactiveHashOperations<H, HK, HV>.valuesAsFlow
129127
* @author Sebastien Deleuze
130128
* @since 2.2
131129
*/
132-
@ExperimentalCoroutinesApi
133130
fun <H : Any, HK : Any, HV : Any> ReactiveHashOperations<H, HK, HV>.entriesAsFlow(key: H): Flow<Map.Entry<HK, HV>> =
134131
entries(key).asFlow()
135132

@@ -139,7 +136,6 @@ fun <H : Any, HK : Any, HV : Any> ReactiveHashOperations<H, HK, HV>.entriesAsFlo
139136
* @author Sebastien Deleuze
140137
* @since 2.2
141138
*/
142-
@ExperimentalCoroutinesApi
143139
fun <H : Any, HK : Any, HV : Any> ReactiveHashOperations<H, HK, HV>.scanAsFlow(key: H, options: ScanOptions = ScanOptions.NONE): Flow<Map.Entry<HK, HV>> =
144140
scan(key, options).asFlow()
145141

‎src/main/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensions.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.redis.core
1717

18-
import kotlinx.coroutines.ExperimentalCoroutinesApi
1918
import kotlinx.coroutines.flow.Flow
2019
import kotlinx.coroutines.reactive.asFlow
2120
import kotlinx.coroutines.reactive.awaitFirstOrNull
@@ -28,7 +27,6 @@ import java.time.Duration
2827
* @author Sebastien Deleuze
2928
* @since 2.2
3029
*/
31-
@ExperimentalCoroutinesApi
3230
fun <K : Any, V : Any> ReactiveListOperations<K, V>.rangeAsFlow(key: K, start: Long, end: Long): Flow<V> =
3331
range(key, start, end).asFlow()
3432

‎src/main/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensions.kt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.redis.core
1717

18-
import kotlinx.coroutines.ExperimentalCoroutinesApi
1918
import kotlinx.coroutines.flow.Flow
2019
import kotlinx.coroutines.reactive.asFlow
2120
import kotlinx.coroutines.reactive.asPublisher
@@ -37,7 +36,6 @@ import java.time.Instant
3736
* @author Sebastien Deleuze
3837
* @since 2.2
3938
*/
40-
@ExperimentalCoroutinesApi
4139
fun <K : Any, V : Any, T : Any> ReactiveRedisOperations<K, V>.executeAsFlow(action: (ReactiveRedisConnection) -> Flow<T>): Flow<T> =
4240
execute { action(it).asPublisher() }.asFlow()
4341

@@ -47,7 +45,6 @@ fun <K : Any, V : Any, T : Any> ReactiveRedisOperations<K, V>.executeAsFlow(acti
4745
* @author Sebastien Deleuze
4846
* @since 2.2
4947
*/
50-
@ExperimentalCoroutinesApi
5148
fun <K : Any, V : Any, T : Any> ReactiveRedisOperations<K, V>.executeAsFlow(script: RedisScript<T>, keys: List<K> = emptyList(), args: List<*> = emptyList<Any>()): Flow<T> =
5249
execute(script, keys, args).asFlow()
5350

@@ -57,7 +54,6 @@ fun <K : Any, V : Any, T : Any> ReactiveRedisOperations<K, V>.executeAsFlow(scri
5754
* @author Sebastien Deleuze
5855
* @since 2.2
5956
*/
60-
@ExperimentalCoroutinesApi
6157
fun <K : Any, V : Any, T : Any> ReactiveRedisOperations<K, V>.executeAsFlow(script: RedisScript<T>, keys: List<K> = emptyList(), args: List<*> = emptyList<Any>(), argsWriter: RedisElementWriter<*>, resultReader: RedisElementReader<T>): Flow<T> =
6258
execute(script, keys, args, argsWriter, resultReader).asFlow()
6359

@@ -76,7 +72,6 @@ suspend fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.sendAndAwait(destin
7672
* @author Sebastien Deleuze
7773
* @since 2.2
7874
*/
79-
@ExperimentalCoroutinesApi
8075
fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.listenToChannelAsFlow(vararg channels: String): Flow<Message<String, V>> =
8176
listenToChannel(*channels).asFlow()
8277

@@ -86,7 +81,6 @@ fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.listenToChannelAsFlow(varar
8681
* @author Sebastien Deleuze
8782
* @since 2.2
8883
*/
89-
@ExperimentalCoroutinesApi
9084
fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.listenToPatternAsFlow(vararg patterns: String): Flow<Message<String, V>> =
9185
listenToPattern(*patterns).asFlow()
9286

@@ -96,7 +90,6 @@ fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.listenToPatternAsFlow(varar
9690
* @author Sebastien Deleuze
9791
* @since 2.2
9892
*/
99-
@ExperimentalCoroutinesApi
10093
fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.listenToAsFlow(vararg topics: Topic): Flow<Message<String, V>> =
10194
listenTo(*topics).asFlow()
10295

@@ -124,7 +117,6 @@ suspend fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.typeAndAwait(key: K
124117
* @author Sebastien Deleuze
125118
* @since 2.2
126119
*/
127-
@ExperimentalCoroutinesApi
128120
fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.keysAsFlow(pattern: K): Flow<K> =
129121
keys(pattern).asFlow()
130122

@@ -134,7 +126,6 @@ fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.keysAsFlow(pattern: K): Flo
134126
* @author Sebastien Deleuze
135127
* @since 2.2
136128
*/
137-
@ExperimentalCoroutinesApi
138129
fun <K : Any, V : Any> ReactiveRedisOperations<K, V>.scanAsFlow(options: ScanOptions = ScanOptions.NONE): Flow<K> =
139130
scan(options).asFlow()
140131

‎src/main/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensions.kt‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.redis.core
1717

18-
import kotlinx.coroutines.ExperimentalCoroutinesApi
1918
import kotlinx.coroutines.flow.Flow
2019
import kotlinx.coroutines.reactive.asFlow
2120
import kotlinx.coroutines.reactive.awaitFirstOrNull
@@ -54,7 +53,6 @@ suspend fun <K : Any, V : Any> ReactiveSetOperations<K, V>.popAndAwait(key: K):
5453
* @author Sebastien Deleuze
5554
* @since 2.2
5655
*/
57-
@ExperimentalCoroutinesApi
5856
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.popAsFlow(key: K, count: Long): Flow<V> =
5957
pop(key, count).asFlow()
6058

@@ -91,7 +89,6 @@ suspend fun <K : Any, V : Any> ReactiveSetOperations<K, V>.isMemberAndAwait(key:
9189
* @author Sebastien Deleuze
9290
* @since 2.2
9391
*/
94-
@ExperimentalCoroutinesApi
9592
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.intersectAsFlow(key: K, otherKey: K): Flow<V> =
9693
intersect(key, otherKey).asFlow()
9794

@@ -101,7 +98,6 @@ fun <K : Any, V : Any> ReactiveSetOperations<K, V>.intersectAsFlow(key: K, other
10198
* @author Sebastien Deleuze
10299
* @since 2.2
103100
*/
104-
@ExperimentalCoroutinesApi
105101
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.intersectAsFlow(key: K, otherKeys: Collection<K>): Flow<V> =
106102
intersect(key, otherKeys).asFlow()
107103

@@ -111,7 +107,6 @@ fun <K : Any, V : Any> ReactiveSetOperations<K, V>.intersectAsFlow(key: K, other
111107
* @author Sebastien Deleuze
112108
* @since 2.2
113109
*/
114-
@ExperimentalCoroutinesApi
115110
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.intersectAsFlow(otherKeys: Collection<K>): Flow<V> =
116111
intersect(otherKeys).asFlow()
117112

@@ -139,7 +134,6 @@ suspend fun <K : Any, V : Any> ReactiveSetOperations<K, V>.intersectAndStoreAndA
139134
* @author Sebastien Deleuze
140135
* @since 2.2
141136
*/
142-
@ExperimentalCoroutinesApi
143137
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.unionAsFlow(key: K, otherKey: K): Flow<V> =
144138
union(key, otherKey).asFlow()
145139

@@ -149,7 +143,6 @@ fun <K : Any, V : Any> ReactiveSetOperations<K, V>.unionAsFlow(key: K, otherKey:
149143
* @author Sebastien Deleuze
150144
* @since 2.2
151145
*/
152-
@ExperimentalCoroutinesApi
153146
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.unionAsFlow(key: K, otherKeys: Collection<K>): Flow<V> =
154147
union(key, otherKeys).asFlow()
155148

@@ -159,7 +152,6 @@ fun <K : Any, V : Any> ReactiveSetOperations<K, V>.unionAsFlow(key: K, otherKeys
159152
* @author Sebastien Deleuze
160153
* @since 2.2
161154
*/
162-
@ExperimentalCoroutinesApi
163155
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.unionAsFlow(otherKeys: Collection<K>): Flow<V> =
164156
union(otherKeys).asFlow()
165157

@@ -187,7 +179,6 @@ suspend fun <K : Any, V : Any> ReactiveSetOperations<K, V>.unionAndStoreAndAwait
187179
* @author Sebastien Deleuze
188180
* @since 2.2
189181
*/
190-
@ExperimentalCoroutinesApi
191182
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.differenceAsFlow(key: K, otherKey: K): Flow<V> =
192183
difference(key, otherKey).asFlow()
193184

@@ -197,7 +188,6 @@ fun <K : Any, V : Any> ReactiveSetOperations<K, V>.differenceAsFlow(key: K, othe
197188
* @author Sebastien Deleuze
198189
* @since 2.2
199190
*/
200-
@ExperimentalCoroutinesApi
201191
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.differenceAsFlow(key: K, otherKeys: Collection<K>): Flow<V> =
202192
difference(key, otherKeys).asFlow()
203193

@@ -207,7 +197,6 @@ fun <K : Any, V : Any> ReactiveSetOperations<K, V>.differenceAsFlow(key: K, othe
207197
* @author Sebastien Deleuze
208198
* @since 2.2
209199
*/
210-
@ExperimentalCoroutinesApi
211200
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.differenceAsFlow(otherKeys: Collection<K>): Flow<V> =
212201
difference(otherKeys).asFlow()
213202

@@ -235,7 +224,6 @@ suspend fun <K : Any, V : Any> ReactiveSetOperations<K, V>.differenceAndStoreAnd
235224
* @author Sebastien Deleuze
236225
* @since 2.2
237226
*/
238-
@ExperimentalCoroutinesApi
239227
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.membersAsFlow(key: K): Flow<V> =
240228
members(key).asFlow()
241229

@@ -245,7 +233,6 @@ fun <K : Any, V : Any> ReactiveSetOperations<K, V>.membersAsFlow(key: K): Flow<V
245233
* @author Sebastien Deleuze
246234
* @since 2.2
247235
*/
248-
@ExperimentalCoroutinesApi
249236
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.scanAsFlow(key: K, options: ScanOptions = ScanOptions.NONE): Flow<V> =
250237
scan(key, options).asFlow()
251238
/**
@@ -263,7 +250,6 @@ suspend fun <K : Any, V : Any> ReactiveSetOperations<K, V>.randomMemberAndAwait(
263250
* @author Sebastien Deleuze
264251
* @since 2.2
265252
*/
266-
@ExperimentalCoroutinesApi
267253
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.distinctRandomMembersAsFlow(key: K, count: Long): Flow<V> =
268254
distinctRandomMembers(key, count).asFlow()
269255

@@ -273,7 +259,6 @@ fun <K : Any, V : Any> ReactiveSetOperations<K, V>.distinctRandomMembersAsFlow(k
273259
* @author Sebastien Deleuze
274260
* @since 2.2
275261
*/
276-
@ExperimentalCoroutinesApi
277262
fun <K : Any, V : Any> ReactiveSetOperations<K, V>.randomMembersAsFlow(key: K, count: Long): Flow<V> =
278263
randomMembers(key, count).asFlow()
279264

0 commit comments

Comments
 (0)