introduce java-friendly, less verbose builder

Author: adamint

src/main/kotlin/com/adamratzman/spotify/main/SpotifyAPI.kt

@@ -13,8 +13,57 @@ import java.util.concurrent.TimeUnit
 
 internal val base = "https://api.spotify.com/v1"
 
+// Kotlin DSL builder
 fun spotifyApi(block: SpotifyApiBuilder.() -> Unit) = SpotifyApiBuilder().apply(block)
 
+// Java-friendly builder
+class SpotifyApiBuilderJava(val clientId: String, val clientSecret: String) {
+    var redirectUri: String? = null
+    var authorizationCode: String? = null
+    var tokenString: String? = null
+    var token: Token? = null
+
+    fun redirectUri(redirectUri: String?): SpotifyApiBuilderJava {
+        this.redirectUri = redirectUri
+        return this
+    }
+
+    fun authorizationCode(authorizationCode: String?): SpotifyApiBuilderJava {
+        this.authorizationCode = authorizationCode
+        return this
+    }
+
+    fun tokenString(tokenString: String?): SpotifyApiBuilderJava {
+        this.tokenString = tokenString
+        return this
+    }
+
+    fun token(token: Token?): SpotifyApiBuilderJava {
+        this.token = token
+        return this
+    }
+
+    fun buildCredentialed() = spotifyApi {
+        credentials {
+            clientId = this@SpotifyApiBuilderJava.clientId
+            clientSecret = this@SpotifyApiBuilderJava.clientSecret
+        }
+    }.buildCredentialed()
+
+    fun buildClient(automaticRefresh: Boolean=false) = spotifyApi {
+        credentials{
+            clientId = this@SpotifyApiBuilderJava.clientId
+            clientSecret = this@SpotifyApiBuilderJava.clientSecret
+            redirectUri = this@SpotifyApiBuilderJava.redirectUri
+        }
+        clientAuthentication {
+            authorizationCode = this@SpotifyApiBuilderJava.authorizationCode
+            tokenString = this@SpotifyApiBuilderJava.tokenString
+            token = this@SpotifyApiBuilderJava.token
+        }
+    }.buildClient(automaticRefresh)
+}
+
 /**
  * @property clientId the client id of your Spotify application
  * @property clientSecret the client secret of your Spotify application

src/test/kotlin/com/adamratzman/spotify/Common.kt

@@ -19,7 +19,7 @@ val api = when {
                 redirectUri = System.getProperty("spotifyRedirectUri")
             }
             clientAuthentication {
-                tokenString = System.getProperty("spotifyTokenString")
+                authorizationCode = System.getProperty("spotifyAuthCode")
             }
         }.buildClient()
     }