replace kotlinx.serialization with klaxon

Signed-off-by: Adam Ratzman <adam@adamratzman.com>

Author: adamint

.gitignore

@@ -29,8 +29,7 @@
 .idea/**/gradle.xml
 .idea/**/libraries
 
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
+# Gradle and Maven with auto-# When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
 .idea/modules.xml

README.md

@@ -38,21 +38,7 @@ dependencies {
 ```
 
 #### Android
-This library should work out of the box on Android too.
-
-If you're using Proguard, please add this to `proguard-rules.pro`:
-```
--keepattributes *Annotation*, InnerClasses
--dontnote kotlinx.serialization.SerializationKt
--keep,includedescriptorclasses class com.yourcompany.yourpackage.**$$serializer { *; } # <-- change package name to your app's
--keepclassmembers class com.yourcompany.yourpackage.** { # <-- change package name to your app's
-    *** Companion;
-}
--keepclasseswithmembers class com.yourcompany.yourpackage.** { # <-- change package name to your app's
-    kotlinx.serialization.KSerializer serializer(...);
-}
-
-
+This library should work out of the box on Android.
 ```
 
 ## Creating a SpotifyAPI or SpotifyClientAPI object

build.gradle

@@ -4,7 +4,6 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
     }
 }
 
@@ -17,7 +16,6 @@ plugins {
 }
 
 apply plugin: 'kotlin'
-apply plugin: 'kotlinx-serialization'
 
 group 'com.adamratzman'
 version '2.0.0'
@@ -28,20 +26,19 @@ sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    jcenter()
     maven { url "https://dl.bintray.com/spekframework/spek" }
-    maven { url "https://kotlin.bintray.com/kotlinx" }
 }
 
 dependencies {
     // Actual library dependencies
     implementation(group: 'org.json', name: 'json', version: '20180130')
 
+    implementation 'com.beust:klaxon:5.0.1'
+
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
-    
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.9.1"
-
     // Spek testing requirements
     testImplementation('org.spekframework.spek2:spek-dsl-jvm:2.0.0-rc.1') {
         exclude group: 'org.jetbrains.kotlin'

src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientFollowingAPI.kt

@@ -5,7 +5,6 @@ import com.adamratzman.spotify.endpoints.public.FollowingAPI
 import com.adamratzman.spotify.main.SpotifyAPI
 import com.adamratzman.spotify.main.SpotifyClientAPI
 import com.adamratzman.spotify.main.SpotifyRestAction
-import com.adamratzman.spotify.main.SpotifyRestPagingAction
 import com.adamratzman.spotify.utils.Artist
 import com.adamratzman.spotify.utils.ArtistURI
 import com.adamratzman.spotify.utils.CursorBasedPagingObject
@@ -14,10 +13,8 @@ import com.adamratzman.spotify.utils.PlaylistURI
 import com.adamratzman.spotify.utils.SpotifyPublicUser
 import com.adamratzman.spotify.utils.UserURI
 import com.adamratzman.spotify.utils.encode
+import com.adamratzman.spotify.utils.toArray
 import com.adamratzman.spotify.utils.toCursorBasedPagingObject
-import com.adamratzman.spotify.utils.toObject
-import kotlinx.serialization.internal.ArrayListSerializer
-import kotlinx.serialization.internal.BooleanSerializer
 import java.util.function.Supplier
 
 /**
@@ -69,7 +66,7 @@ class ClientFollowingAPI(api: SpotifyAPI) : FollowingAPI(api) {
             get(
                 EndpointBuilder("/me/following/contains").with("type", "user")
                     .with("ids", users.joinToString(",") { UserURI(it).id.encode() }).toString()
-            ).toObject(api, ArrayListSerializer(BooleanSerializer)).toList()
+            ).toArray<Boolean>(api)
         })
     }
 
@@ -98,7 +95,7 @@ class ClientFollowingAPI(api: SpotifyAPI) : FollowingAPI(api) {
             get(
                 EndpointBuilder("/me/following/contains").with("type", "artist")
                     .with("ids", artists.joinToString(",") { ArtistURI(it).id.encode() }).toString()
-            ).toObject(api, ArrayListSerializer(BooleanSerializer)).toList()
+            ).toArray<Boolean>(api)
         })
     }
 
@@ -111,14 +108,14 @@ class ClientFollowingAPI(api: SpotifyAPI) : FollowingAPI(api) {
     fun getFollowedArtists(
         limit: Int? = null,
         after: String? = null
-    ): SpotifyRestPagingAction<Artist, CursorBasedPagingObject<Artist>> {
-        return toPagingObjectAction(Supplier {
+    ): SpotifyRestAction<CursorBasedPagingObject<Artist>> {
+        return toAction(Supplier {
             get(
                 EndpointBuilder("/me/following").with("type", "artist").with("limit", limit).with(
                     "after",
                     after
                 ).toString()
-            ).toCursorBasedPagingObject("artists", this, CursorBasedPagingObject.serializer(Artist.serializer()))
+            ).toCursorBasedPagingObject<Artist>("artists", this)
         })
     }
 

src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientLibraryAPI.kt

@@ -3,7 +3,6 @@ package com.adamratzman.spotify.endpoints.client
 
 import com.adamratzman.spotify.main.SpotifyAPI
 import com.adamratzman.spotify.main.SpotifyRestAction
-import com.adamratzman.spotify.main.SpotifyRestPagingAction
 import com.adamratzman.spotify.utils.AlbumURI
 import com.adamratzman.spotify.utils.EndpointBuilder
 import com.adamratzman.spotify.utils.Market
@@ -13,10 +12,8 @@ import com.adamratzman.spotify.utils.SavedTrack
 import com.adamratzman.spotify.utils.SpotifyEndpoint
 import com.adamratzman.spotify.utils.TrackURI
 import com.adamratzman.spotify.utils.encode
-import com.adamratzman.spotify.utils.toObject
+import com.adamratzman.spotify.utils.toArray
 import com.adamratzman.spotify.utils.toPagingObject
-import kotlinx.serialization.internal.ArrayListSerializer
-import kotlinx.serialization.internal.BooleanSerializer
 import java.util.function.Supplier
 
 /**
@@ -32,12 +29,12 @@ class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         limit: Int? = null,
         offset: Int? = null,
         market: Market? = null
-    ): SpotifyRestPagingAction<SavedTrack, PagingObject<SavedTrack>> {
-        return toPagingObjectAction(Supplier {
+    ): SpotifyRestAction<PagingObject<SavedTrack>> {
+        return toAction(Supplier {
             get(
                 EndpointBuilder("/me/tracks").with("limit", limit).with("offset", offset).with("market", market?.code)
                     .toString()
-            ).toPagingObject(endpoint = this, serializer = PagingObject.serializer(SavedTrack.serializer()))
+            ).toPagingObject<SavedTrack>(endpoint = this)
         })
     }
 
@@ -50,12 +47,12 @@ class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         limit: Int? = null,
         offset: Int? = null,
         market: Market? = null
-    ): SpotifyRestPagingAction<SavedAlbum, PagingObject<SavedAlbum>> {
-        return toPagingObjectAction(Supplier {
+    ): SpotifyRestAction<PagingObject<SavedAlbum>> {
+        return toAction(Supplier {
             get(
                 EndpointBuilder("/me/albums").with("limit", limit).with("offset", offset).with("market", market?.code)
                     .toString()
-            ).toPagingObject(endpoint = this, serializer = PagingObject.serializer(SavedAlbum.serializer()))
+            ).toPagingObject<SavedAlbum>(endpoint = this)
         })
     }
 
@@ -80,7 +77,7 @@ class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                 EndpointBuilder("/me/$type/contains").with("ids", ids.joinToString(",") { type.id(it).encode() })
                     .toString()
-            ).toObject(api, ArrayListSerializer(BooleanSerializer)).toList()
+            ).toArray<Boolean>(api)
         })
     }
 

src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPersonalizationAPI.kt

@@ -2,7 +2,7 @@
 package com.adamratzman.spotify.endpoints.client
 
 import com.adamratzman.spotify.main.SpotifyAPI
-import com.adamratzman.spotify.main.SpotifyRestPagingAction
+import com.adamratzman.spotify.main.SpotifyRestAction
 import com.adamratzman.spotify.utils.Artist
 import com.adamratzman.spotify.utils.EndpointBuilder
 import com.adamratzman.spotify.utils.PagingObject
@@ -33,11 +33,17 @@ class ClientPersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @return [PagingObject] of full [Artist] objects sorted by affinity
      */
-    fun getTopArtists(limit: Int? = null, offset: Int? = null, timeRange: TimeRange? = null): SpotifyRestPagingAction<Artist, PagingObject<Artist>> {
-        return toPagingObjectAction(Supplier {
-            get(EndpointBuilder("/me/top/artists").with("limit", limit).with("offset", offset)
-                    .with("time_range", timeRange).toString())
-                .toPagingObject(endpoint = this, serializer = PagingObject.serializer(Artist.serializer()))
+    fun getTopArtists(
+        limit: Int? = null,
+        offset: Int? = null,
+        timeRange: TimeRange? = null
+    ): SpotifyRestAction<PagingObject<Artist>> {
+        return toAction(Supplier {
+            get(
+                EndpointBuilder("/me/top/artists").with("limit", limit).with("offset", offset)
+                    .with("time_range", timeRange).toString()
+            )
+                .toPagingObject<Artist>(endpoint = this)
         })
     }
 
@@ -53,11 +59,17 @@ class ClientPersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @return [PagingObject] of full [Track] objects sorted by affinity
      */
-    fun getTopTracks(limit: Int? = null, offset: Int? = null, timeRange: TimeRange? = null): SpotifyRestPagingAction<Track, PagingObject<Track>> {
-        return toPagingObjectAction(Supplier {
-            get(EndpointBuilder("/me/top/tracks").with("limit", limit).with("offset", offset)
-                    .with("time_range", timeRange).toString())
-                .toPagingObject(endpoint = this, serializer = PagingObject.serializer(Track.serializer()))
+    fun getTopTracks(
+        limit: Int? = null,
+        offset: Int? = null,
+        timeRange: TimeRange? = null
+    ): SpotifyRestAction<PagingObject<Track>> {
+        return toAction(Supplier {
+            get(
+                EndpointBuilder("/me/top/tracks").with("limit", limit).with("offset", offset)
+                    .with("time_range", timeRange).toString()
+            )
+                .toPagingObject<Track>(endpoint = this)
         })
     }
 }

src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlayerAPI.kt

@@ -3,7 +3,6 @@ package com.adamratzman.spotify.endpoints.client
 
 import com.adamratzman.spotify.main.SpotifyAPI
 import com.adamratzman.spotify.main.SpotifyRestAction
-import com.adamratzman.spotify.main.SpotifyRestPagingAction
 import com.adamratzman.spotify.utils.AlbumURI
 import com.adamratzman.spotify.utils.ArtistURI
 import com.adamratzman.spotify.utils.BadRequestException
@@ -16,11 +15,11 @@ import com.adamratzman.spotify.utils.PlayHistory
 import com.adamratzman.spotify.utils.PlaylistURI
 import com.adamratzman.spotify.utils.SpotifyEndpoint
 import com.adamratzman.spotify.utils.TrackURI
+import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.encode
 import com.adamratzman.spotify.utils.toCursorBasedPagingObject
 import com.adamratzman.spotify.utils.toInnerObject
 import com.adamratzman.spotify.utils.toObject
-import kotlinx.serialization.list
 import org.json.JSONObject
 import java.util.function.Supplier
 
@@ -31,38 +30,37 @@ import java.util.function.Supplier
 class ClientPlayerAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun getDevices(): SpotifyRestAction<List<Device>> {
         return toAction(Supplier {
-            get(EndpointBuilder("/me/player/devices").toString()).toInnerObject(
-                "devices",
-                api,
-                Device.serializer().list
-            ).toList()
+            get(EndpointBuilder("/me/player/devices").toString()).toInnerObject<List<Device>>(
+                "devices", api
+            )
         })
     }
 
     fun getCurrentContext(): SpotifyRestAction<CurrentlyPlayingContext?> {
         return toAction(Supplier {
-            val obj: CurrentlyPlayingContext? =
+            val obj = catch {
                 get(EndpointBuilder("/me/player").toString())
-                    .toObject(api, CurrentlyPlayingContext.serializer())
+                    .toObject<CurrentlyPlayingContext>(api)
+            }
             if (obj?.timestamp == null) null else obj
         })
     }
 
-    fun getRecentlyPlayed(): SpotifyRestPagingAction<PlayHistory, CursorBasedPagingObject<PlayHistory>> {
-        return toPagingObjectAction(Supplier {
-            get(EndpointBuilder("/me/player/recently-played").toString()).toCursorBasedPagingObject(
-                endpoint = this,
-                serializer = CursorBasedPagingObject.serializer(PlayHistory.serializer())
+    fun getRecentlyPlayed(): SpotifyRestAction<CursorBasedPagingObject<PlayHistory>> {
+        return toAction(Supplier {
+            get(EndpointBuilder("/me/player/recently-played").toString()).toCursorBasedPagingObject<PlayHistory>(
+                endpoint = this
             )
         })
     }
 
     fun getCurrentlyPlaying(): SpotifyRestAction<CurrentlyPlayingObject?> {
         return toAction(Supplier {
-            val obj: CurrentlyPlayingObject? = get(EndpointBuilder("/me/player/currently-playing").toString()).toObject(
-                api,
-                CurrentlyPlayingObject.serializer()
-            )
+            val obj =
+                catch {
+                    get(EndpointBuilder("/me/player/currently-playing").toString())
+                        .toObject<CurrentlyPlayingObject>(api)
+                }
             if (obj?.timestamp == null) null else obj
         })
     }

src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlaylistAPI.kt

@@ -5,7 +5,6 @@ import com.adamratzman.spotify.endpoints.public.PlaylistsAPI
 import com.adamratzman.spotify.main.SpotifyAPI
 import com.adamratzman.spotify.main.SpotifyClientAPI
 import com.adamratzman.spotify.main.SpotifyRestAction
-import com.adamratzman.spotify.main.SpotifyRestPagingAction
 import com.adamratzman.spotify.utils.BadRequestException
 import com.adamratzman.spotify.utils.EndpointBuilder
 import com.adamratzman.spotify.utils.ErrorObject
@@ -18,7 +17,6 @@ import com.adamratzman.spotify.utils.UserURI
 import com.adamratzman.spotify.utils.encode
 import com.adamratzman.spotify.utils.toObject
 import com.adamratzman.spotify.utils.toPagingObject
-import kotlinx.serialization.Serializable
 import org.json.JSONArray
 import org.json.JSONObject
 import java.awt.image.BufferedImage
@@ -63,8 +61,10 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistsAPI(api) {
             if (description != null) json.put("description", description)
             if (public != null) json.put("public", public)
             if (collaborative != null) json.put("collaborative", collaborative)
-            post(EndpointBuilder("/users/${UserURI(user).id.encode()}/playlists").toString(),
-                json.toString()).toObject(api, Playlist.serializer())
+            post(
+                EndpointBuilder("/users/${UserURI(user).id.encode()}/playlists").toString(),
+                json.toString()
+            ).toObject<Playlist>(api)
         })
     }
 
@@ -129,12 +129,12 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistsAPI(api) {
     fun getClientPlaylists(
         limit: Int? = null,
         offset: Int? = null
-    ): SpotifyRestPagingAction<SimplePlaylist, PagingObject<SimplePlaylist>> {
+    ): SpotifyRestAction<PagingObject<SimplePlaylist>> {
         if (limit != null && limit !in 1..50) throw IllegalArgumentException("Limit must be between 1 and 50. Provided $limit")
         if (offset != null && offset !in 0..100000) throw IllegalArgumentException("Offset must be between 0 and 100,000. Provided $limit")
-        return toPagingObjectAction(Supplier {
+        return toAction(Supplier {
             get(EndpointBuilder("/me/playlists").with("limit", limit).with("offset", offset).toString())
-                .toPagingObject(endpoint = this, serializer = PagingObject.serializer(SimplePlaylist.serializer()))
+                .toPagingObject<SimplePlaylist>(endpoint = this)
         })
     }
 
@@ -147,7 +147,7 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistsAPI(api) {
      */
     fun getClientPlaylist(id: String): SpotifyRestAction<SimplePlaylist?> {
         return toAction(Supplier {
-            val playlists = getClientPlaylists().completeWithPaging()
+            val playlists = getClientPlaylists().complete()
             playlists.items.find { it.id == id } ?: playlists.getAllItems().complete().find { it.id == id }
         })
     }
@@ -195,7 +195,7 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistsAPI(api) {
             if (reorderRangeLength != null) json.put("range_length", reorderRangeLength)
             if (snapshotId != null) json.put("snapshot_id", snapshotId)
             put(EndpointBuilder("/playlists/${PlaylistURI(playlist).id.encode()}/tracks").toString(), json.toString())
-                .toObject(api, Snapshot.serializer())
+                .toObject<Snapshot>(api)
         })
     }
 
@@ -330,7 +330,6 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistsAPI(api) {
         return DatatypeConverter.printBase64Binary(bos.toByteArray())
     }
 
-    @Serializable
     data class Snapshot(val snapshot_id: String)
 }