Merge pull request #24 from molikuner/inlineUris

Clean classes for URIs

Author: adamint

src/main/kotlin/com/adamratzman/spotify/utils/SpotifyUris.kt

@@ -20,33 +20,25 @@ private fun String.remove(type: String): String {
     throw SpotifyUriException("Illegal Spotify ID/URI: '$this' isn't convertible to '$type' id")
 }
 
-abstract class SpotifyUri(tmp: String, val input: String = tmp.replace(" ", "")) {
-    abstract val uri: String
-    abstract val id: String
+sealed class SpotifyUri(input: String, type: String) {
+    val uri: String
+    val id: String
+
+    init {
+        input.replace(" ", "").also {
+            this.uri = it.add(type)
+            this.id = it.remove(type)
+        }
+    }
 }
 
-class AlbumURI(input: String) : SpotifyUri(input) {
-    override val uri: String = super.input.add("album")
-    override val id: String = super.input.remove("album")
-}
+class AlbumURI(input: String) : SpotifyUri(input, "album")
 
-class ArtistURI(input: String) : SpotifyUri(input) {
-    override val uri: String = super.input.add("artist")
-    override val id: String = super.input.remove("artist")
-}
+class ArtistURI(input: String) : SpotifyUri(input, "artist")
 
-class TrackURI(input: String) : SpotifyUri(input) {
-    override val uri: String = super.input.add("track")
-    override val id: String = super.input.remove("track")
-}
+class TrackURI(input: String) : SpotifyUri(input, "track")
 
-class UserURI(input: String) : SpotifyUri(input) {
-    override val uri: String = super.input.add("user")
-    override val id: String = super.input.remove("user")
-}
+class UserURI(input: String) : SpotifyUri(input, "user")
 
-class PlaylistURI(input: String) : SpotifyUri(input) {
-    override val uri: String = super.input.add("playlist")
-    override val id: String = super.input.remove("playlist")
-}
+class PlaylistURI(input: String) : SpotifyUri(input, "playlist")