Skip to content

Commit 5442499

Browse files
adamintadamint
committed
lint
1 parent f0a12a6 commit 5442499

File tree

24 files changed

+214
-229
lines changed

24 files changed

+214
-229
lines changed

‎src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ class SpotifyClientApi internal constructor(
538538
override val artists: ArtistApi = ArtistApi(this)
539539
override val tracks: TrackApi = TrackApi(this)
540540
override val episodes: EpisodeApi = EpisodeApi(this)
541-
override val shows:ShowApi = ShowApi(this)
541+
override val shows: ShowApi = ShowApi(this)
542542
/**
543543
* Provides access to [endpoints](https://developer.spotify.com/documentation/web-api/reference/playlists/) for retrieving
544544
* information about a user’s playlists and for managing a user’s playlists.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import kotlinx.coroutines.Dispatchers
1818
import kotlinx.coroutines.ExperimentalCoroutinesApi
1919
import kotlinx.coroutines.FlowPreview
2020
import kotlinx.coroutines.GlobalScope
21-
import kotlinx.coroutines.flow.Flow
2221
import kotlinx.coroutines.flow.asFlow
2322
import kotlinx.coroutines.flow.emitAll
2423
import kotlinx.coroutines.flow.flatMapConcat
@@ -158,7 +157,6 @@ class SpotifyRestActionPaging<Z : Any, T : PagingObjectBase<Z>>(api: SpotifyApi<
158157
@SpotifyExperimentalHttpApi
159158
fun getWithNextItems(total: Int, context: CoroutineContext = Dispatchers.Default) = api.tracks.toAction { getWithNext(total, context).complete().map { it.items }.flatten() }
160159

161-
162160
/**
163161
* Synchronously retrieve all [Z] associated with this rest action. Filters out null objects
164162
*

‎src/commonMain/kotlin/com.adamratzman.spotify/SpotifyScope.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ enum class SpotifyScope(val uri: String) {
130130
*/
131131
USER_READ_PLAYBACK_STATE("user-read-playback-state"),
132132

133-
134133
/**
135134
* Read access to a user’s playback position in a content.
136135
*

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlaylistApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ class ClientPlaylistApi(api: SpotifyApi<*, *>) : PlaylistApi(api) {
218218
fun getClientPlaylist(id: String): SpotifyRestAction<SimplePlaylist?> {
219219
return toAction {
220220
val playlists = getClientPlaylists().complete()
221-
playlists.items.find { it?.id == id } ?: playlists.getAllItems().complete().find { it?.id == id }
221+
playlists.items.find { it.id == id } ?: playlists.getAllItems().complete().find { it?.id == id }
222222
}
223223
}
224224

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/EpisodeApi.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
12
package com.adamratzman.spotify.endpoints.public
23

34
import com.adamratzman.spotify.SpotifyApi
@@ -10,9 +11,6 @@ import com.adamratzman.spotify.http.encodeUrl
1011
import com.adamratzman.spotify.models.Episode
1112
import com.adamratzman.spotify.models.EpisodeList
1213
import com.adamratzman.spotify.models.EpisodeUri
13-
import com.adamratzman.spotify.models.ShowList
14-
import com.adamratzman.spotify.models.ShowUri
15-
import com.adamratzman.spotify.models.SimpleShow
1614
import com.adamratzman.spotify.models.serialization.toObject
1715
import com.adamratzman.spotify.utils.Market
1816
import com.adamratzman.spotify.utils.catch
@@ -72,4 +70,4 @@ class EpisodeApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
7270
}.flatten()
7371
}
7472
}
75-
}
73+
}

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/SearchApi.kt

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ class SearchApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
110110
* @param includeExternal If true, the response will include any relevant audio content that is hosted externally. By default external content is filtered out from responses.
111111
*/
112112
fun search(
113-
query: String,
114-
vararg searchTypes: SearchType,
115-
limit: Int? = api.defaultLimit,
116-
offset: Int? = null,
117-
market: Market? = null,
118-
includeExternal: Boolean? = null
113+
query: String,
114+
vararg searchTypes: SearchType,
115+
limit: Int? = api.defaultLimit,
116+
offset: Int? = null,
117+
market: Market? = null,
118+
includeExternal: Boolean? = null
119119
): SpotifyRestAction<SpotifySearchResult> {
120120
require(searchTypes.isNotEmpty()) { "At least one search type must be provided" }
121121
return toAction {
@@ -149,10 +149,10 @@ class SearchApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
149149
* @throws BadRequestException if filters are illegal or query is malformed
150150
*/
151151
fun searchPlaylist(
152-
query: String,
153-
limit: Int? = api.defaultLimit,
154-
offset: Int? = null,
155-
market: Market? = null
152+
query: String,
153+
limit: Int? = api.defaultLimit,
154+
offset: Int? = null,
155+
market: Market? = null
156156
): SpotifyRestActionPaging<SimplePlaylist, PagingObject<SimplePlaylist>> {
157157
return toActionPaging {
158158
get(build(query, market, limit, offset, SearchType.PLAYLIST))
@@ -177,10 +177,10 @@ class SearchApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
177177
* @throws BadRequestException if filters are illegal or query is malformed
178178
*/
179179
fun searchArtist(
180-
query: String,
181-
limit: Int? = api.defaultLimit,
182-
offset: Int? = null,
183-
market: Market? = null
180+
query: String,
181+
limit: Int? = api.defaultLimit,
182+
offset: Int? = null,
183+
market: Market? = null
184184
): SpotifyRestActionPaging<Artist, PagingObject<Artist>> {
185185
return toActionPaging {
186186
get(build(query, market, limit, offset, SearchType.ARTIST))
@@ -205,10 +205,10 @@ class SearchApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
205205
* @throws BadRequestException if filters are illegal or query is malformed
206206
*/
207207
fun searchAlbum(
208-
query: String,
209-
limit: Int? = api.defaultLimit,
210-
offset: Int? = null,
211-
market: Market? = null
208+
query: String,
209+
limit: Int? = api.defaultLimit,
210+
offset: Int? = null,
211+
market: Market? = null
212212
): SpotifyRestActionPaging<SimpleAlbum, PagingObject<SimpleAlbum>> {
213213
return toActionPaging {
214214
get(build(query, market, limit, offset, SearchType.ALBUM))
@@ -233,10 +233,10 @@ class SearchApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
233233
* @throws BadRequestException if filters are illegal or query is malformed
234234
*/
235235
fun searchTrack(
236-
query: String,
237-
limit: Int? = api.defaultLimit,
238-
offset: Int? = null,
239-
market: Market? = null
236+
query: String,
237+
limit: Int? = api.defaultLimit,
238+
offset: Int? = null,
239+
market: Market? = null
240240
): SpotifyRestActionPaging<Track, PagingObject<Track>> {
241241
return toActionPaging {
242242
get(build(query, market, limit, offset, SearchType.TRACK))
@@ -261,10 +261,10 @@ class SearchApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
261261
* @throws BadRequestException if filters are illegal or query is malformed
262262
*/
263263
fun searchShow(
264-
query: String,
265-
limit: Int? = api.defaultLimit,
266-
offset: Int? = null,
267-
market: Market? = null
264+
query: String,
265+
limit: Int? = api.defaultLimit,
266+
offset: Int? = null,
267+
market: Market? = null
268268
): SpotifyRestActionPaging<SimpleShow, PagingObject<SimpleShow>> {
269269
return toActionPaging {
270270
get(build(query, market, limit, offset, SearchType.SHOW))
@@ -289,10 +289,10 @@ class SearchApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
289289
* @throws BadRequestException if filters are illegal or query is malformed
290290
*/
291291
fun searchEpisode(
292-
query: String,
293-
limit: Int? = api.defaultLimit,
294-
offset: Int? = null,
295-
market: Market? = null
292+
query: String,
293+
limit: Int? = api.defaultLimit,
294+
offset: Int? = null,
295+
market: Market? = null
296296
): SpotifyRestActionPaging<SimpleEpisode, PagingObject<SimpleEpisode>> {
297297
return toActionPaging {
298298
get(build(query, market, limit, offset, SearchType.EPISODE))
@@ -301,12 +301,12 @@ class SearchApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
301301
}
302302

303303
private fun build(
304-
query: String,
305-
market: Market?,
306-
limit: Int?,
307-
offset: Int?,
308-
vararg types: SearchType,
309-
includeExternal: Boolean? = null
304+
query: String,
305+
market: Market?,
306+
limit: Int?,
307+
offset: Int?,
308+
vararg types: SearchType,
309+
includeExternal: Boolean? = null
310310
): String {
311311
return EndpointBuilder("/search").with("q", query.encodeUrl()).with("type", types.joinToString(",") { it.id })
312312
.with("market", market?.name).with("limit", limit).with("offset", offset)

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/ShowApi.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
12
package com.adamratzman.spotify.endpoints.public
23

34
import com.adamratzman.spotify.SpotifyApi
@@ -98,10 +99,10 @@ class ShowApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
9899
* @throws BadRequestException if the playlist cannot be found
99100
*/
100101
fun getShowEpisodes(
101-
id: String,
102-
limit: Int? = null,
103-
offset: Int? = null,
104-
market: Market? = null
102+
id: String,
103+
limit: Int? = null,
104+
offset: Int? = null,
105+
market: Market? = null
105106
): SpotifyRestActionPaging<SimpleEpisode, PagingObject<SimpleEpisode>> {
106107
return toActionPaging {
107108
get(
@@ -111,5 +112,4 @@ class ShowApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
111112
.toPagingObject(SimpleEpisode.serializer(), null, this, json)
112113
}
113114
}
114-
115-
}
115+
}

‎src/commonMain/kotlin/com.adamratzman.spotify/http/Endpoints.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import com.adamratzman.spotify.SpotifyException.TimeoutException
88
import com.adamratzman.spotify.SpotifyRestAction
99
import com.adamratzman.spotify.SpotifyRestActionPaging
1010
import com.adamratzman.spotify.base
11-
import com.adamratzman.spotify.models.PagingObjectBase
1211
import com.adamratzman.spotify.models.ErrorObject
1312
import com.adamratzman.spotify.models.ErrorResponse
13+
import com.adamratzman.spotify.models.PagingObjectBase
1414
import com.adamratzman.spotify.models.serialization.toObject
1515
import com.adamratzman.spotify.utils.ConcurrentHashMap
1616
import com.adamratzman.spotify.utils.getCurrentTimeMs

‎src/commonMain/kotlin/com.adamratzman.spotify/models/Albums.kt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,27 @@ enum class AlbumResultType(internal val id: String) {
119119
*/
120120
@Serializable
121121
data class Album(
122-
@SerialName("album_type") private val albumTypeString: String,
123-
@SerialName("available_markets") private val availableMarketsString: List<String> = listOf(),
124-
@SerialName("external_ids") private val externalIdsString: Map<String, String> = hashMapOf(),
125-
@SerialName("external_urls") override val externalUrlsString: Map<String, String> = mapOf(),
126-
override val href: String,
127-
override val id: String,
128-
override val uri: AlbumUri,
129-
130-
val artists: List<SimpleArtist>,
131-
val copyrights: List<SpotifyCopyright>,
132-
val genres: List<String>,
133-
val images: List<SpotifyImage>,
134-
val label: String,
135-
val name: String,
136-
val popularity: Int,
137-
@SerialName("release_date") private val releaseDateString: String,
138-
@SerialName("release_date_precision") val releaseDatePrecision: String,
139-
val tracks: PagingObject<SimpleTrack>,
140-
val type: String,
141-
@SerialName("total_tracks") val totalTracks: Int,
142-
val restrictions: Restrictions? = null
122+
@SerialName("album_type") private val albumTypeString: String,
123+
@SerialName("available_markets") private val availableMarketsString: List<String> = listOf(),
124+
@SerialName("external_ids") private val externalIdsString: Map<String, String> = hashMapOf(),
125+
@SerialName("external_urls") override val externalUrlsString: Map<String, String> = mapOf(),
126+
override val href: String,
127+
override val id: String,
128+
override val uri: AlbumUri,
129+
130+
val artists: List<SimpleArtist>,
131+
val copyrights: List<SpotifyCopyright>,
132+
val genres: List<String>,
133+
val images: List<SpotifyImage>,
134+
val label: String,
135+
val name: String,
136+
val popularity: Int,
137+
@SerialName("release_date") private val releaseDateString: String,
138+
@SerialName("release_date_precision") val releaseDatePrecision: String,
139+
val tracks: PagingObject<SimpleTrack>,
140+
val type: String,
141+
@SerialName("total_tracks") val totalTracks: Int,
142+
val restrictions: Restrictions? = null
143143
) : CoreObject() {
144144

145145
@Transient

0 commit comments

Comments
 (0)