Merge pull request #45 from saltanovas/feature/update-ktor

tkopalinskas · web-flow · commit a74e0ecf764b · 2023-06-20T11:42:21.000+03:00
Update Ktor to 2.2.4
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ JVM client implementing [kevin. platform API v0.3](https://api-reference.kevin.e
 ## Prerequisites
 
 - Java 8+
+- Ktor 2.x
 
 ## Installation
 
@@ -20,13 +21,13 @@ Package and installation instructions are available at the [Maven Central Reposi
 <dependency>
   <groupId>eu.kevin</groupId>
   <artifactId>kevin-jvm</artifactId>
-  <version>0.3.0</version>
+  <version>1.0.0</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-implementation 'eu.kevin:kevin-jvm:0.3.0'
+implementation 'eu.kevin:kevin-jvm:1.0.0'
 ```
 
 ## Usage Examples
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "eu.kevin"
-version = "0.3.0"
+version = "1.0.0"
 
 repositories {
     mavenCentral()
@@ -22,6 +22,8 @@ dependencies {
     implementation("io.ktor:ktor-client-core:${Versions.KTOR}")
     implementation("io.ktor:ktor-client-cio:${Versions.KTOR}")
     implementation("io.ktor:ktor-client-serialization:${Versions.KTOR}")
+    implementation("io.ktor:ktor-client-content-negotiation:${Versions.KTOR}")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:${Versions.KTOR}")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4")
 
     testImplementation(kotlin("test"))
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,6 +1,6 @@
 object Versions {
     const val KOTLIN = "1.6.10"
-    const val KTOR = "1.6.5"
+    const val KTOR = "2.2.4"
     const val KTLINT = "10.2.0"
     const val NEXUS_PUBLISH = "1.1.0"
-}
+}
diff --git a/src/main/kotlin/eu/kevin/api/Dependencies.kt b/src/main/kotlin/eu/kevin/api/Dependencies.kt
@@ -6,12 +6,12 @@ import eu.kevin.api.serializers.LocalDateSerializer
 import eu.kevin.api.serializers.LocalDateTimeSerializer
 import io.ktor.client.*
 import io.ktor.client.engine.cio.*
-import io.ktor.client.features.*
-import io.ktor.client.features.json.*
-import io.ktor.client.features.json.serializer.*
+import io.ktor.client.plugins.*
+import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
+import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
@@ -22,21 +22,22 @@ import java.time.LocalDateTime
 object Dependencies {
     val httpClient by lazy {
         HttpClient(CIO) {
-            install(JsonFeature) {
-                serializer = KotlinxSerializer(Dependencies.serializer)
+            install(ContentNegotiation) {
+                json(serializer)
+                expectSuccess = true
             }
             defaultRequest {
                 header(HttpHeaders.ContentType, ContentType.Application.Json)
             }
             HttpResponseValidator {
-                handleResponseException { exception ->
+                handleResponseExceptionWithRequest { exception, _ ->
                     when (exception) {
                         is ResponseException -> {
                             val status = exception.response.status
                             throw KevinApiErrorException(
                                 responseStatusCode = status.value,
                                 responseBody = if (status == HttpStatusCode.BadRequest)
-                                    serializer.decodeFromString(exception.response.readText())
+                                    serializer.decodeFromString(exception.response.bodyAsText())
                                 else null,
                                 externalMessage = exception.message
                             )
diff --git a/src/main/kotlin/eu/kevin/api/extensions/UrlExtensions.kt b/src/main/kotlin/eu/kevin/api/extensions/UrlExtensions.kt
diff --git a/src/main/kotlin/eu/kevin/api/models/payment/paymentStatus/GetPaymentStatusRequest.kt b/src/main/kotlin/eu/kevin/api/models/payment/paymentStatus/GetPaymentStatusRequest.kt
@@ -1,5 +1,5 @@
 package eu.kevin.api.models.payment.paymentStatus
 
-data class GetPaymentStatusRequest @JvmOverloads constructor(
+data class GetPaymentStatusRequest(
     val paymentId: String
 )
diff --git a/src/main/kotlin/eu/kevin/api/services/Client.kt b/src/main/kotlin/eu/kevin/api/services/Client.kt
@@ -8,23 +8,21 @@ import eu.kevin.api.services.auth.AuthClient
 import eu.kevin.api.services.general.GeneralClient
 import eu.kevin.api.services.payment.PaymentClient
 import io.ktor.client.*
-import io.ktor.client.features.*
+import io.ktor.client.plugins.*
 import io.ktor.client.request.*
 import io.ktor.http.*
-import kotlinx.serialization.json.Json
 import java.net.URI
 
 class Client internal constructor(
     private val authorization: Authorization,
     private val apiUrl: String,
     private val httpClient: HttpClient,
-    private val serializer: Json,
     private val customHeaders: Map<String, String>
 ) {
     val paymentClient by lazy { PaymentClient(httpClient = httpClient.withAuthorization()) }
     val authClient by lazy { AuthClient(httpClient = httpClient.withAuthorization()) }
     val generalClient by lazy { GeneralClient(httpClient = httpClient.withAuthorization()) }
-    val accountClient by lazy { AccountClient(httpClient = httpClient.withAuthorization(), serializer = serializer) }
+    val accountClient by lazy { AccountClient(httpClient = httpClient.withAuthorization()) }
 
     constructor(
         authorization: Authorization,
@@ -34,7 +32,6 @@ class Client internal constructor(
         authorization = authorization,
         apiUrl = apiUrl,
         httpClient = Dependencies.httpClient,
-        serializer = Dependencies.serializer,
         customHeaders = customHeaders
     )
 
diff --git a/src/main/kotlin/eu/kevin/api/services/account/AccountClient.kt b/src/main/kotlin/eu/kevin/api/services/account/AccountClient.kt
@@ -14,28 +14,26 @@ import eu.kevin.api.models.account.list.AccountResponse
 import eu.kevin.api.models.account.transaction.request.GetAccountTransactionsRequest
 import eu.kevin.api.models.account.transaction.response.AccountTransactionResponse
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.request.*
-import kotlinx.serialization.json.Json
 import java.util.concurrent.CompletableFuture
 
 /**
  * Implements API Methods of the [Account information service](https://api-reference.kevin.eu/public/platform/v0.3#tag/Account-Information-Service)
  */
 class AccountClient internal constructor(
-    private val httpClient: HttpClient,
-    private val serializer: Json
+    private val httpClient: HttpClient
 ) {
 
     /**
      *  API Method: [Get accounts list](https://api-reference.kevin.eu/public/platform/v0.3#tag/Account-Information-Service/operation/getAccounts)
      */
     @Throws(KevinApiErrorException::class)
     suspend fun getAccountsList(request: AccountRequestHeaders): List<AccountResponse> =
-        httpClient.get<ResponseArray<AccountResponse>>(
-            path = Endpoint.Paths.Account.getAccountsList()
-        ) {
+        httpClient.get {
+            url(path = Endpoint.Paths.Account.getAccountsList())
             appendAccountRequestHeaders(headers = request)
-        }.data
+        }.body<ResponseArray<AccountResponse>>().data
 
     /**
      * Equivalent of suspending `getAccountsList(request: AccountRequestHeaders)` for Java interoperability
@@ -50,11 +48,10 @@ class AccountClient internal constructor(
      */
     @Throws(KevinApiErrorException::class)
     suspend fun getAccountDetails(request: GetAccountDetailsRequest): AccountDetailsResponse =
-        httpClient.get(
-            path = Endpoint.Paths.Account.getAccountDetails(accountId = request.accountId)
-        ) {
+        httpClient.get {
+            url(path = Endpoint.Paths.Account.getAccountDetails(accountId = request.accountId))
             appendAccountRequestHeaders(headers = request.headers)
-        }
+        }.body()
 
     /**
      * Equivalent of suspending `getAccountDetails(request: GetAccountDetailsRequest)` for Java interoperability
@@ -69,13 +66,12 @@ class AccountClient internal constructor(
      */
     @Throws(KevinApiErrorException::class)
     suspend fun getAccountTransactions(request: GetAccountTransactionsRequest): List<AccountTransactionResponse> =
-        httpClient.get<ResponseArray<AccountTransactionResponse>>(
-            path = Endpoint.Paths.Account.getAccountTransactions(accountId = request.accountId)
-        ) {
+        httpClient.get {
+            url(path = Endpoint.Paths.Account.getAccountTransactions(accountId = request.accountId))
             appendAccountRequestHeaders(headers = request.headers)
             parameter("dateFrom", request.dateFrom)
             parameter("dateTo", request.dateTo)
-        }.data
+        }.body<ResponseArray<AccountTransactionResponse>>().data
 
     /**
      * Equivalent of suspending `getAccountTransactions(request: GetAccountTransactionsRequest)` for Java interoperability
@@ -90,11 +86,10 @@ class AccountClient internal constructor(
      */
     @Throws(KevinApiErrorException::class)
     suspend fun getAccountBalances(request: GetAccountBalanceRequest): List<AccountBalanceResponse> =
-        httpClient.get<ResponseArray<AccountBalanceResponse>>(
-            path = Endpoint.Paths.Account.getAccountBalance(accountId = request.accountId)
-        ) {
+        httpClient.get {
+            url(path = Endpoint.Paths.Account.getAccountBalance(accountId = request.accountId))
             appendAccountRequestHeaders(headers = request.headers)
-        }.data
+        }.body<ResponseArray<AccountBalanceResponse>>().data
 
     /**
      * Equivalent of suspending `getAccountBalances(request: GetAccountBalanceRequest)` for Java interoperability
@@ -116,4 +111,4 @@ class AccountClient internal constructor(
             }
         }
     }
-}
+}
diff --git a/src/main/kotlin/eu/kevin/api/services/auth/AuthClient.kt b/src/main/kotlin/eu/kevin/api/services/auth/AuthClient.kt
@@ -3,7 +3,6 @@ package eu.kevin.api.services.auth
 import eu.kevin.api.Endpoint
 import eu.kevin.api.exceptions.KevinApiErrorException
 import eu.kevin.api.extensions.appendAtStartIfNotExist
-import eu.kevin.api.extensions.appendQueryParameter
 import eu.kevin.api.extensions.suspendingToCompletableFuture
 import eu.kevin.api.models.auth.authentication.request.StartAuthenticationRequest
 import eu.kevin.api.models.auth.authentication.request.StartAuthenticationRequestBody
@@ -14,6 +13,7 @@ import eu.kevin.api.models.auth.token.response.ReceiveTokenResponse
 import eu.kevin.api.models.auth.tokenContent.ReceiveTokenContentRequest
 import eu.kevin.api.models.auth.tokenContent.ReceiveTokenContentResponse
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.http.*
 import java.util.concurrent.CompletableFuture
@@ -29,33 +29,27 @@ class AuthClient internal constructor(
      */
     @Throws(KevinApiErrorException::class)
     suspend fun startAuthentication(request: StartAuthenticationRequest): StartAuthenticationResponse =
-        httpClient.post<StartAuthenticationResponse>(
-            path = Endpoint.Paths.Auth.startAuthentication(),
-            body = StartAuthenticationRequestBody(
-                email = request.email,
-                cardMethod = request.cardMethod
+        httpClient.post {
+            url(path = Endpoint.Paths.Auth.startAuthentication())
+            setBody(
+                StartAuthenticationRequestBody(
+                    email = request.email,
+                    cardMethod = request.cardMethod
+                )
             )
-        ) {
             request.run {
                 parameter("bankId", bankId)
                 parameter("redirectPreferred", redirectPreferred)
-                scopes?.forEach {
-                    parameter("scopes", it)
-                }
+                scopes?.forEach { parameter("scopes", it) }
+                parameter("lang", request.lang)
 
                 headers {
                     append("Request-Id", requestId)
                     append("Redirect-URL", redirectUrl)
                     webhookUrl?.let { append("Webhook-URL", it) }
                 }
             }
-        }.run {
-            copy(
-                authorizationLink = Url(authorizationLink)
-                    .appendQueryParameter("lang", request.lang)
-                    .toString()
-            )
-        }
+        }.body()
 
     /**
      * Equivalent of suspending `startAuthentication(request: StartAuthenticationRequest)` for Java interoperability
@@ -70,10 +64,10 @@ class AuthClient internal constructor(
      */
     @Throws(KevinApiErrorException::class)
     suspend fun receiveToken(request: ReceiveTokenRequest): ReceiveTokenResponse =
-        httpClient.post(
-            path = Endpoint.Paths.Auth.receiveToken(),
-            body = request
-        )
+        httpClient.post {
+            url(path = Endpoint.Paths.Auth.receiveToken())
+            setBody(request)
+        }.body()
 
     /**
      * Equivalent of suspending `receiveToken(request: ReceiveTokenRequest)` for Java interoperability
@@ -88,10 +82,10 @@ class AuthClient internal constructor(
      */
     @Throws(KevinApiErrorException::class)
     suspend fun refreshToken(request: RefreshTokenRequest): ReceiveTokenResponse =
-        httpClient.post(
-            path = Endpoint.Paths.Auth.receiveToken(),
-            body = request
-        )
+        httpClient.post {
+            url(path = Endpoint.Paths.Auth.receiveToken())
+            setBody(request)
+        }.body()
 
     /**
      * Equivalent of suspending `refreshToken(request: RefreshTokenRequest)` for Java interoperability
@@ -106,13 +100,12 @@ class AuthClient internal constructor(
      */
     @Throws(KevinApiErrorException::class)
     suspend fun receiveTokenContent(request: ReceiveTokenContentRequest): ReceiveTokenContentResponse =
-        httpClient.get(
-            path = Endpoint.Paths.Auth.receiveTokenContent()
-        ) {
+        httpClient.get {
+            url(path = Endpoint.Paths.Auth.receiveTokenContent())
             headers {
                 append(HttpHeaders.Authorization, request.accessToken.appendAtStartIfNotExist("Bearer "))
             }
-        }
+        }.body()
 
     /**
      * Equivalent of suspending `receiveTokenContent(request: ReceiveTokenContentRequest)` for Java interoperability
diff --git a/src/main/kotlin/eu/kevin/api/services/general/GeneralClient.kt b/src/main/kotlin/eu/kevin/api/services/general/GeneralClient.kt
diff --git a/src/main/kotlin/eu/kevin/api/services/payment/PaymentClient.kt b/src/main/kotlin/eu/kevin/api/services/payment/PaymentClient.kt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package eu.kevin.api.models.payment.paymentStatus`
`2`	`2`
`3`		`-data class GetPaymentStatusRequest @JvmOverloads constructor(`
	`3`	`+data class GetPaymentStatusRequest(`
`4`	`4`	`val paymentId: String`
`5`	`5`	`)`