remove CountryCode usages

Author: adamint

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

@@ -9,13 +9,13 @@ import com.adamratzman.spotify.http.EndpointBuilder
 import com.adamratzman.spotify.http.SpotifyEndpoint
 import com.adamratzman.spotify.http.encodeUrl
 import com.adamratzman.spotify.models.AlbumUri
-import com.adamratzman.spotify.models.CountryCode
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.SavedAlbum
 import com.adamratzman.spotify.models.SavedTrack
 import com.adamratzman.spotify.models.TrackUri
 import com.adamratzman.spotify.models.serialization.toList
 import com.adamratzman.spotify.models.serialization.toPagingObject
+import com.adamratzman.spotify.utils.Market
 import kotlinx.serialization.list
 import kotlinx.serialization.serializer
 
@@ -41,7 +41,7 @@ class ClientLibraryApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
     fun getSavedTracks(
         limit: Int? = null,
         offset: Int? = null,
-        market: CountryCode? = null
+        market: Market? = null
     ): SpotifyRestActionPaging<SavedTrack, PagingObject<SavedTrack>> {
         return toActionPaging {
             get(
@@ -66,7 +66,7 @@ class ClientLibraryApi(api: SpotifyApi<*, *>) : SpotifyEndpoint(api) {
     fun getSavedAlbums(
         limit: Int? = null,
         offset: Int? = null,
-        market: CountryCode? = null
+        market: Market? = null
     ): SpotifyRestActionPaging<SavedAlbum, PagingObject<SavedAlbum>> {
         return toActionPaging {
             get(

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

@@ -1,6 +1,7 @@
 /* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.models
 
+import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.match
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -51,7 +52,7 @@ data class SimpleAlbum(
     override val uri: AlbumUri get() = super.uri as AlbumUri
 
     @Transient
-    val availableMarkets = availableMarketsString.map { CountryCode.valueOf(it) }
+    val availableMarkets = availableMarketsString.map { Market.valueOf(it) }
 
     @Transient
     val albumType: AlbumResultType = albumTypeString.let { _ ->
@@ -69,7 +70,7 @@ data class SimpleAlbum(
      *
      * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
      */
-    fun toFullAlbum(market: CountryCode? = null) = api.albums.getAlbum(id, market)
+    fun toFullAlbum(market: Market? = null) = api.albums.getAlbum(id, market)
 }
 
 /**
@@ -140,7 +141,7 @@ data class Album(
     override val uri: AlbumUri get() = super.uri as AlbumUri
 
     @Transient
-    val availableMarkets = availableMarketsString.map { CountryCode.valueOf(it) }
+    val availableMarkets = availableMarketsString.map { Market.valueOf(it) }
 
     @Transient
     val externalIds = externalIdsString.map { ExternalId(it.key, it.value) }
@@ -163,9 +164,9 @@ data class SpotifyCopyright(
 ) {
     @Transient
     val text = textString
-        .removePrefix("(P)")
-        .removePrefix("(C)")
-        .trim()
+            .removePrefix("(P)")
+            .removePrefix("(C)")
+            .trim()
     @Transient
     val type = CopyrightType.values().match(typeString)!!
 }

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

@@ -3,6 +3,7 @@ package com.adamratzman.spotify.models
 
 import com.adamratzman.spotify.SpotifyRestAction
 import com.adamratzman.spotify.endpoints.client.PlaylistSnapshot
+import com.adamratzman.spotify.utils.Market
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -58,8 +59,8 @@ data class SimplePlaylist(
      *
      * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
      */
-    fun toFullPlaylist(market: CountryCode? = null): SpotifyRestAction<Playlist?> =
-        api.playlists.getPlaylist(id, market)
+    fun toFullPlaylist(market: Market? = null): SpotifyRestAction<Playlist?> =
+            api.playlists.getPlaylist(id, market)
 }
 
 /**

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

@@ -1,6 +1,7 @@
 /* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.models
 
+import com.adamratzman.spotify.utils.Market
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -61,7 +62,7 @@ data class SimpleTrack(
     override val uri: TrackUri get() = super.uri as TrackUri
 
     @Transient
-    val availableMarkets = availableMarketsString.map { CountryCode.valueOf(it) }
+    val availableMarkets = availableMarketsString.map { Market.valueOf(it) }
 
     @Transient
     val externalIds = externalIdsString.map { ExternalId(it.key, it.value) }
@@ -72,7 +73,7 @@ data class SimpleTrack(
      *
      * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
      */
-    fun toFullTrack(market: CountryCode? = null) = api.tracks.getTrack(id, market)
+    fun toFullTrack(market: Market? = null) = api.tracks.getTrack(id, market)
 }
 
 /**
@@ -138,16 +139,16 @@ data class Track(
     val episode: Boolean? = null,
     val track: Boolean? = null
 ) : RelinkingAvailableResponse(
-    linked_from,
-    href,
-    id,
-    if (uriString.contains("local:")) LocalTrackUri(uriString) else TrackUri(uriString),
-    externalUrlsString
+        linked_from,
+        href,
+        id,
+        if (uriString.contains("local:")) LocalTrackUri(uriString) else TrackUri(uriString),
+        externalUrlsString
 ) {
     override val uri: TrackUri get() = super.uri as TrackUri
 
     @Transient
-    val availableMarkets = availableMarketsString.map { CountryCode.valueOf(it) }
+    val availableMarkets = availableMarketsString.map { Market.valueOf(it) }
 
     @Transient
     val externalIds = externalIdsString.map { ExternalId(it.key, it.value) }
@@ -178,7 +179,7 @@ data class LinkedTrack(
      * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
      */
 
-    fun toFullTrack(market: CountryCode? = null) = api.tracks.getTrack(id, market)
+    fun toFullTrack(market: Market? = null) = api.tracks.getTrack(id, market)
 }
 
 @Serializable