kotlin style changes

Author: adamint

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

@@ -501,11 +501,11 @@ class SpotifyApiOptionsBuilder(
             SpotifyApiOptions(
                 true,
                 200,
-                false,
-                true,
-                true,
-                true,
-                json
+                    automaticRefresh = false,
+                    retryWhenRateLimited = true,
+                    enableLogger = true,
+                    testTokenValidity = true,
+                    json = json
             )
         else
             SpotifyApiOptions(

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

@@ -92,7 +92,7 @@ sealed class SpotifyApi<T : SpotifyApi<T, B>, B : ISpotifyApiBuilder<T, B>>(
             if (!isTokenValid().isValid)
                 try {
                     refreshToken()
-                } catch (e: SpotifyException.BadRequestException) {
+                } catch (e: BadRequestException) {
                     throw SpotifyException.AuthenticationException(
                         "Invalid token and refresh token supplied. Cannot refresh to a fresh token.",
                         e
@@ -453,7 +453,7 @@ class SpotifyClientApi internal constructor(
 
             logger.logInfo("Successfully refreshed the Spotify token")
             return currentToken
-        } else throw SpotifyException.BadRequestException(
+        } else throw BadRequestException(
             response.body.toObject(
                 AuthenticationError.serializer(),
                 this,
@@ -551,7 +551,7 @@ suspend fun getCredentialedToken(clientId: String, clientSecret: String, api: Sp
 
     if (response.responseCode / 200 == 1) return response.body.toObject(Token.serializer(), null, json)
 
-    throw SpotifyException.BadRequestException(response.body.toObject(AuthenticationError.serializer(), null, json))
+    throw BadRequestException(response.body.toObject(AuthenticationError.serializer(), null, json))
 }
 
 internal suspend fun executeTokenRequest(

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

@@ -3,7 +3,6 @@ package com.adamratzman.spotify.endpoints.client
 
 import com.adamratzman.spotify.SpotifyApi
 import com.adamratzman.spotify.SpotifyClientApi
-import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyRestAction
 import com.adamratzman.spotify.SpotifyRestActionPaging
@@ -67,7 +66,7 @@ class ClientPlaylistApi(api: SpotifyApi<*, *>) : PlaylistApi(api) {
         collaborative: Boolean? = null,
         user: String = (api as SpotifyClientApi).userId
     ): SpotifyRestAction<Playlist> {
-        if (name.isEmpty()) throw SpotifyException.BadRequestException(ErrorObject(400, "Name cannot be empty"))
+        if (name.isEmpty()) throw BadRequestException(ErrorObject(400, "Name cannot be empty"))
         return toAction {
             val body = jsonMap()
             body += json { "name" to name }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt

@@ -2,7 +2,6 @@
 package com.adamratzman.spotify.endpoints.public
 
 import com.adamratzman.spotify.SpotifyApi
-import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyRestAction
 import com.adamratzman.spotify.SpotifyRestActionPaging
@@ -25,9 +24,9 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.models.serialization.toPagingObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.formatDate
+import kotlin.reflect.KClass
 import kotlinx.serialization.list
 import kotlinx.serialization.serializer
-import kotlin.reflect.KClass
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("BrowseApi"))
 typealias BrowseAPI = BrowseApi
@@ -294,7 +293,7 @@ class BrowseApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
         maxAttributes: Map<TuneableTrackAttribute<*>, Number> = mapOf()
     ): SpotifyRestAction<RecommendationResponse> {
         if (seedArtists?.isEmpty() != false && seedGenres?.isEmpty() != false && seedTracks?.isEmpty() != false) {
-            throw SpotifyException.BadRequestException(
+            throw BadRequestException(
                     ErrorObject(
                             400,
                             "At least one seed (genre, artist, track) must be provided."
@@ -325,7 +324,7 @@ sealed class TuneableTrackAttribute<T : Number>(
     val integerOnly: Boolean,
     val min: T?,
     val max: T?,
-    internal val tClazz: KClass<T>
+    private val tClazz: KClass<T>
 ) {
     /**
      * A confidence measure from 0.0 to 1.0 of whether the track is acoustic.

src/commonMain/kotlin/com.adamratzman.spotify/models/PagingObjects.kt

@@ -253,7 +253,7 @@ abstract class AbstractPagingObject<T : Any>(
 
     @ExperimentalCoroutinesApi
     fun flowStartOrdered(): Flow<AbstractPagingObject<T>> =
-        flow<AbstractPagingObject<T>> {
+        flow {
             if (previous == null) return@flow
             flowBackward().toList().reversed().also {
                 emitAll(it.asFlow())

src/commonMain/kotlin/com.adamratzman.spotify/utils/Base64.kt

@@ -4,12 +4,9 @@ package com.adamratzman.spotify.utils
 import io.ktor.utils.io.core.String
 import io.ktor.utils.io.core.toByteArray
 
-private val BASE64_ALPHABET: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-private val BASE64_MASK: Byte = 0x3f
-private val BASE64_PAD: Char = '='
-private val BASE64_INVERSE_ALPHABET = IntArray(256) {
-    BASE64_ALPHABET.indexOf(it.toChar())
-}
+private const val BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+private const val BASE64_MASK = 0x3f
+private const val BASE64_PAD = '='
 
 private fun Int.toBase64(): Char = BASE64_ALPHABET[this]
 

src/jvmMain/kotlin/com/adamratzman/spotify/SpotifyLogger.kt

@@ -2,9 +2,9 @@
 package com.adamratzman.spotify
 
 actual class SpotifyLogger actual constructor(actual var enabled: Boolean) {
-    val redString = "\u001B[31m"
-    val orangeString = "\u001B[33m"
-    val resetString = "\u001B[0m"
+    private val redString = "\u001B[31m"
+    private val orangeString = "\u001B[33m"
+    private val resetString = "\u001B[0m"
 
     actual fun logInfo(message: String) {
         if (enabled) println("Spotify Logger Info: $message")