Skip to content

Commit 51645b0

Browse files
committed
remove explicit types in SpotifyRestAction.kt
1 parent 5e179ef commit 51645b0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyRestAction.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ import com.adamratzman.spotify.utils.TimeUnit
66
import com.adamratzman.spotify.utils.getCurrentTimeMs
77
import com.adamratzman.spotify.utils.runBlocking
88
import com.adamratzman.spotify.utils.schedule
9-
import kotlin.coroutines.CoroutineContext
10-
import kotlin.coroutines.resume
11-
import kotlin.coroutines.resumeWithException
12-
import kotlin.coroutines.suspendCoroutine
13-
import kotlin.jvm.JvmOverloads
149
import kotlinx.coroutines.CancellationException
1510
import kotlinx.coroutines.CoroutineScope
1611
import kotlinx.coroutines.Dispatchers
@@ -25,6 +20,11 @@ import kotlinx.coroutines.flow.flow
2520
import kotlinx.coroutines.flow.flowOn
2621
import kotlinx.coroutines.launch
2722
import kotlinx.coroutines.withContext
23+
import kotlin.coroutines.CoroutineContext
24+
import kotlin.coroutines.resume
25+
import kotlin.coroutines.resumeWithException
26+
import kotlin.coroutines.suspendCoroutine
27+
import kotlin.jvm.JvmOverloads
2828

2929
/**
3030
* Provides a uniform interface to retrieve, whether synchronously or asynchronously, [T] from Spotify
@@ -159,7 +159,7 @@ class SpotifyRestActionPaging<Z : Any, T : AbstractPagingObject<Z>>(api: Spotify
159159
@FlowPreview
160160
@JvmOverloads
161161
@ExperimentalCoroutinesApi
162-
fun flowOrdered(context: CoroutineContext = Dispatchers.Default): Flow<Z> = flow<Z> {
162+
fun flowOrdered(context: CoroutineContext = Dispatchers.Default): Flow<Z> = flow {
163163
emitAll(flowPagingObjectsOrdered().flatMapConcat { it.asFlow() })
164164
}.flowOn(context)
165165

@@ -169,7 +169,7 @@ class SpotifyRestActionPaging<Z : Any, T : AbstractPagingObject<Z>>(api: Spotify
169169
@JvmOverloads
170170
@ExperimentalCoroutinesApi
171171
fun flowPagingObjectsOrdered(context: CoroutineContext = Dispatchers.Default): Flow<AbstractPagingObject<Z>> =
172-
flow<AbstractPagingObject<Z>> {
172+
flow {
173173
complete().also { master ->
174174
emitAll(master.flowStartOrdered())
175175
emit(master)
@@ -183,7 +183,7 @@ class SpotifyRestActionPaging<Z : Any, T : AbstractPagingObject<Z>>(api: Spotify
183183
@FlowPreview
184184
@JvmOverloads
185185
@ExperimentalCoroutinesApi
186-
fun flow(context: CoroutineContext = Dispatchers.Default): Flow<Z> = flow<Z> {
186+
fun flow(context: CoroutineContext = Dispatchers.Default): Flow<Z> = flow {
187187
emitAll(flowPagingObjects().flatMapConcat { it.asFlow() })
188188
}.flowOn(context)
189189

@@ -193,7 +193,7 @@ class SpotifyRestActionPaging<Z : Any, T : AbstractPagingObject<Z>>(api: Spotify
193193
@JvmOverloads
194194
@ExperimentalCoroutinesApi
195195
fun flowPagingObjects(context: CoroutineContext = Dispatchers.Default): Flow<AbstractPagingObject<Z>> =
196-
flow<AbstractPagingObject<Z>> {
196+
flow {
197197
complete().also { master ->
198198
emitAll(master.flowBackward())
199199
emit(master)

0 commit comments

Comments
 (0)