Simplifications and cleaning up unused imports

oauth2-server-core/src/main/java/nl/myndocs/oauth2/CallRouter.kt

@@ -15,20 +15,19 @@ import nl.myndocs.oauth2.router.RedirectRouter
 import nl.myndocs.oauth2.router.RedirectRouterResponse
 
 class CallRouter(
-        val tokenEndpoint: String,
-        val authorizeEndpoint: String,
-        val tokenInfoEndpoint: String,
-        private val tokenInfoCallback: (TokenInfo) -> Map<String, Any?>,
-        private val granters: List<GrantingCall.() -> Granter>,
-        private val grantingCallFactory: (CallContext) -> GrantingCall
+    val tokenEndpoint: String,
+    val authorizeEndpoint: String,
+    val tokenInfoEndpoint: String,
+    private val tokenInfoCallback: (TokenInfo) -> Map<String, Any?>,
+    private val granters: List<GrantingCall.() -> Granter>,
+    private val grantingCallFactory: (CallContext) -> GrantingCall
 ) : RedirectRouter {
     companion object {
         const val METHOD_POST = "post"
         const val METHOD_GET = "get"
 
         const val STATUS_BAD_REQUEST = 400
         const val STATUS_UNAUTHORIZED = 401
-
     }
 
     fun route(callContext: CallContext) {
@@ -45,24 +44,21 @@ class CallRouter(
         }
     }
 
-
     private fun routeTokenEndpoint(callContext: CallContext) {
         if (callContext.method.toLowerCase() != METHOD_POST) {
             return
         }
 
         try {
             val grantType = callContext.formParameters["grant_type"]
-                    ?: throw InvalidRequestException("'grant_type' not given")
+                ?: throw InvalidRequestException("'grant_type' not given")
 
             val grantingCall = grantingCallFactory(callContext)
 
-            val granterMap = granters
-                    .map {
-                        val granter = grantingCall.it()
-                        granter.grantType to granter
-                    }
-                    .toMap()
+            val granterMap = granters.associate {
+                val granter = grantingCall.it()
+                granter.grantType to granter
+            }
 
             val allowedGrantTypes = granterMap.keys
 
@@ -78,19 +74,19 @@ class CallRouter(
     }
 
     fun routeAuthorizationCodeRedirect(
-            callContext: CallContext,
-            credentials: Credentials?
+        callContext: CallContext,
+        credentials: Credentials?
     ): RedirectRouterResponse {
         val queryParameters = callContext.queryParameters
         try {
             val redirect = grantingCallFactory(callContext).redirect(
-                    RedirectAuthorizationCodeRequest(
-                            queryParameters["client_id"],
-                            queryParameters["redirect_uri"],
-                            credentials?.username,
-                            credentials?.password,
-                            queryParameters["scope"]
-                    )
+                RedirectAuthorizationCodeRequest(
+                    queryParameters["client_id"],
+                    queryParameters["redirect_uri"],
+                    credentials?.username,
+                    credentials?.password,
+                    queryParameters["scope"]
+                )
             )
 
             var stateQueryParameter = ""
@@ -109,33 +105,31 @@ class CallRouter(
         }
     }
 
-
     fun routeAccessTokenRedirect(
-            callContext: CallContext,
-            credentials: Credentials?
+        callContext: CallContext,
+        credentials: Credentials?
     ): RedirectRouterResponse {
         val queryParameters = callContext.queryParameters
 
         try {
             val redirect = grantingCallFactory(callContext).redirect(
-                    RedirectTokenRequest(
-                            queryParameters["client_id"],
-                            queryParameters["redirect_uri"],
-                            credentials?.username,
-                            credentials?.password,
-                            queryParameters["scope"]
-                    )
+                RedirectTokenRequest(
+                    queryParameters["client_id"],
+                    queryParameters["redirect_uri"],
+                    credentials?.username,
+                    credentials?.password,
+                    queryParameters["scope"]
+                )
             )
 
             var stateQueryParameter = ""
-
             if (queryParameters["state"] != null) {
                 stateQueryParameter = "&state=" + queryParameters["state"]
             }
 
             callContext.redirect(
-                    queryParameters["redirect_uri"] + "#access_token=${redirect.accessToken}" +
-                            "&token_type=bearer&expires_in=${redirect.expiresIn()}$stateQueryParameter"
+                queryParameters["redirect_uri"] + "#access_token=${redirect.accessToken}" +
+                        "&token_type=bearer&expires_in=${redirect.expiresIn()}$stateQueryParameter"
             )
 
             return RedirectRouterResponse(true)
@@ -153,7 +147,7 @@ class CallRouter(
             }
 
             val responseType = callContext.queryParameters["response_type"]
-                    ?: throw InvalidRequestException("'response_type' not given")
+                ?: throw InvalidRequestException("'response_type' not given")
 
             return when (responseType) {
                 "code" -> routeAuthorizationCodeRedirect(callContext, credentials)
@@ -185,7 +179,6 @@ class CallRouter(
         }
 
         val token = authorization.substring(7)
-
         val tokenInfoCallback = tokenInfoCallback(grantingCallFactory(callContext).tokenInfo(token))
 
         callContext.respondJson(tokenInfoCallback)

oauth2-server-core/src/main/java/nl/myndocs/oauth2/client/Client.kt

@@ -1,8 +1,8 @@
 package nl.myndocs.oauth2.client
 
 data class Client(
-        val clientId: String,
-        val clientScopes: Set<String>,
-        val redirectUris: Set<String>,
-        val authorizedGrantTypes: Set<String>
+    val clientId: String,
+    val clientScopes: Set<String>,
+    val redirectUris: Set<String>,
+    val authorizedGrantTypes: Set<String>
 )

oauth2-server-core/src/main/java/nl/myndocs/oauth2/client/ClientService.kt

@@ -2,6 +2,5 @@ package nl.myndocs.oauth2.client
 
 interface ClientService {
     fun clientOf(clientId: String): Client?
-
     fun validClient(client: Client, clientSecret: String): Boolean
 }

oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/CallRouterBuilder.kt

@@ -12,24 +12,24 @@ internal object CallRouterBuilder {
         var tokenInfoEndpoint: String = "/oauth/tokeninfo"
         var tokenInfoCallback: (TokenInfo) -> Map<String, Any?> = { tokenInfo ->
             mapOf(
-                    "username" to tokenInfo.identity?.username,
-                    "scopes" to tokenInfo.scopes
+                "username" to tokenInfo.identity?.username,
+                "scopes" to tokenInfo.scopes
             ).filterValues { it != null }
         }
         var granters: List<GrantingCall.() -> Granter> = listOf()
     }
 
     fun build(configuration: Configuration, grantingCallFactory: (CallContext) -> GrantingCall) = CallRouter(
-            configuration.tokenEndpoint,
-            configuration.authorizeEndpoint,
-            configuration.tokenInfoEndpoint,
-            configuration.tokenInfoCallback,
-            listOf<GrantingCall.() -> Granter>(
-                    { grantPassword() },
-                    { grantAuthorizationCode() },
-                    { grantClientCredentials() },
-                    { grantRefreshToken() }
-            ) + configuration.granters,
-            grantingCallFactory
+        configuration.tokenEndpoint,
+        configuration.authorizeEndpoint,
+        configuration.tokenInfoEndpoint,
+        configuration.tokenInfoCallback,
+        listOf<GrantingCall.() -> Granter>(
+            { grantPassword() },
+            { grantAuthorizationCode() },
+            { grantClientCredentials() },
+            { grantRefreshToken() }
+        ) + configuration.granters,
+        grantingCallFactory
     )
 }

oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/Configuration.kt

@@ -2,6 +2,4 @@ package nl.myndocs.oauth2.config
 
 import nl.myndocs.oauth2.CallRouter
 
-data class Configuration(
-        val callRouter: CallRouter
-)
+data class Configuration(val callRouter: CallRouter)

oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/ConfigurationBuilder.kt

@@ -54,7 +54,10 @@ object ConfigurationBuilder {
         var accessTokenResponder: AccessTokenResponder = DefaultAccessTokenResponder
     }
 
-    fun build(configurer: Configuration.() -> Unit, configuration: Configuration): nl.myndocs.oauth2.config.Configuration {
+    fun build(
+        configurer: Configuration.() -> Unit,
+        configuration: Configuration
+    ): nl.myndocs.oauth2.config.Configuration {
         configurer(configuration)
 
         val grantingCallFactory: (CallContext) -> GrantingCall = { callContext ->
@@ -64,23 +67,23 @@ object ConfigurationBuilder {
                 override val clientService = configuration.clientService!!
                 override val tokenStore = configuration.tokenStore!!
                 override val converters = Converters(
-                        configuration.accessTokenConverter,
-                        configuration.refreshTokenConverter,
-                        configuration.codeTokenConverter
+                    configuration.accessTokenConverter,
+                    configuration.refreshTokenConverter,
+                    configuration.codeTokenConverter
                 )
                 override val accessTokenResponder = configuration.accessTokenResponder
             }
         }
         return Configuration(
-                CallRouterBuilder.build(
-                        configuration.callRouterConfiguration,
-                        grantingCallFactory
-                )
+            CallRouterBuilder.build(
+                configuration.callRouterConfiguration,
+                grantingCallFactory
+            )
         )
     }
+
     fun build(configurer: Configuration.() -> Unit): nl.myndocs.oauth2.config.Configuration {
         val configuration = Configuration()
-
         return build(configurer, configuration)
     }
 }

oauth2-server-core/src/main/java/nl/myndocs/oauth2/exception/InvalidScopeException.kt

@@ -1,3 +1,4 @@
 package nl.myndocs.oauth2.exception
 
-class InvalidScopeException(val notAllowedScopes: Set<String>) : OauthException(OauthError.INVALID_SCOPE, "Scopes not allowed: $notAllowedScopes")
+class InvalidScopeException(val notAllowedScopes: Set<String>) :
+    OauthException(OauthError.INVALID_SCOPE, "Scopes not allowed: $notAllowedScopes")

oauth2-server-core/src/main/java/nl/myndocs/oauth2/exception/OauthExceptionUtil.kt

@@ -1,14 +1,8 @@
 package nl.myndocs.oauth2.exception
 
-fun OauthException.toMap(): Map<String, String> {
-
-    val mutableMapOf = mutableMapOf<String, String>(
-            "error" to this.error.errorName
-    )
-
-    if (this.errorDescription != null) {
-        mutableMapOf["error_description"] = this.errorDescription
+fun OauthException.toMap(): Map<String, String> = with(mutableMapOf("error" to error.errorName)) {
+    if (errorDescription != null) {
+        this["error_description"] = errorDescription
     }
-
-    return mutableMapOf.toMap()
+    toMap()
 }