lint

adamint · adamint · commit e14271ae06aa · 2021-02-06T12:02:54.000-05:00
Signed-off-by: Adam Ratzman &lt;adam@adamratzman.com&gt;
diff --git a/src/androidMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/androidMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import android.annotation.SuppressLint
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/Builder.kt b/src/commonMain/kotlin/com.adamratzman.spotify/Builder.kt
@@ -882,5 +882,5 @@ public data class SpotifyApiOptions(
     public var onTokenRefresh: (suspend (GenericSpotifyApi) -> Unit)? = null,
     public var requiredScopes: List<SpotifyScope>? = null,
     public var proxyBaseUrl: String? = null,
-    public var retryOnInternalServerErrorTimes: Int? = 5,
+    public var retryOnInternalServerErrorTimes: Int? = 5
 )
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApi.kt
@@ -36,8 +36,8 @@ import com.adamratzman.spotify.models.TokenValidityResponse
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.asList
 import com.adamratzman.spotify.utils.base64ByteEncode
-import kotlinx.serialization.json.Json
 import kotlin.jvm.JvmOverloads
+import kotlinx.serialization.json.Json
 
 /**
  * Represents an instance of the Spotify API client, with common
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientEpisodeApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientEpisodeApi.kt
@@ -5,13 +5,13 @@ import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.endpoints.public.EpisodeApi
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.Episode
 import com.adamratzman.spotify.models.EpisodeList
 import com.adamratzman.spotify.models.EpisodeUri
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 
 /**
  * Endpoints for retrieving information about one or more episodes from the Spotify catalog.
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientFollowingApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientFollowingApi.kt
@@ -6,14 +6,14 @@ import com.adamratzman.spotify.SpotifyClientApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.endpoints.public.FollowingApi
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.Artist
 import com.adamratzman.spotify.models.ArtistUri
 import com.adamratzman.spotify.models.CursorBasedPagingObject
 import com.adamratzman.spotify.models.PlaylistUri
 import com.adamratzman.spotify.models.UserUri
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import com.adamratzman.spotify.models.serialization.toList
+import com.adamratzman.spotify.utils.encodeUrl
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientLibraryApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientLibraryApi.kt
@@ -5,7 +5,6 @@ import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.AlbumUri
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.PlayableUri
@@ -14,6 +13,7 @@ import com.adamratzman.spotify.models.SavedTrack
 import com.adamratzman.spotify.models.serialization.toList
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.utils.Market
+import com.adamratzman.spotify.utils.encodeUrl
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlaylistApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlaylistApi.kt
@@ -6,7 +6,6 @@ import com.adamratzman.spotify.SpotifyClientApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.endpoints.public.PlaylistApi
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.ErrorObject
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.PlayableUri
@@ -23,6 +22,7 @@ import com.adamratzman.spotify.utils.convertFileToBufferedImage
 import com.adamratzman.spotify.utils.convertLocalImagePathToBufferedImage
 import com.adamratzman.spotify.utils.convertUrlPathToBufferedImage
 import com.adamratzman.spotify.utils.encodeBufferedImageToBase64String
+import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.utils.jsonMap
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientShowApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientShowApi.kt
@@ -5,7 +5,6 @@ import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.endpoints.public.ShowApi
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.Show
 import com.adamratzman.spotify.models.ShowList
@@ -16,6 +15,7 @@ import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 
 /**
  * Endpoints for retrieving information about one or more shows and their episodes from the Spotify catalog.
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/AlbumApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/AlbumApi.kt
@@ -4,7 +4,6 @@ package com.adamratzman.spotify.endpoints.public
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.Album
 import com.adamratzman.spotify.models.AlbumUri
 import com.adamratzman.spotify.models.AlbumsResponse
@@ -14,6 +13,7 @@ import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 
 /**
  * Endpoints for retrieving information about one or more albums from the Spotify catalog.
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/ArtistApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/ArtistApi.kt
@@ -4,7 +4,6 @@ package com.adamratzman.spotify.endpoints.public
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.Artist
 import com.adamratzman.spotify.models.ArtistList
 import com.adamratzman.spotify.models.ArtistUri
@@ -17,6 +16,7 @@ import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 import kotlinx.serialization.builtins.ListSerializer
 
 /**
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt
@@ -4,7 +4,6 @@ package com.adamratzman.spotify.endpoints.public
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.ArtistUri
 import com.adamratzman.spotify.models.ErrorObject
 import com.adamratzman.spotify.models.FeaturedPlaylists
@@ -21,6 +20,7 @@ import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Locale
 import com.adamratzman.spotify.utils.Market
+import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.utils.formatDate
 import kotlin.reflect.KClass
 import kotlinx.serialization.Serializable
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/EpisodeApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/EpisodeApi.kt
@@ -6,13 +6,13 @@ import com.adamratzman.spotify.SpotifyAppApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.Episode
 import com.adamratzman.spotify.models.EpisodeList
 import com.adamratzman.spotify.models.EpisodeUri
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 
 /**
  * Endpoints for retrieving information about one or more episodes from the Spotify catalog.
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/FollowingApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/FollowingApi.kt
@@ -4,10 +4,10 @@ package com.adamratzman.spotify.endpoints.public
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.PlaylistUri
 import com.adamratzman.spotify.models.UserUri
 import com.adamratzman.spotify.models.serialization.toList
+import com.adamratzman.spotify.utils.encodeUrl
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/PlaylistApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/PlaylistApi.kt
@@ -6,7 +6,6 @@ import com.adamratzman.spotify.SpotifyAppApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.Playlist
 import com.adamratzman.spotify.models.PlaylistTrack
@@ -19,6 +18,7 @@ import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 import kotlinx.serialization.builtins.ListSerializer
 
 /**
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/SearchApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/SearchApi.kt
@@ -5,7 +5,6 @@ import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.Artist
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.Playlist
@@ -19,6 +18,7 @@ import com.adamratzman.spotify.models.Track
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toNullablePagingObject
 import com.adamratzman.spotify.utils.Market
+import com.adamratzman.spotify.utils.encodeUrl
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.JsonObject
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/ShowApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/ShowApi.kt
@@ -6,7 +6,6 @@ import com.adamratzman.spotify.SpotifyAppApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.Show
 import com.adamratzman.spotify.models.ShowList
@@ -17,6 +16,7 @@ import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 
 /**
  * Endpoints for retrieving information about one or more shows and their episodes from the Spotify catalog.
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/TrackApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/TrackApi.kt
@@ -4,7 +4,6 @@ package com.adamratzman.spotify.endpoints.public
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.AudioAnalysis
 import com.adamratzman.spotify.models.AudioFeatures
 import com.adamratzman.spotify.models.AudioFeaturesResponse
@@ -14,6 +13,7 @@ import com.adamratzman.spotify.models.TrackList
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 
 /**
  * Endpoints for retrieving information about one or more tracks from the Spotify catalog.
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/UserApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/UserApi.kt
@@ -3,11 +3,11 @@ package com.adamratzman.spotify.endpoints.public
 
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.http.SpotifyEndpoint
-import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.models.SpotifyPublicUser
 import com.adamratzman.spotify.models.UserUri
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.encodeUrl
 
 /**
  * Endpoints for retrieving information about a user’s profile.
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/http/Endpoints.kt b/src/commonMain/kotlin/com.adamratzman.spotify/http/Endpoints.kt
@@ -10,11 +10,11 @@ import com.adamratzman.spotify.models.ErrorResponse
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.ConcurrentHashMap
 import com.adamratzman.spotify.utils.getCurrentTimeMs
+import kotlin.math.ceil
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlin.math.ceil
 
 public abstract class SpotifyEndpoint(public val api: GenericSpotifyApi) {
     public val cache: SpotifyCache = SpotifyCache()
@@ -255,4 +255,4 @@ public data class CacheState(val data: String, val eTag: String?, val expireBy:
             expireBy = getCurrentTimeMs() + 1000 * time
         )
     }
-}
+}
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/utils/Concurrency.kt b/src/commonMain/kotlin/com.adamratzman.spotify/utils/Concurrency.kt
@@ -8,4 +8,4 @@ public enum class TimeUnit(public val multiplier: Long) {
     MILLISECONDS(1), SECONDS(1000), MINUTES(60000);
 
     public fun toMillis(duration: Long): Long = duration * multiplier
-}
+}
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/utils/Encoding.kt b/src/commonMain/kotlin/com.adamratzman.spotify/utils/Encoding.kt
@@ -5,4 +5,4 @@ import com.soywiz.krypto.encoding.Base64
 import io.ktor.utils.io.core.toByteArray
 
 internal fun String.base64ByteEncode() = Base64.encode(toByteArray())
-internal expect fun String.encodeUrl(): String
+internal expect fun String.encodeUrl(): String
diff --git a/src/desktopMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/desktopMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import io.ktor.http.encodeURLQueryComponent
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/jsMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -1,8 +1,9 @@
+/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import io.ktor.http.encodeURLQueryComponent
-import org.w3c.files.File
 import kotlin.js.Date
+import org.w3c.files.File
 
 internal actual fun String.encodeUrl() = encodeURLQueryComponent()
 
@@ -32,4 +33,3 @@ public actual typealias BufferedImage = File
 public actual typealias ConcurrentHashMap<K, V> = HashMap<K, V>
 
 public actual fun <K, V> ConcurrentHashMap<K, V>.asList(): List<Pair<K, V>> = toList()
-
diff --git a/src/jvmMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/jvmMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import java.io.ByteArrayOutputStream

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */`
`1`	`2`	`package com.adamratzman.spotify.utils`
`2`	`3`
`3`	`4`	`import android.annotation.SuppressLint`
Original file line number	Diff line number	Diff line change
`@@ -882,5 +882,5 @@ public data class SpotifyApiOptions(`
`882`	`882`	`public var onTokenRefresh: (suspend (GenericSpotifyApi) -> Unit)? = null,`
`883`	`883`	`public var requiredScopes: List<SpotifyScope>? = null,`
`884`	`884`	`public var proxyBaseUrl: String? = null,`
`885`		`- public var retryOnInternalServerErrorTimes: Int? = 5,`
	`885`	`+ public var retryOnInternalServerErrorTimes: Int? = 5`
`886`	`886`	`)`