Remove not used interface

Author: adhesivee

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

@@ -14,12 +14,14 @@ import nl.myndocs.oauth2.token.CodeToken
 import nl.myndocs.oauth2.token.TokenStore
 import nl.myndocs.oauth2.token.converter.AccessTokenConverter
 import nl.myndocs.oauth2.token.converter.CodeTokenConverter
+import nl.myndocs.oauth2.token.converter.RefreshTokenConverter
 
 class TokenService(
         private val identityService: IdentityService,
         private val clientService: ClientService,
         private val tokenStore: TokenStore,
         private val accessTokenConverter: AccessTokenConverter,
+        private val refreshTokenConverter: RefreshTokenConverter,
         private val codeTokenConverter: CodeTokenConverter
 ) {
     /**
@@ -57,7 +59,12 @@ class TokenService(
         val accessToken = accessTokenConverter.convertToToken(
                 requestedIdentity.username,
                 requestedClient.clientId,
-                requestedScopes
+                requestedScopes,
+                refreshTokenConverter.convertToToken(
+                        requestedIdentity.username,
+                        requestedClient.clientId,
+                        requestedScopes
+                )
         )
 
         tokenStore.storeAccessToken(accessToken)
@@ -79,7 +86,12 @@ class TokenService(
         val accessToken = accessTokenConverter.convertToToken(
                 consumeCodeToken.username,
                 consumeCodeToken.clientId,
-                consumeCodeToken.scopes
+                consumeCodeToken.scopes,
+                refreshTokenConverter.convertToToken(
+                        consumeCodeToken.username,
+                        consumeCodeToken.clientId,
+                        consumeCodeToken.scopes
+                )
         )
 
         tokenStore.storeAccessToken(accessToken)

kotlin-oauth2-server-core/src/main/java/nl/myndocs/oauth2/token/converter/AccessTokenConverter.kt

@@ -3,6 +3,6 @@ package nl.myndocs.oauth2.token.converter
 import nl.myndocs.oauth2.token.AccessToken
 import nl.myndocs.oauth2.token.RefreshToken
 
-interface AccessTokenConverter : TokenConverter<AccessToken> {
+interface AccessTokenConverter {
     fun convertToToken(username: String, clientId: String, requestedScopes: Set<String>, refreshToken: RefreshToken?): AccessToken
 }

kotlin-oauth2-server-core/src/main/java/nl/myndocs/oauth2/token/converter/RefreshTokenConverter.kt

@@ -2,4 +2,6 @@ package nl.myndocs.oauth2.token.converter
 
 import nl.myndocs.oauth2.token.RefreshToken
 
-interface RefreshTokenConverter : TokenConverter<RefreshToken>
+interface RefreshTokenConverter {
+    fun convertToToken(username: String, clientId: String, requestedScopes: Set<String>): RefreshToken
+}

kotlin-oauth2-server-core/src/main/java/nl/myndocs/oauth2/token/converter/TokenConverter.kt

@@ -6,18 +6,8 @@ import java.time.Instant
 import java.util.*
 
 class UUIDAccessTokenConverter(
-        private val accessTokenExpireInSeconds: Int = 3600,
-        private val refreshTokenConverter: TokenConverter<RefreshToken>? = null
+        private val accessTokenExpireInSeconds: Int = 3600
 ) : AccessTokenConverter {
-    override fun convertToToken(username: String, clientId: String, requestedScopes: Set<String>): AccessToken {
-        var refreshToken: RefreshToken? = null
-
-        if (refreshTokenConverter != null) {
-            refreshToken = refreshTokenConverter.convertToToken(username, clientId, requestedScopes)
-        }
-
-        return convertToToken(username, clientId, requestedScopes, refreshToken)
-    }
 
     override fun convertToToken(username: String, clientId: String, requestedScopes: Set<String>, refreshToken: RefreshToken?): AccessToken {
         return AccessToken(

kotlin-oauth2-server-core/src/main/java/nl/myndocs/oauth2/token/converter/UUIDAccessTokenConverter.kt

@@ -18,12 +18,14 @@ class Oauth2ServerFeature(configuration: Configuration) {
     val identityService = configuration.identityService!!
     val tokenStore = configuration.tokenStore!!
     val accessTokenConverter = configuration.accessTokenConverter
+    val refreshTokenConverter = configuration.refreshTokenConverter
     val codeTokenConverter = configuration.codeTokenConverter
     val tokenService = TokenService(
             identityService,
             clientService,
             tokenStore,
             accessTokenConverter,
+            refreshTokenConverter,
             codeTokenConverter
     )
 
@@ -33,7 +35,8 @@ class Oauth2ServerFeature(configuration: Configuration) {
         var clientService: ClientService? = null
         var identityService: IdentityService? = null
         var tokenStore: TokenStore? = null
-        var accessTokenConverter: AccessTokenConverter = UUIDAccessTokenConverter(refreshTokenConverter = UUIDRefreshTokenConverter())
+        var accessTokenConverter: AccessTokenConverter = UUIDAccessTokenConverter()
+        val refreshTokenConverter = UUIDRefreshTokenConverter()
         var codeTokenConverter: CodeTokenConverter = UUIDCodeTokenConverter()
     }