diff --git a/.github/workflows/publish-sonatype.yml b/.github/workflows/publish-sonatype.yml index 911ad774d..6ff6da701 100644 --- a/.github/workflows/publish-sonatype.yml +++ b/.github/workflows/publish-sonatype.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: | diff --git a/.release-please-manifest.json b/.release-please-manifest.json index a0e3f4c85..28af77b1d 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.261.0" + ".": "0.261.1" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b4f81c6c3..3ebd13b22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## 0.261.1 (2025-07-17) + +Full Changelog: [v0.261.0...v0.261.1](https://github.com/Increase/increase-java/compare/v0.261.0...v0.261.1) + +### Bug Fixes + +* **client:** ensure error handling always occurs ([82faed8](https://github.com/Increase/increase-java/commit/82faed8125f96e02e9c20d989d41bb50942df037)) + + +### Chores + +* **ci:** bump `actions/setup-java` to v4 ([90bded8](https://github.com/Increase/increase-java/commit/90bded87bd08864097d705f9a05f8d52735f54c7)) +* **internal:** allow running specific example from cli ([9ac4855](https://github.com/Increase/increase-java/commit/9ac4855ae6f2fbe7d7a82a7e10b79fc9d62b631f)) + ## 0.261.0 (2025-07-11) Full Changelog: [v0.260.0...v0.261.0](https://github.com/Increase/increase-java/compare/v0.260.0...v0.261.0) diff --git a/README.md b/README.md index bb3a91ed1..d5ab6c6e7 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ -[![Maven Central](https://img.shields.io/maven-central/v/com.increase.api/increase-java)](https://central.sonatype.com/artifact/com.increase.api/increase-java/0.261.0) -[![javadoc](https://javadoc.io/badge2/com.increase.api/increase-java/0.261.0/javadoc.svg)](https://javadoc.io/doc/com.increase.api/increase-java/0.261.0) +[![Maven Central](https://img.shields.io/maven-central/v/com.increase.api/increase-java)](https://central.sonatype.com/artifact/com.increase.api/increase-java/0.261.1) +[![javadoc](https://javadoc.io/badge2/com.increase.api/increase-java/0.261.1/javadoc.svg)](https://javadoc.io/doc/com.increase.api/increase-java/0.261.1) @@ -13,7 +13,7 @@ The Increase Java SDK is similar to the Increase Kotlin SDK but with minor diffe -The REST API documentation can be found on [increase.com](https://increase.com/documentation). Javadocs are available on [javadoc.io](https://javadoc.io/doc/com.increase.api/increase-java/0.261.0). +The REST API documentation can be found on [increase.com](https://increase.com/documentation). Javadocs are available on [javadoc.io](https://javadoc.io/doc/com.increase.api/increase-java/0.261.1). @@ -24,7 +24,7 @@ The REST API documentation can be found on [increase.com](https://increase.com/d ### Gradle ```kotlin -implementation("com.increase.api:increase-java:0.261.0") +implementation("com.increase.api:increase-java:0.261.1") ``` ### Maven @@ -33,7 +33,7 @@ implementation("com.increase.api:increase-java:0.261.0") com.increase.api increase-java - 0.261.0 + 0.261.1 ``` diff --git a/build.gradle.kts b/build.gradle.kts index 8b486a042..25e9a3aba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ repositories { allprojects { group = "com.increase.api" - version = "0.261.0" // x-release-please-version + version = "0.261.1" // x-release-please-version } subprojects { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/core/handlers/ErrorHandler.kt b/increase-java-core/src/main/kotlin/com/increase/api/core/handlers/ErrorHandler.kt index e6170f975..798ac1e1c 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/core/handlers/ErrorHandler.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/core/handlers/ErrorHandler.kt @@ -19,7 +19,7 @@ import com.increase.api.errors.UnexpectedStatusCodeException import com.increase.api.errors.UnprocessableEntityException @JvmSynthetic -internal fun errorHandler(jsonMapper: JsonMapper): Handler { +internal fun errorBodyHandler(jsonMapper: JsonMapper): Handler { val handler = jsonHandler(jsonMapper) return object : Handler { @@ -33,52 +33,52 @@ internal fun errorHandler(jsonMapper: JsonMapper): Handler { } @JvmSynthetic -internal fun Handler.withErrorHandler(errorHandler: Handler): Handler = - object : Handler { - override fun handle(response: HttpResponse): T = +internal fun errorHandler(errorBodyHandler: Handler): Handler = + object : Handler { + override fun handle(response: HttpResponse): HttpResponse = when (val statusCode = response.statusCode()) { - in 200..299 -> this@withErrorHandler.handle(response) + in 200..299 -> response 400 -> throw BadRequestException.builder() .headers(response.headers()) - .body(errorHandler.handle(response)) + .body(errorBodyHandler.handle(response)) .build() 401 -> throw UnauthorizedException.builder() .headers(response.headers()) - .body(errorHandler.handle(response)) + .body(errorBodyHandler.handle(response)) .build() 403 -> throw PermissionDeniedException.builder() .headers(response.headers()) - .body(errorHandler.handle(response)) + .body(errorBodyHandler.handle(response)) .build() 404 -> throw NotFoundException.builder() .headers(response.headers()) - .body(errorHandler.handle(response)) + .body(errorBodyHandler.handle(response)) .build() 422 -> throw UnprocessableEntityException.builder() .headers(response.headers()) - .body(errorHandler.handle(response)) + .body(errorBodyHandler.handle(response)) .build() 429 -> throw RateLimitException.builder() .headers(response.headers()) - .body(errorHandler.handle(response)) + .body(errorBodyHandler.handle(response)) .build() in 500..599 -> throw InternalServerException.builder() .statusCode(statusCode) .headers(response.headers()) - .body(errorHandler.handle(response)) + .body(errorBodyHandler.handle(response)) .build() else -> throw UnexpectedStatusCodeException.builder() .statusCode(statusCode) .headers(response.headers()) - .body(errorHandler.handle(response)) + .body(errorBodyHandler.handle(response)) .build() } } diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountNumberServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountNumberServiceAsyncImpl.kt index 8630afb65..7d3a780f8 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountNumberServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountNumberServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -70,7 +70,8 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountNumberServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -80,7 +81,7 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AccountNumberCreateParams, @@ -98,7 +99,7 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -111,7 +112,7 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AccountNumberRetrieveParams, @@ -131,7 +132,7 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -144,7 +145,7 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: AccountNumberUpdateParams, @@ -165,7 +166,7 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -179,7 +180,6 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AccountNumberListParams, @@ -196,7 +196,7 @@ class AccountNumberServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountServiceAsyncImpl.kt index 4e782fbd9..236b8462e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -87,7 +87,8 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -96,8 +97,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: AccountCreateParams, @@ -115,7 +115,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -128,7 +128,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AccountRetrieveParams, @@ -148,7 +148,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -160,8 +160,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl } } - private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val updateHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun update( params: AccountUpdateParams, @@ -182,7 +181,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -196,7 +195,6 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AccountListParams, @@ -213,7 +211,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -234,7 +232,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl } private val balanceHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun balance( params: AccountBalanceParams, @@ -254,7 +252,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { balanceHandler.handle(it) } .also { @@ -266,8 +264,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl } } - private val closeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val closeHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun close( params: AccountCloseParams, @@ -288,7 +285,7 @@ class AccountServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { closeHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountStatementServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountStatementServiceAsyncImpl.kt index 565186b5b..7958f4ff1 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountStatementServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountStatementServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -55,7 +55,8 @@ internal constructor(private val clientOptions: ClientOptions) : AccountStatemen class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountStatementServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -65,7 +66,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountStatemen ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AccountStatementRetrieveParams, @@ -85,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountStatemen return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -99,7 +100,6 @@ internal constructor(private val clientOptions: ClientOptions) : AccountStatemen private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AccountStatementListParams, @@ -116,7 +116,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountStatemen return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountTransferServiceAsyncImpl.kt index 8cb6455a5..f1176b6d7 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AccountTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -80,7 +80,8 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -90,7 +91,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AccountTransferCreateParams, @@ -108,7 +109,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -121,7 +122,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AccountTransferRetrieveParams, @@ -141,7 +142,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -155,7 +156,6 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AccountTransferListParams, @@ -172,7 +172,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -193,7 +193,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer } private val approveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun approve( params: AccountTransferApproveParams, @@ -214,7 +214,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -227,7 +227,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer } private val cancelHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun cancel( params: AccountTransferCancelParams, @@ -248,7 +248,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AchPrenotificationServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AchPrenotificationServiceAsyncImpl.kt index e6440849e..44378140a 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AchPrenotificationServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AchPrenotificationServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -66,7 +66,8 @@ internal constructor(private val clientOptions: ClientOptions) : AchPrenotificat class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AchPrenotificationServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -76,7 +77,7 @@ internal constructor(private val clientOptions: ClientOptions) : AchPrenotificat ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AchPrenotificationCreateParams, @@ -94,7 +95,7 @@ internal constructor(private val clientOptions: ClientOptions) : AchPrenotificat return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -107,7 +108,7 @@ internal constructor(private val clientOptions: ClientOptions) : AchPrenotificat } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AchPrenotificationRetrieveParams, @@ -127,7 +128,7 @@ internal constructor(private val clientOptions: ClientOptions) : AchPrenotificat return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -141,7 +142,6 @@ internal constructor(private val clientOptions: ClientOptions) : AchPrenotificat private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AchPrenotificationListParams, @@ -158,7 +158,7 @@ internal constructor(private val clientOptions: ClientOptions) : AchPrenotificat return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AchTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AchTransferServiceAsyncImpl.kt index a20cc551f..b96b42809 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/AchTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/AchTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -78,7 +78,8 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AchTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -88,7 +89,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AchTransferCreateParams, @@ -106,7 +107,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -119,7 +120,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AchTransferRetrieveParams, @@ -139,7 +140,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -153,7 +154,6 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AchTransferListParams, @@ -170,7 +170,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -191,7 +191,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions } private val approveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun approve( params: AchTransferApproveParams, @@ -212,7 +212,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -225,7 +225,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions } private val cancelHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun cancel( params: AchTransferCancelParams, @@ -246,7 +246,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingAccountServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingAccountServiceAsyncImpl.kt index 6cf35a20c..821815ac7 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingAccountServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingAccountServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -75,7 +75,8 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : BookkeepingAccountServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -85,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: BookkeepingAccountCreateParams, @@ -103,7 +104,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -116,7 +117,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: BookkeepingAccountUpdateParams, @@ -137,7 +138,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -151,7 +152,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: BookkeepingAccountListParams, @@ -168,7 +168,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -190,7 +190,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco private val balanceHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun balance( params: BookkeepingAccountBalanceParams, @@ -210,7 +209,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingAcco return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { balanceHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingEntryServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingEntryServiceAsyncImpl.kt index 7733bae4a..b4577b894 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingEntryServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingEntryServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -55,7 +55,8 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntryServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -65,7 +66,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: BookkeepingEntryRetrieveParams, @@ -85,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -99,7 +100,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: BookkeepingEntryListParams, @@ -116,7 +116,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingEntrySetServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingEntrySetServiceAsyncImpl.kt index b50f9d0b6..9531c2895 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingEntrySetServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/BookkeepingEntrySetServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -67,7 +67,8 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntrySetServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -78,7 +79,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: BookkeepingEntrySetCreateParams, @@ -96,7 +96,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -110,7 +110,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: BookkeepingEntrySetRetrieveParams, @@ -130,7 +129,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -144,7 +143,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: BookkeepingEntrySetListParams, @@ -161,7 +159,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardDisputeServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardDisputeServiceAsyncImpl.kt index a78cd7c95..820c35e64 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardDisputeServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardDisputeServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -62,7 +62,8 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardDisputeServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -72,7 +73,7 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardDisputeCreateParams, @@ -90,7 +91,7 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -103,7 +104,7 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CardDisputeRetrieveParams, @@ -123,7 +124,7 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +138,6 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CardDisputeListParams, @@ -154,7 +154,7 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardPaymentServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardPaymentServiceAsyncImpl.kt index 60438a216..602987d3c 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardPaymentServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardPaymentServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -53,7 +53,8 @@ class CardPaymentServiceAsyncImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardPaymentServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -63,7 +64,7 @@ class CardPaymentServiceAsyncImpl internal constructor(private val clientOptions ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CardPaymentRetrieveParams, @@ -83,7 +84,7 @@ class CardPaymentServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -97,7 +98,6 @@ class CardPaymentServiceAsyncImpl internal constructor(private val clientOptions private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CardPaymentListParams, @@ -114,7 +114,7 @@ class CardPaymentServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardPurchaseSupplementServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardPurchaseSupplementServiceAsyncImpl.kt index a58cec0eb..20c2a998c 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardPurchaseSupplementServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardPurchaseSupplementServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -59,7 +59,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardPurchaseSupplementServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -70,7 +71,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: CardPurchaseSupplementRetrieveParams, @@ -90,7 +90,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -104,7 +104,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CardPurchaseSupplementListParams, @@ -121,7 +120,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardServiceAsyncImpl.kt index e0c8fa324..2a06cf2f5 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CardServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -79,7 +79,8 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -88,8 +89,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: CardCreateParams, @@ -107,7 +107,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -119,8 +119,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien } } - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CardRetrieveParams, @@ -140,7 +139,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -152,8 +151,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien } } - private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val updateHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun update( params: CardUpdateParams, @@ -174,7 +172,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -188,7 +186,6 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CardListParams, @@ -205,7 +202,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -226,7 +223,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien } private val detailsHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun details( params: CardDetailsParams, @@ -246,7 +243,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { detailsHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CheckDepositServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CheckDepositServiceAsyncImpl.kt index b8956bed1..7c30a4977 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CheckDepositServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CheckDepositServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -62,7 +62,8 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CheckDepositServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -72,7 +73,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CheckDepositCreateParams, @@ -90,7 +91,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -103,7 +104,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CheckDepositRetrieveParams, @@ -123,7 +124,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +138,6 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CheckDepositListParams, @@ -154,7 +154,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CheckTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CheckTransferServiceAsyncImpl.kt index 37ecf858c..dad6fc30e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/CheckTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/CheckTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -86,7 +86,8 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CheckTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -96,7 +97,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CheckTransferCreateParams, @@ -114,7 +115,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -127,7 +128,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CheckTransferRetrieveParams, @@ -147,7 +148,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -161,7 +162,6 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CheckTransferListParams, @@ -178,7 +178,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -199,7 +199,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio } private val approveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun approve( params: CheckTransferApproveParams, @@ -220,7 +220,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -233,7 +233,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio } private val cancelHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun cancel( params: CheckTransferCancelParams, @@ -254,7 +254,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { @@ -267,7 +267,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio } private val stopPaymentHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun stopPayment( params: CheckTransferStopPaymentParams, @@ -288,7 +288,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { stopPaymentHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/DeclinedTransactionServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/DeclinedTransactionServiceAsyncImpl.kt index 5b791ac2b..7c7004f71 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/DeclinedTransactionServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/DeclinedTransactionServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -58,7 +58,8 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DeclinedTransactionServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -69,7 +70,6 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: DeclinedTransactionRetrieveParams, @@ -89,7 +89,7 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -103,7 +103,6 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: DeclinedTransactionListParams, @@ -120,7 +119,7 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/DigitalCardProfileServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/DigitalCardProfileServiceAsyncImpl.kt index 3d6e8b38a..d420cc521 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/DigitalCardProfileServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/DigitalCardProfileServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -82,7 +82,8 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DigitalCardProfileServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -92,7 +93,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: DigitalCardProfileCreateParams, @@ -110,7 +111,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -123,7 +124,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: DigitalCardProfileRetrieveParams, @@ -143,7 +144,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -157,7 +158,6 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: DigitalCardProfileListParams, @@ -174,7 +174,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -195,7 +195,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf } private val archiveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun archive( params: DigitalCardProfileArchiveParams, @@ -216,7 +216,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { archiveHandler.handle(it) } .also { @@ -229,7 +229,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf } private val cloneHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun clone( params: DigitalCardProfileCloneParams, @@ -250,7 +250,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalCardProf return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { cloneHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/DigitalWalletTokenServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/DigitalWalletTokenServiceAsyncImpl.kt index 498c2d403..22a3893fd 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/DigitalWalletTokenServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/DigitalWalletTokenServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -57,7 +57,8 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTo class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTokenServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -67,7 +68,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTo ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: DigitalWalletTokenRetrieveParams, @@ -87,7 +88,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTo return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -101,7 +102,6 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTo private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: DigitalWalletTokenListParams, @@ -118,7 +118,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTo return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/DocumentServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/DocumentServiceAsyncImpl.kt index 30e02f833..52526bde0 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/DocumentServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/DocumentServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -62,7 +62,8 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DocumentServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -72,7 +73,7 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: DocumentCreateParams, @@ -90,7 +91,7 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -103,7 +104,7 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: DocumentRetrieveParams, @@ -123,7 +124,7 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +138,6 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: DocumentListParams, @@ -154,7 +154,7 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/EntityServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/EntityServiceAsyncImpl.kt index 09625ffb3..fb805d0c6 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/EntityServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/EntityServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -120,7 +120,8 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : EntityServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -129,8 +130,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: EntityCreateParams, @@ -148,7 +148,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -160,8 +160,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli } } - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: EntityRetrieveParams, @@ -181,7 +180,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -195,7 +194,6 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: EntityListParams, @@ -212,7 +210,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -232,8 +230,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli } } - private val archiveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val archiveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun archive( params: EntityArchiveParams, @@ -254,7 +251,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { archiveHandler.handle(it) } .also { @@ -267,7 +264,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli } private val archiveBeneficialOwnerHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun archiveBeneficialOwner( params: EntityArchiveBeneficialOwnerParams, @@ -288,7 +285,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { archiveBeneficialOwnerHandler.handle(it) } .also { @@ -300,8 +297,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli } } - private val confirmHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val confirmHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun confirm( params: EntityConfirmParams, @@ -322,7 +318,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { confirmHandler.handle(it) } .also { @@ -335,7 +331,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli } private val createBeneficialOwnerHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun createBeneficialOwner( params: EntityCreateBeneficialOwnerParams, @@ -356,7 +352,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createBeneficialOwnerHandler.handle(it) } .also { @@ -369,7 +365,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli } private val updateAddressHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun updateAddress( params: EntityUpdateAddressParams, @@ -390,7 +386,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateAddressHandler.handle(it) } .also { @@ -403,7 +399,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli } private val updateBeneficialOwnerAddressHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun updateBeneficialOwnerAddress( params: EntityUpdateBeneficialOwnerAddressParams, @@ -428,7 +424,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateBeneficialOwnerAddressHandler.handle(it) } .also { @@ -441,7 +437,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli } private val updateIndustryCodeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun updateIndustryCode( params: EntityUpdateIndustryCodeParams, @@ -462,7 +458,7 @@ class EntityServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateIndustryCodeHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/EventServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/EventServiceAsyncImpl.kt index 0845392b5..ab2e1b434 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/EventServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/EventServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -53,7 +53,8 @@ class EventServiceAsyncImpl internal constructor(private val clientOptions: Clie class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : EventServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,8 +63,7 @@ class EventServiceAsyncImpl internal constructor(private val clientOptions: Clie clientOptions.toBuilder().apply(modifier::accept).build() ) - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: EventRetrieveParams, @@ -83,7 +83,7 @@ class EventServiceAsyncImpl internal constructor(private val clientOptions: Clie return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -97,7 +97,6 @@ class EventServiceAsyncImpl internal constructor(private val clientOptions: Clie private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: EventListParams, @@ -114,7 +113,7 @@ class EventServiceAsyncImpl internal constructor(private val clientOptions: Clie return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/EventSubscriptionServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/EventSubscriptionServiceAsyncImpl.kt index 61e7fda5e..062b4d1b8 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/EventSubscriptionServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/EventSubscriptionServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -72,7 +72,8 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : EventSubscriptionServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -82,7 +83,7 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: EventSubscriptionCreateParams, @@ -100,7 +101,7 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -113,7 +114,7 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: EventSubscriptionRetrieveParams, @@ -133,7 +134,7 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -146,7 +147,7 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: EventSubscriptionUpdateParams, @@ -167,7 +168,7 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -181,7 +182,6 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: EventSubscriptionListParams, @@ -198,7 +198,7 @@ internal constructor(private val clientOptions: ClientOptions) : EventSubscripti return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/ExportServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/ExportServiceAsyncImpl.kt index 79b8bbac4..2e84caf14 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/ExportServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/ExportServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -62,7 +62,8 @@ class ExportServiceAsyncImpl internal constructor(private val clientOptions: Cli class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : ExportServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -71,8 +72,7 @@ class ExportServiceAsyncImpl internal constructor(private val clientOptions: Cli clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: ExportCreateParams, @@ -90,7 +90,7 @@ class ExportServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -102,8 +102,7 @@ class ExportServiceAsyncImpl internal constructor(private val clientOptions: Cli } } - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: ExportRetrieveParams, @@ -123,7 +122,7 @@ class ExportServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +136,6 @@ class ExportServiceAsyncImpl internal constructor(private val clientOptions: Cli private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: ExportListParams, @@ -154,7 +152,7 @@ class ExportServiceAsyncImpl internal constructor(private val clientOptions: Cli return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/ExternalAccountServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/ExternalAccountServiceAsyncImpl.kt index 11932ee7b..a5cd30d49 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/ExternalAccountServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/ExternalAccountServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -72,7 +72,8 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : ExternalAccountServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -82,7 +83,7 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: ExternalAccountCreateParams, @@ -100,7 +101,7 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -113,7 +114,7 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: ExternalAccountRetrieveParams, @@ -133,7 +134,7 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -146,7 +147,7 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: ExternalAccountUpdateParams, @@ -167,7 +168,7 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -181,7 +182,6 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: ExternalAccountListParams, @@ -198,7 +198,7 @@ internal constructor(private val clientOptions: ClientOptions) : ExternalAccount return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/FileLinkServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/FileLinkServiceAsyncImpl.kt index 992961365..7ec47896f 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/FileLinkServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/FileLinkServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -42,7 +42,8 @@ class FileLinkServiceAsyncImpl internal constructor(private val clientOptions: C class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : FileLinkServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,7 @@ class FileLinkServiceAsyncImpl internal constructor(private val clientOptions: C ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: FileLinkCreateParams, @@ -70,7 +71,7 @@ class FileLinkServiceAsyncImpl internal constructor(private val clientOptions: C return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/FileServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/FileServiceAsyncImpl.kt index cf4bb2834..a71d8a3e5 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/FileServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/FileServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.multipartFormData @@ -62,7 +62,8 @@ class FileServiceAsyncImpl internal constructor(private val clientOptions: Clien class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : FileServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -71,8 +72,7 @@ class FileServiceAsyncImpl internal constructor(private val clientOptions: Clien clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: FileCreateParams, @@ -90,7 +90,7 @@ class FileServiceAsyncImpl internal constructor(private val clientOptions: Clien return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -102,8 +102,7 @@ class FileServiceAsyncImpl internal constructor(private val clientOptions: Clien } } - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: FileRetrieveParams, @@ -123,7 +122,7 @@ class FileServiceAsyncImpl internal constructor(private val clientOptions: Clien return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +136,6 @@ class FileServiceAsyncImpl internal constructor(private val clientOptions: Clien private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: FileListParams, @@ -154,7 +152,7 @@ class FileServiceAsyncImpl internal constructor(private val clientOptions: Clien return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/GroupServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/GroupServiceAsyncImpl.kt index b55d594b6..b013acafc 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/GroupServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/GroupServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -41,7 +41,8 @@ class GroupServiceAsyncImpl internal constructor(private val clientOptions: Clie class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : GroupServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -50,8 +51,7 @@ class GroupServiceAsyncImpl internal constructor(private val clientOptions: Clie clientOptions.toBuilder().apply(modifier::accept).build() ) - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: GroupRetrieveParams, @@ -68,7 +68,7 @@ class GroupServiceAsyncImpl internal constructor(private val clientOptions: Clie return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundAchTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundAchTransferServiceAsyncImpl.kt index 5b4bbefe2..21832a6f1 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundAchTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundAchTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -84,7 +84,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundAchTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -94,7 +95,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: InboundAchTransferRetrieveParams, @@ -114,7 +115,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -128,7 +129,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundAchTransferListParams, @@ -145,7 +145,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -166,7 +166,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans } private val createNotificationOfChangeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun createNotificationOfChange( params: InboundAchTransferCreateNotificationOfChangeParams, @@ -191,7 +191,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createNotificationOfChangeHandler.handle(it) } .also { @@ -204,7 +204,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans } private val declineHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun decline( params: InboundAchTransferDeclineParams, @@ -225,7 +225,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { declineHandler.handle(it) } .also { @@ -238,7 +238,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans } private val transferReturnHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun transferReturn( params: InboundAchTransferTransferReturnParams, @@ -263,7 +263,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { transferReturnHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundCheckDepositServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundCheckDepositServiceAsyncImpl.kt index 81cf8c33a..f2010b57e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundCheckDepositServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundCheckDepositServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -75,7 +75,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundCheckDepositServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -86,7 +87,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: InboundCheckDepositRetrieveParams, @@ -106,7 +106,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -120,7 +120,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundCheckDepositListParams, @@ -137,7 +136,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -159,7 +158,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val declineHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun decline( params: InboundCheckDepositDeclineParams, @@ -180,7 +178,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { declineHandler.handle(it) } .also { @@ -194,7 +192,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val returnHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun return_( params: InboundCheckDepositReturnParams, @@ -215,7 +212,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { returnHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundMailItemServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundMailItemServiceAsyncImpl.kt index ce3893c43..834cbd515 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundMailItemServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundMailItemServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -55,7 +55,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundMailItem class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundMailItemServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -65,7 +66,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundMailItem ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: InboundMailItemRetrieveParams, @@ -85,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundMailItem return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -99,7 +100,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundMailItem private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundMailItemListParams, @@ -116,7 +116,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundMailItem return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundRealTimePaymentsTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundRealTimePaymentsTransferServiceAsyncImpl.kt index 6e91213e9..192058dc8 100755 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundRealTimePaymentsTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundRealTimePaymentsTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -60,7 +60,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundRealTimePaymentsTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -71,7 +72,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: InboundRealTimePaymentsTransferRetrieveParams, @@ -94,7 +94,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -108,7 +108,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundRealTimePaymentsTransferListParams, @@ -125,7 +124,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundWireDrawdownRequestServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundWireDrawdownRequestServiceAsyncImpl.kt index 46e9f8e27..3b1139387 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundWireDrawdownRequestServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundWireDrawdownRequestServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -59,7 +59,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundWireDrawdownRequestServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -70,7 +71,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: InboundWireDrawdownRequestRetrieveParams, @@ -93,7 +93,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -107,7 +107,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundWireDrawdownRequestListParams, @@ -124,7 +123,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundWireTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundWireTransferServiceAsyncImpl.kt index a9d9a343f..d91283019 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundWireTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/InboundWireTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -67,7 +67,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundWireTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -78,7 +79,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: InboundWireTransferRetrieveParams, @@ -98,7 +98,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -112,7 +112,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundWireTransferListParams, @@ -129,7 +128,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -151,7 +150,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran private val reverseHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun reverse( params: InboundWireTransferReverseParams, @@ -172,7 +170,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { reverseHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiAccountEnrollmentServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiAccountEnrollmentServiceAsyncImpl.kt index ca3ead342..7b22b5e0d 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiAccountEnrollmentServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiAccountEnrollmentServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -76,7 +76,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountEnrollmentServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -87,7 +88,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: IntrafiAccountEnrollmentCreateParams, @@ -105,7 +105,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -119,7 +119,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: IntrafiAccountEnrollmentRetrieveParams, @@ -142,7 +141,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -156,7 +155,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: IntrafiAccountEnrollmentListParams, @@ -173,7 +171,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -197,7 +195,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val unenrollHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun unenroll( params: IntrafiAccountEnrollmentUnenrollParams, @@ -225,7 +222,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { unenrollHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiBalanceServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiBalanceServiceAsyncImpl.kt index ac5d14975..5098d7539 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiBalanceServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiBalanceServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -45,7 +45,8 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiBalanceS class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : IntrafiBalanceServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -55,7 +56,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiBalanceS ) private val intrafiBalanceHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun intrafiBalance( params: IntrafiBalanceIntrafiBalanceParams, @@ -75,7 +76,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiBalanceS return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { intrafiBalanceHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiExclusionServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiExclusionServiceAsyncImpl.kt index 00c4d3f90..3a152331a 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiExclusionServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/IntrafiExclusionServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -72,7 +72,8 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusionServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -82,7 +83,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: IntrafiExclusionCreateParams, @@ -100,7 +101,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -113,7 +114,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: IntrafiExclusionRetrieveParams, @@ -133,7 +134,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -147,7 +148,6 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: IntrafiExclusionListParams, @@ -164,7 +164,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -185,7 +185,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio } private val archiveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun archive( params: IntrafiExclusionArchiveParams, @@ -206,7 +206,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { archiveHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/LockboxServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/LockboxServiceAsyncImpl.kt index 5af6c2151..47eb14424 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/LockboxServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/LockboxServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -70,7 +70,8 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : LockboxServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -79,8 +80,7 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: LockboxCreateParams, @@ -98,7 +98,7 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -111,7 +111,7 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: LockboxRetrieveParams, @@ -131,7 +131,7 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -143,8 +143,7 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl } } - private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val updateHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun update( params: LockboxUpdateParams, @@ -165,7 +164,7 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -179,7 +178,6 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: LockboxListParams, @@ -196,7 +194,7 @@ class LockboxServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthApplicationServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthApplicationServiceAsyncImpl.kt index 84491ba3c..71dd6934e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthApplicationServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthApplicationServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -55,7 +55,8 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthApplicatio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : OAuthApplicationServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -65,7 +66,7 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthApplicatio ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: OAuthApplicationRetrieveParams, @@ -85,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthApplicatio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -99,7 +100,6 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthApplicatio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: OAuthApplicationListParams, @@ -116,7 +116,7 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthApplicatio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthConnectionServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthConnectionServiceAsyncImpl.kt index 88405154d..2583c9b33 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthConnectionServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthConnectionServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -55,7 +55,8 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthConnection class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : OAuthConnectionServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -65,7 +66,7 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthConnection ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: OAuthConnectionRetrieveParams, @@ -85,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthConnection return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -99,7 +100,6 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthConnection private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: OAuthConnectionListParams, @@ -116,7 +116,7 @@ internal constructor(private val clientOptions: ClientOptions) : OAuthConnection return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthTokenServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthTokenServiceAsyncImpl.kt index 433352fdf..e6e072047 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthTokenServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/OAuthTokenServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -42,7 +42,8 @@ class OAuthTokenServiceAsyncImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : OAuthTokenServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,7 @@ class OAuthTokenServiceAsyncImpl internal constructor(private val clientOptions: ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: OAuthTokenCreateParams, @@ -70,7 +71,7 @@ class OAuthTokenServiceAsyncImpl internal constructor(private val clientOptions: return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/PendingTransactionServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/PendingTransactionServiceAsyncImpl.kt index f53ff9f13..972ee4956 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/PendingTransactionServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/PendingTransactionServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -74,7 +74,8 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : PendingTransactionServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -84,7 +85,7 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: PendingTransactionCreateParams, @@ -102,7 +103,7 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -115,7 +116,7 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: PendingTransactionRetrieveParams, @@ -135,7 +136,7 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -149,7 +150,6 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: PendingTransactionListParams, @@ -166,7 +166,7 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -187,7 +187,7 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact } private val releaseHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun release( params: PendingTransactionReleaseParams, @@ -208,7 +208,7 @@ internal constructor(private val clientOptions: ClientOptions) : PendingTransact return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { releaseHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/PhysicalCardProfileServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/PhysicalCardProfileServiceAsyncImpl.kt index b9c3612b6..54481dfe0 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/PhysicalCardProfileServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/PhysicalCardProfileServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -83,7 +83,8 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : PhysicalCardProfileServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -94,7 +95,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: PhysicalCardProfileCreateParams, @@ -112,7 +112,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -126,7 +126,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: PhysicalCardProfileRetrieveParams, @@ -146,7 +145,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -160,7 +159,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: PhysicalCardProfileListParams, @@ -177,7 +175,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -199,7 +197,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val archiveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun archive( params: PhysicalCardProfileArchiveParams, @@ -220,7 +217,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { archiveHandler.handle(it) } .also { @@ -234,7 +231,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val cloneHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun clone( params: PhysicalCardProfileCloneParams, @@ -255,7 +251,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { cloneHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/PhysicalCardServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/PhysicalCardServiceAsyncImpl.kt index b7c6b931d..9573e1ec7 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/PhysicalCardServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/PhysicalCardServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -70,7 +70,8 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : PhysicalCardServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -80,7 +81,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: PhysicalCardCreateParams, @@ -98,7 +99,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -111,7 +112,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: PhysicalCardRetrieveParams, @@ -131,7 +132,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -144,7 +145,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: PhysicalCardUpdateParams, @@ -165,7 +166,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -179,7 +180,6 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: PhysicalCardListParams, @@ -196,7 +196,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/ProgramServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/ProgramServiceAsyncImpl.kt index 69047079e..2d81b6a6b 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/ProgramServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/ProgramServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -53,7 +53,8 @@ class ProgramServiceAsyncImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : ProgramServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -63,7 +64,7 @@ class ProgramServiceAsyncImpl internal constructor(private val clientOptions: Cl ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: ProgramRetrieveParams, @@ -83,7 +84,7 @@ class ProgramServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -97,7 +98,6 @@ class ProgramServiceAsyncImpl internal constructor(private val clientOptions: Cl private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: ProgramListParams, @@ -114,7 +114,7 @@ class ProgramServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/RealTimeDecisionServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/RealTimeDecisionServiceAsyncImpl.kt index ea65395d0..e8b2d1345 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/RealTimeDecisionServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/RealTimeDecisionServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -54,7 +54,8 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimeDecisio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : RealTimeDecisionServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -64,7 +65,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimeDecisio ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: RealTimeDecisionRetrieveParams, @@ -84,7 +85,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimeDecisio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -97,7 +98,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimeDecisio } private val actionHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun action( params: RealTimeDecisionActionParams, @@ -118,7 +119,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimeDecisio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { actionHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/RealTimePaymentsTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/RealTimePaymentsTransferServiceAsyncImpl.kt index 2e43bed0a..e5c3dd82e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/RealTimePaymentsTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/RealTimePaymentsTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -84,7 +84,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : RealTimePaymentsTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -95,7 +96,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: RealTimePaymentsTransferCreateParams, @@ -113,7 +113,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -127,7 +127,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: RealTimePaymentsTransferRetrieveParams, @@ -150,7 +149,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -164,7 +163,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: RealTimePaymentsTransferListParams, @@ -181,7 +179,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -205,7 +203,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val approveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun approve( params: RealTimePaymentsTransferApproveParams, @@ -233,7 +230,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -247,7 +244,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val cancelHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun cancel( params: RealTimePaymentsTransferCancelParams, @@ -271,7 +267,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/RoutingNumberServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/RoutingNumberServiceAsyncImpl.kt index 03ea43612..9a29e733a 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/RoutingNumberServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/RoutingNumberServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -42,7 +42,8 @@ class RoutingNumberServiceAsyncImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : RoutingNumberServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -53,7 +54,6 @@ class RoutingNumberServiceAsyncImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: RoutingNumberListParams, @@ -70,7 +70,7 @@ class RoutingNumberServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/SupplementalDocumentServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/SupplementalDocumentServiceAsyncImpl.kt index 5622de25e..cd610944d 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/SupplementalDocumentServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/SupplementalDocumentServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -57,7 +57,8 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : SupplementalDocumentServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -68,7 +69,6 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: SupplementalDocumentCreateParams, @@ -86,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -100,7 +100,6 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: SupplementalDocumentListParams, @@ -117,7 +116,7 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/TransactionServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/TransactionServiceAsyncImpl.kt index 50d81120e..f1b045b1f 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/TransactionServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/TransactionServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -53,7 +53,8 @@ class TransactionServiceAsyncImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : TransactionServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -63,7 +64,7 @@ class TransactionServiceAsyncImpl internal constructor(private val clientOptions ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: TransactionRetrieveParams, @@ -83,7 +84,7 @@ class TransactionServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -97,7 +98,6 @@ class TransactionServiceAsyncImpl internal constructor(private val clientOptions private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: TransactionListParams, @@ -114,7 +114,7 @@ class TransactionServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/WireDrawdownRequestServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/WireDrawdownRequestServiceAsyncImpl.kt index 237fae3c0..7ba178476 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/WireDrawdownRequestServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/WireDrawdownRequestServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -67,7 +67,8 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : WireDrawdownRequestServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -78,7 +79,6 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: WireDrawdownRequestCreateParams, @@ -96,7 +96,7 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -110,7 +110,6 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: WireDrawdownRequestRetrieveParams, @@ -130,7 +129,7 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -144,7 +143,6 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: WireDrawdownRequestListParams, @@ -161,7 +159,7 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/WireTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/WireTransferServiceAsyncImpl.kt index b0e3aa005..351492acd 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/WireTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/WireTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -78,7 +78,8 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : WireTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -88,7 +89,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: WireTransferCreateParams, @@ -106,7 +107,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -119,7 +120,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: WireTransferRetrieveParams, @@ -139,7 +140,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -153,7 +154,6 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: WireTransferListParams, @@ -170,7 +170,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -191,7 +191,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption } private val approveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun approve( params: WireTransferApproveParams, @@ -212,7 +212,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -225,7 +225,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption } private val cancelHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun cancel( params: WireTransferCancelParams, @@ -246,7 +246,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AccountStatementServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AccountStatementServiceAsyncImpl.kt index 585055a2d..39655f46f 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AccountStatementServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AccountStatementServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -44,7 +44,8 @@ internal constructor(private val clientOptions: ClientOptions) : AccountStatemen class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountStatementServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountStatemen ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AccountStatementCreateParams, @@ -72,7 +73,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountStatemen return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AccountTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AccountTransferServiceAsyncImpl.kt index aafda36a1..46889e9b8 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AccountTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AccountTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -46,7 +46,8 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -56,7 +57,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer ) private val completeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun complete( params: AccountTransferCompleteParams, @@ -82,7 +83,7 @@ internal constructor(private val clientOptions: ClientOptions) : AccountTransfer return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { completeHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AchTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AchTransferServiceAsyncImpl.kt index 86bf92988..4c1be49ea 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AchTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/AchTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -78,7 +78,8 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AchTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -88,7 +89,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions ) private val acknowledgeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun acknowledge( params: AchTransferAcknowledgeParams, @@ -114,7 +115,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { acknowledgeHandler.handle(it) } .also { @@ -127,7 +128,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions } private val createNotificationOfChangeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun createNotificationOfChange( params: AchTransferCreateNotificationOfChangeParams, @@ -153,7 +154,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createNotificationOfChangeHandler.handle(it) } .also { @@ -166,7 +167,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions } private val returnHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun return_( params: AchTransferReturnParams, @@ -187,7 +188,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { returnHandler.handle(it) } .also { @@ -200,7 +201,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions } private val settleHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun settle( params: AchTransferSettleParams, @@ -221,7 +222,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { settleHandler.handle(it) } .also { @@ -234,7 +235,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions } private val submitHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun submit( params: AchTransferSubmitParams, @@ -255,7 +256,7 @@ class AchTransferServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { submitHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardAuthorizationExpirationServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardAuthorizationExpirationServiceAsyncImpl.kt index e24675d4d..2fe4918e4 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardAuthorizationExpirationServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardAuthorizationExpirationServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -48,7 +48,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardAuthorizationExpirationServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -58,7 +59,7 @@ internal constructor(private val clientOptions: ClientOptions) : ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardAuthorizationExpirationCreateParams, @@ -76,7 +77,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardAuthorizationServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardAuthorizationServiceAsyncImpl.kt index b24e915c3..c0ad55913 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardAuthorizationServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardAuthorizationServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -44,7 +44,8 @@ internal constructor(private val clientOptions: ClientOptions) : CardAuthorizati class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardAuthorizationServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -55,7 +56,6 @@ internal constructor(private val clientOptions: ClientOptions) : CardAuthorizati private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: CardAuthorizationCreateParams, @@ -73,7 +73,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardAuthorizati return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardDisputeServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardDisputeServiceAsyncImpl.kt index 8bced0d03..5e89a745e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardDisputeServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardDisputeServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -44,7 +44,8 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardDisputeServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,7 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions ) private val actionHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun action( params: CardDisputeActionParams, @@ -75,7 +76,7 @@ class CardDisputeServiceAsyncImpl internal constructor(private val clientOptions return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { actionHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardFuelConfirmationServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardFuelConfirmationServiceAsyncImpl.kt index aa83bcbe0..0fd9afd6e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardFuelConfirmationServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardFuelConfirmationServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -47,7 +47,8 @@ internal constructor(private val clientOptions: ClientOptions) : CardFuelConfirm class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardFuelConfirmationServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -57,7 +58,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardFuelConfirm ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardFuelConfirmationCreateParams, @@ -75,7 +76,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardFuelConfirm return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardIncrementServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardIncrementServiceAsyncImpl.kt index 2157337ff..6705ee743 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardIncrementServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardIncrementServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -42,7 +42,8 @@ class CardIncrementServiceAsyncImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardIncrementServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,7 @@ class CardIncrementServiceAsyncImpl internal constructor(private val clientOptio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardIncrementCreateParams, @@ -70,7 +71,7 @@ class CardIncrementServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardRefundServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardRefundServiceAsyncImpl.kt index 23cba5c81..585c04386 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardRefundServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardRefundServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -42,7 +42,8 @@ class CardRefundServiceAsyncImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardRefundServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,7 @@ class CardRefundServiceAsyncImpl internal constructor(private val clientOptions: ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardRefundCreateParams, @@ -70,7 +71,7 @@ class CardRefundServiceAsyncImpl internal constructor(private val clientOptions: return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardReversalServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardReversalServiceAsyncImpl.kt index 97749160f..33e3c335a 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardReversalServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardReversalServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -42,7 +42,8 @@ class CardReversalServiceAsyncImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardReversalServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,7 @@ class CardReversalServiceAsyncImpl internal constructor(private val clientOption ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardReversalCreateParams, @@ -70,7 +71,7 @@ class CardReversalServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardSettlementServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardSettlementServiceAsyncImpl.kt index ec6a6f645..8f0cc7fa9 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardSettlementServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CardSettlementServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -44,7 +44,8 @@ internal constructor(private val clientOptions: ClientOptions) : CardSettlementS class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardSettlementServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardSettlementS ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardSettlementCreateParams, @@ -72,7 +73,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardSettlementS return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CheckDepositServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CheckDepositServiceAsyncImpl.kt index deea80670..4b2e40fcf 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CheckDepositServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CheckDepositServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -60,7 +60,8 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CheckDepositServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -70,7 +71,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption ) private val rejectHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun reject( params: CheckDepositRejectParams, @@ -96,7 +97,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { rejectHandler.handle(it) } .also { @@ -109,7 +110,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption } private val returnHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun return_( params: CheckDepositReturnParams, @@ -135,7 +136,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { returnHandler.handle(it) } .also { @@ -148,7 +149,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption } private val submitHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun submit( params: CheckDepositSubmitParams, @@ -174,7 +175,7 @@ class CheckDepositServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { submitHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CheckTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CheckTransferServiceAsyncImpl.kt index f6b76501e..4800a69c1 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CheckTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/CheckTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -44,7 +44,8 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CheckTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio ) private val mailHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun mail( params: CheckTransferMailParams, @@ -75,7 +76,7 @@ class CheckTransferServiceAsyncImpl internal constructor(private val clientOptio return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { mailHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/DigitalWalletTokenRequestServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/DigitalWalletTokenRequestServiceAsyncImpl.kt index ffa3b913b..dd1bec64f 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/DigitalWalletTokenRequestServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/DigitalWalletTokenRequestServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -48,7 +48,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTokenRequestServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -59,7 +60,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: DigitalWalletTokenRequestCreateParams, @@ -77,7 +77,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/DocumentServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/DocumentServiceAsyncImpl.kt index 9a42df505..947c853a1 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/DocumentServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/DocumentServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -42,7 +42,8 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DocumentServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,7 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: DocumentCreateParams, @@ -70,7 +71,7 @@ class DocumentServiceAsyncImpl internal constructor(private val clientOptions: C return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundAchTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundAchTransferServiceAsyncImpl.kt index 99fb4f0f3..675ed638d 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundAchTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundAchTransferServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -46,7 +46,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundAchTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -56,7 +57,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: InboundAchTransferCreateParams, @@ -74,7 +75,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundAchTrans return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundCheckDepositServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundCheckDepositServiceAsyncImpl.kt index f22c20f2a..51b92b0fa 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundCheckDepositServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundCheckDepositServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -47,7 +47,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundCheckDepositServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -58,7 +59,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: InboundCheckDepositCreateParams, @@ -76,7 +76,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundFundsHoldServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundFundsHoldServiceAsyncImpl.kt index 65f6485d0..a440d2e92 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundFundsHoldServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundFundsHoldServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -46,7 +46,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundFundsHol class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundFundsHoldServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -57,7 +58,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundFundsHol private val releaseHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun release( params: InboundFundsHoldReleaseParams, @@ -83,7 +83,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundFundsHol return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { releaseHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundMailItemServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundMailItemServiceAsyncImpl.kt index 8bb284fc5..ed8e46fbc 100755 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundMailItemServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundMailItemServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -44,7 +44,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundMailItem class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundMailItemServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundMailItem ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: InboundMailItemCreateParams, @@ -72,7 +73,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundMailItem return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundRealTimePaymentsTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundRealTimePaymentsTransferServiceAsyncImpl.kt index d1c8f4231..00029f029 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundRealTimePaymentsTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundRealTimePaymentsTransferServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -49,7 +49,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundRealTimePaymentsTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -60,7 +61,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: InboundRealTimePaymentsTransferCreateParams, @@ -78,7 +78,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundWireDrawdownRequestServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundWireDrawdownRequestServiceAsyncImpl.kt index 223268fb4..dbf4a4c2d 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundWireDrawdownRequestServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundWireDrawdownRequestServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -48,7 +48,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundWireDrawdownRequestServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -59,7 +60,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: InboundWireDrawdownRequestCreateParams, @@ -77,7 +77,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundWireTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundWireTransferServiceAsyncImpl.kt index f0992f4ea..d09be8b76 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundWireTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InboundWireTransferServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -47,7 +47,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundWireTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -58,7 +59,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: InboundWireTransferCreateParams, @@ -76,7 +76,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InterestPaymentServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InterestPaymentServiceAsyncImpl.kt index 8217608c2..b56967e05 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InterestPaymentServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/InterestPaymentServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -44,7 +44,8 @@ internal constructor(private val clientOptions: ClientOptions) : InterestPayment class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InterestPaymentServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,7 @@ internal constructor(private val clientOptions: ClientOptions) : InterestPayment ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: InterestPaymentCreateParams, @@ -72,7 +73,7 @@ internal constructor(private val clientOptions: ClientOptions) : InterestPayment return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/PhysicalCardServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/PhysicalCardServiceAsyncImpl.kt index 73a797e91..7989586db 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/PhysicalCardServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/PhysicalCardServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -52,7 +52,8 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : PhysicalCardServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption ) private val advanceShipmentHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun advanceShipment( params: PhysicalCardAdvanceShipmentParams, @@ -88,7 +89,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { advanceShipmentHandler.handle(it) } .also { @@ -101,7 +102,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption } private val trackingUpdatesHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun trackingUpdates( params: PhysicalCardTrackingUpdatesParams, @@ -127,7 +128,7 @@ class PhysicalCardServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { trackingUpdatesHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/ProgramServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/ProgramServiceAsyncImpl.kt index ac069ec0a..66a282b32 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/ProgramServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/ProgramServiceAsyncImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -42,7 +42,8 @@ class ProgramServiceAsyncImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : ProgramServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,8 +52,7 @@ class ProgramServiceAsyncImpl internal constructor(private val clientOptions: Cl clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: ProgramCreateParams, @@ -70,7 +70,7 @@ class ProgramServiceAsyncImpl internal constructor(private val clientOptions: Cl return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/RealTimePaymentsTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/RealTimePaymentsTransferServiceAsyncImpl.kt index 8029396e8..3b8a810cd 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/RealTimePaymentsTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/RealTimePaymentsTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -50,7 +50,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : RealTimePaymentsTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -61,7 +62,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val completeHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun complete( params: RealTimePaymentsTransferCompleteParams, @@ -90,7 +90,7 @@ internal constructor(private val clientOptions: ClientOptions) : return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { completeHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/WireDrawdownRequestServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/WireDrawdownRequestServiceAsyncImpl.kt index f9d18d271..de84e7754 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/WireDrawdownRequestServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/WireDrawdownRequestServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -49,7 +49,8 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : WireDrawdownRequestServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -60,7 +61,6 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq private val refuseHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun refuse( params: WireDrawdownRequestRefuseParams, @@ -86,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { refuseHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/WireTransferServiceAsyncImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/WireTransferServiceAsyncImpl.kt index 5ab341c65..617f52a5a 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/WireTransferServiceAsyncImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/async/simulations/WireTransferServiceAsyncImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.async.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -52,7 +52,8 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : WireTransferServiceAsync.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption ) private val reverseHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun reverse( params: WireTransferReverseParams, @@ -88,7 +89,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { reverseHandler.handle(it) } .also { @@ -101,7 +102,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption } private val submitHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun submit( params: WireTransferSubmitParams, @@ -127,7 +128,7 @@ class WireTransferServiceAsyncImpl internal constructor(private val clientOption return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> - response.parseable { + errorHandler.handle(response).parseable { response .use { submitHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountNumberServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountNumberServiceImpl.kt index c8bbef334..ecae7d25e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountNumberServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountNumberServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -69,7 +69,8 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountNumberService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -79,7 +80,7 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AccountNumberCreateParams, @@ -95,7 +96,7 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -107,7 +108,7 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AccountNumberRetrieveParams, @@ -125,7 +126,7 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +138,7 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: AccountNumberUpdateParams, @@ -156,7 +157,7 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -169,7 +170,6 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AccountNumberListParams, @@ -184,7 +184,7 @@ class AccountNumberServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountServiceImpl.kt index 90313d15c..d84c42c18 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -71,7 +71,8 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -80,8 +81,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: AccountCreateParams, @@ -97,7 +97,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -109,7 +109,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AccountRetrieveParams, @@ -127,7 +127,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -138,8 +138,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO } } - private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val updateHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun update( params: AccountUpdateParams, @@ -158,7 +157,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -171,7 +170,6 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AccountListParams, @@ -186,7 +184,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -205,7 +203,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO } private val balanceHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun balance( params: AccountBalanceParams, @@ -223,7 +221,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { balanceHandler.handle(it) } .also { @@ -234,8 +232,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO } } - private val closeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val closeHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun close( params: AccountCloseParams, @@ -254,7 +251,7 @@ class AccountServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { closeHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountStatementServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountStatementServiceImpl.kt index 4a70b1ab0..c8301c019 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountStatementServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountStatementServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -52,7 +52,8 @@ class AccountStatementServiceImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountStatementService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class AccountStatementServiceImpl internal constructor(private val clientOptions ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AccountStatementRetrieveParams, @@ -80,7 +81,7 @@ class AccountStatementServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -93,7 +94,6 @@ class AccountStatementServiceImpl internal constructor(private val clientOptions private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AccountStatementListParams, @@ -108,7 +108,7 @@ class AccountStatementServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountTransferServiceImpl.kt index d8d90b5a3..641c4f6ed 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AccountTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -77,7 +77,8 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -87,7 +88,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AccountTransferCreateParams, @@ -103,7 +104,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -115,7 +116,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AccountTransferRetrieveParams, @@ -133,7 +134,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -146,7 +147,6 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AccountTransferListParams, @@ -161,7 +161,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -180,7 +180,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: } private val approveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun approve( params: AccountTransferApproveParams, @@ -199,7 +199,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -211,7 +211,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: } private val cancelHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun cancel( params: AccountTransferCancelParams, @@ -230,7 +230,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AchPrenotificationServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AchPrenotificationServiceImpl.kt index ce831b721..7b4dd565b 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AchPrenotificationServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AchPrenotificationServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -61,7 +61,8 @@ class AchPrenotificationServiceImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AchPrenotificationService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -71,7 +72,7 @@ class AchPrenotificationServiceImpl internal constructor(private val clientOptio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AchPrenotificationCreateParams, @@ -87,7 +88,7 @@ class AchPrenotificationServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -99,7 +100,7 @@ class AchPrenotificationServiceImpl internal constructor(private val clientOptio } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AchPrenotificationRetrieveParams, @@ -117,7 +118,7 @@ class AchPrenotificationServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -130,7 +131,6 @@ class AchPrenotificationServiceImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AchPrenotificationListParams, @@ -145,7 +145,7 @@ class AchPrenotificationServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AchTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AchTransferServiceImpl.kt index b54d82d16..1edcf5ca1 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AchTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/AchTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -77,7 +77,8 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AchTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -87,7 +88,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AchTransferCreateParams, @@ -103,7 +104,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -115,7 +116,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: AchTransferRetrieveParams, @@ -133,7 +134,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -146,7 +147,6 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: AchTransferListParams, @@ -161,7 +161,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -180,7 +180,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli } private val approveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun approve( params: AchTransferApproveParams, @@ -199,7 +199,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -211,7 +211,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli } private val cancelHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun cancel( params: AchTransferCancelParams, @@ -230,7 +230,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingAccountServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingAccountServiceImpl.kt index 239305407..6517520a9 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingAccountServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingAccountServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -70,7 +70,8 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : BookkeepingAccountService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -80,7 +81,7 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: BookkeepingAccountCreateParams, @@ -96,7 +97,7 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -108,7 +109,7 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: BookkeepingAccountUpdateParams, @@ -127,7 +128,7 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -140,7 +141,6 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: BookkeepingAccountListParams, @@ -155,7 +155,7 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -175,7 +175,6 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio private val balanceHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun balance( params: BookkeepingAccountBalanceParams, @@ -193,7 +192,7 @@ class BookkeepingAccountServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { balanceHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingEntryServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingEntryServiceImpl.kt index d63f36230..7cfee297e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingEntryServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingEntryServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -52,7 +52,8 @@ class BookkeepingEntryServiceImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntryService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class BookkeepingEntryServiceImpl internal constructor(private val clientOptions ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: BookkeepingEntryRetrieveParams, @@ -80,7 +81,7 @@ class BookkeepingEntryServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -93,7 +94,6 @@ class BookkeepingEntryServiceImpl internal constructor(private val clientOptions private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: BookkeepingEntryListParams, @@ -108,7 +108,7 @@ class BookkeepingEntryServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingEntrySetServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingEntrySetServiceImpl.kt index 85da4d449..27ba27ccf 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingEntrySetServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/BookkeepingEntrySetServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -63,7 +63,8 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntrySetService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -74,7 +75,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: BookkeepingEntrySetCreateParams, @@ -90,7 +90,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -103,7 +103,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: BookkeepingEntrySetRetrieveParams, @@ -121,7 +120,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -134,7 +133,6 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: BookkeepingEntrySetListParams, @@ -149,7 +147,7 @@ internal constructor(private val clientOptions: ClientOptions) : BookkeepingEntr .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardDisputeServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardDisputeServiceImpl.kt index 782396a0a..e104a0e80 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardDisputeServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardDisputeServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -61,7 +61,8 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardDisputeService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -71,7 +72,7 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardDisputeCreateParams, @@ -87,7 +88,7 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -99,7 +100,7 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CardDisputeRetrieveParams, @@ -117,7 +118,7 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -130,7 +131,6 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CardDisputeListParams, @@ -145,7 +145,7 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardPaymentServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardPaymentServiceImpl.kt index d8ffac53e..dc1b249b3 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardPaymentServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardPaymentServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -52,7 +52,8 @@ class CardPaymentServiceImpl internal constructor(private val clientOptions: Cli class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardPaymentService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class CardPaymentServiceImpl internal constructor(private val clientOptions: Cli ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CardPaymentRetrieveParams, @@ -80,7 +81,7 @@ class CardPaymentServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -93,7 +94,6 @@ class CardPaymentServiceImpl internal constructor(private val clientOptions: Cli private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CardPaymentListParams, @@ -108,7 +108,7 @@ class CardPaymentServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardPurchaseSupplementServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardPurchaseSupplementServiceImpl.kt index 1f2f91301..20e041395 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardPurchaseSupplementServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardPurchaseSupplementServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -54,7 +54,8 @@ internal constructor(private val clientOptions: ClientOptions) : CardPurchaseSup class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardPurchaseSupplementService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -65,7 +66,6 @@ internal constructor(private val clientOptions: ClientOptions) : CardPurchaseSup private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: CardPurchaseSupplementRetrieveParams, @@ -83,7 +83,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardPurchaseSup .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -96,7 +96,6 @@ internal constructor(private val clientOptions: ClientOptions) : CardPurchaseSup private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CardPurchaseSupplementListParams, @@ -111,7 +110,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardPurchaseSup .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardServiceImpl.kt index 6f95265ca..966685b62 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CardServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -62,7 +62,8 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -71,8 +72,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: CardCreateParams, @@ -88,7 +88,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -99,8 +99,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti } } - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CardRetrieveParams, @@ -118,7 +117,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -129,8 +128,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti } } - private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val updateHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun update( params: CardUpdateParams, @@ -149,7 +147,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -162,7 +160,6 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CardListParams, @@ -177,7 +174,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -196,7 +193,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti } private val detailsHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun details( params: CardDetailsParams, @@ -214,7 +211,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { detailsHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CheckDepositServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CheckDepositServiceImpl.kt index f6cf75f59..543301178 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CheckDepositServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CheckDepositServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -61,7 +61,8 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CheckDepositService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -71,7 +72,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CheckDepositCreateParams, @@ -87,7 +88,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -99,7 +100,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CheckDepositRetrieveParams, @@ -117,7 +118,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -130,7 +131,6 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CheckDepositListParams, @@ -145,7 +145,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CheckTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CheckTransferServiceImpl.kt index 5143b3df5..60b714ead 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CheckTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/CheckTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -85,7 +85,8 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CheckTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -95,7 +96,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CheckTransferCreateParams, @@ -111,7 +112,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -123,7 +124,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: CheckTransferRetrieveParams, @@ -141,7 +142,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -154,7 +155,6 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: CheckTransferListParams, @@ -169,7 +169,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -188,7 +188,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C } private val approveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun approve( params: CheckTransferApproveParams, @@ -207,7 +207,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -219,7 +219,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C } private val cancelHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun cancel( params: CheckTransferCancelParams, @@ -238,7 +238,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { @@ -250,7 +250,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C } private val stopPaymentHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun stopPayment( params: CheckTransferStopPaymentParams, @@ -269,7 +269,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { stopPaymentHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DeclinedTransactionServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DeclinedTransactionServiceImpl.kt index 9db44af96..03e13e21a 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DeclinedTransactionServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DeclinedTransactionServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -54,7 +54,8 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DeclinedTransactionService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -65,7 +66,6 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: DeclinedTransactionRetrieveParams, @@ -83,7 +83,7 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -96,7 +96,6 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: DeclinedTransactionListParams, @@ -111,7 +110,7 @@ internal constructor(private val clientOptions: ClientOptions) : DeclinedTransac .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DigitalCardProfileServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DigitalCardProfileServiceImpl.kt index 69d680922..3f8cc55e1 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DigitalCardProfileServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DigitalCardProfileServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -77,7 +77,8 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DigitalCardProfileService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -87,7 +88,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: DigitalCardProfileCreateParams, @@ -103,7 +104,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -115,7 +116,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: DigitalCardProfileRetrieveParams, @@ -133,7 +134,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -146,7 +147,6 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: DigitalCardProfileListParams, @@ -161,7 +161,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -180,7 +180,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio } private val archiveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun archive( params: DigitalCardProfileArchiveParams, @@ -199,7 +199,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { archiveHandler.handle(it) } .also { @@ -211,7 +211,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio } private val cloneHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun clone( params: DigitalCardProfileCloneParams, @@ -230,7 +230,7 @@ class DigitalCardProfileServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { cloneHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DigitalWalletTokenServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DigitalWalletTokenServiceImpl.kt index dfd7abf19..c9015eb00 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DigitalWalletTokenServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DigitalWalletTokenServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -52,7 +52,8 @@ class DigitalWalletTokenServiceImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTokenService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class DigitalWalletTokenServiceImpl internal constructor(private val clientOptio ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: DigitalWalletTokenRetrieveParams, @@ -80,7 +81,7 @@ class DigitalWalletTokenServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -93,7 +94,6 @@ class DigitalWalletTokenServiceImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: DigitalWalletTokenListParams, @@ -108,7 +108,7 @@ class DigitalWalletTokenServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DocumentServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DocumentServiceImpl.kt index 80676051c..fb6b1e538 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DocumentServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/DocumentServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -58,7 +58,8 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DocumentService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -68,7 +69,7 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: DocumentCreateParams, @@ -84,7 +85,7 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -96,7 +97,7 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: DocumentRetrieveParams, @@ -114,7 +115,7 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -127,7 +128,6 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: DocumentListParams, @@ -142,7 +142,7 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EntityServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EntityServiceImpl.kt index 4f65bd193..1c61e05ab 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EntityServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EntityServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -102,7 +102,8 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : EntityService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -111,8 +112,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: EntityCreateParams, @@ -128,7 +128,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -139,8 +139,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp } } - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: EntityRetrieveParams, @@ -158,7 +157,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -171,7 +170,6 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: EntityListParams, @@ -186,7 +184,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -204,8 +202,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp } } - private val archiveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val archiveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun archive( params: EntityArchiveParams, @@ -224,7 +221,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { archiveHandler.handle(it) } .also { @@ -236,7 +233,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp } private val archiveBeneficialOwnerHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun archiveBeneficialOwner( params: EntityArchiveBeneficialOwnerParams, @@ -255,7 +252,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { archiveBeneficialOwnerHandler.handle(it) } .also { @@ -266,8 +263,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp } } - private val confirmHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val confirmHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun confirm( params: EntityConfirmParams, @@ -286,7 +282,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { confirmHandler.handle(it) } .also { @@ -298,7 +294,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp } private val createBeneficialOwnerHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun createBeneficialOwner( params: EntityCreateBeneficialOwnerParams, @@ -317,7 +313,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createBeneficialOwnerHandler.handle(it) } .also { @@ -329,7 +325,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp } private val updateAddressHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun updateAddress( params: EntityUpdateAddressParams, @@ -348,7 +344,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateAddressHandler.handle(it) } .also { @@ -360,7 +356,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp } private val updateBeneficialOwnerAddressHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun updateBeneficialOwnerAddress( params: EntityUpdateBeneficialOwnerAddressParams, @@ -383,7 +379,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateBeneficialOwnerAddressHandler.handle(it) } .also { @@ -395,7 +391,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp } private val updateIndustryCodeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun updateIndustryCode( params: EntityUpdateIndustryCodeParams, @@ -414,7 +410,7 @@ class EntityServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateIndustryCodeHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EventServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EventServiceImpl.kt index caad67b9e..1d9737984 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EventServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EventServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -46,7 +46,8 @@ class EventServiceImpl internal constructor(private val clientOptions: ClientOpt class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : EventService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -55,8 +56,7 @@ class EventServiceImpl internal constructor(private val clientOptions: ClientOpt clientOptions.toBuilder().apply(modifier::accept).build() ) - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: EventRetrieveParams, @@ -74,7 +74,7 @@ class EventServiceImpl internal constructor(private val clientOptions: ClientOpt .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -87,7 +87,6 @@ class EventServiceImpl internal constructor(private val clientOptions: ClientOpt private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: EventListParams, @@ -102,7 +101,7 @@ class EventServiceImpl internal constructor(private val clientOptions: ClientOpt .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EventSubscriptionServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EventSubscriptionServiceImpl.kt index 5cb655048..17c854137 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EventSubscriptionServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/EventSubscriptionServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -69,7 +69,8 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : EventSubscriptionService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -79,7 +80,7 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: EventSubscriptionCreateParams, @@ -95,7 +96,7 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -107,7 +108,7 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: EventSubscriptionRetrieveParams, @@ -125,7 +126,7 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +138,7 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: EventSubscriptionUpdateParams, @@ -156,7 +157,7 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -169,7 +170,6 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: EventSubscriptionListParams, @@ -184,7 +184,7 @@ class EventSubscriptionServiceImpl internal constructor(private val clientOption .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ExportServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ExportServiceImpl.kt index 38208eaba..0b86ca87b 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ExportServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ExportServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -52,7 +52,8 @@ class ExportServiceImpl internal constructor(private val clientOptions: ClientOp class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : ExportService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -61,8 +62,7 @@ class ExportServiceImpl internal constructor(private val clientOptions: ClientOp clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: ExportCreateParams, @@ -78,7 +78,7 @@ class ExportServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -89,8 +89,7 @@ class ExportServiceImpl internal constructor(private val clientOptions: ClientOp } } - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: ExportRetrieveParams, @@ -108,7 +107,7 @@ class ExportServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -121,7 +120,6 @@ class ExportServiceImpl internal constructor(private val clientOptions: ClientOp private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: ExportListParams, @@ -136,7 +134,7 @@ class ExportServiceImpl internal constructor(private val clientOptions: ClientOp .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ExternalAccountServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ExternalAccountServiceImpl.kt index f22f0b811..a5fb56fdf 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ExternalAccountServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ExternalAccountServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -69,7 +69,8 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : ExternalAccountService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -79,7 +80,7 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: ExternalAccountCreateParams, @@ -95,7 +96,7 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -107,7 +108,7 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: ExternalAccountRetrieveParams, @@ -125,7 +126,7 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +138,7 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: ExternalAccountUpdateParams, @@ -156,7 +157,7 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -169,7 +170,6 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: ExternalAccountListParams, @@ -184,7 +184,7 @@ class ExternalAccountServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/FileLinkServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/FileLinkServiceImpl.kt index 8cdc24497..bec84b25e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/FileLinkServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/FileLinkServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -38,7 +38,8 @@ class FileLinkServiceImpl internal constructor(private val clientOptions: Client class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : FileLinkService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -48,7 +49,7 @@ class FileLinkServiceImpl internal constructor(private val clientOptions: Client ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: FileLinkCreateParams, @@ -64,7 +65,7 @@ class FileLinkServiceImpl internal constructor(private val clientOptions: Client .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/FileServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/FileServiceImpl.kt index b0ac0476f..00361dd38 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/FileServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/FileServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.multipartFormData @@ -51,7 +51,8 @@ class FileServiceImpl internal constructor(private val clientOptions: ClientOpti class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : FileService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -60,8 +61,7 @@ class FileServiceImpl internal constructor(private val clientOptions: ClientOpti clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: FileCreateParams, @@ -77,7 +77,7 @@ class FileServiceImpl internal constructor(private val clientOptions: ClientOpti .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -88,8 +88,7 @@ class FileServiceImpl internal constructor(private val clientOptions: ClientOpti } } - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: FileRetrieveParams, @@ -107,7 +106,7 @@ class FileServiceImpl internal constructor(private val clientOptions: ClientOpti .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -120,7 +119,6 @@ class FileServiceImpl internal constructor(private val clientOptions: ClientOpti private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: FileListParams, @@ -135,7 +133,7 @@ class FileServiceImpl internal constructor(private val clientOptions: ClientOpti .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/GroupServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/GroupServiceImpl.kt index 6bccb65ab..66cf2ec9b 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/GroupServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/GroupServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -37,7 +37,8 @@ class GroupServiceImpl internal constructor(private val clientOptions: ClientOpt class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : GroupService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -46,8 +47,7 @@ class GroupServiceImpl internal constructor(private val clientOptions: ClientOpt clientOptions.toBuilder().apply(modifier::accept).build() ) - private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: GroupRetrieveParams, @@ -62,7 +62,7 @@ class GroupServiceImpl internal constructor(private val clientOptions: ClientOpt .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundAchTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundAchTransferServiceImpl.kt index 8b4e88dce..d4ecf5c59 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundAchTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundAchTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -77,7 +77,8 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundAchTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -87,7 +88,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: InboundAchTransferRetrieveParams, @@ -105,7 +106,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -118,7 +119,6 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundAchTransferListParams, @@ -133,7 +133,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -152,7 +152,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio } private val createNotificationOfChangeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun createNotificationOfChange( params: InboundAchTransferCreateNotificationOfChangeParams, @@ -175,7 +175,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createNotificationOfChangeHandler.handle(it) } .also { @@ -187,7 +187,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio } private val declineHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun decline( params: InboundAchTransferDeclineParams, @@ -206,7 +206,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { declineHandler.handle(it) } .also { @@ -218,7 +218,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio } private val transferReturnHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun transferReturn( params: InboundAchTransferTransferReturnParams, @@ -241,7 +241,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { transferReturnHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundCheckDepositServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundCheckDepositServiceImpl.kt index 98173d18c..34a959466 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundCheckDepositServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundCheckDepositServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -71,7 +71,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundCheckDepositService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -82,7 +83,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: InboundCheckDepositRetrieveParams, @@ -100,7 +100,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -113,7 +113,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundCheckDepositListParams, @@ -128,7 +127,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -148,7 +147,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val declineHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun decline( params: InboundCheckDepositDeclineParams, @@ -167,7 +165,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { declineHandler.handle(it) } .also { @@ -180,7 +178,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val returnHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun return_( params: InboundCheckDepositReturnParams, @@ -199,7 +196,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { returnHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundMailItemServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundMailItemServiceImpl.kt index bf3974bad..ad4a06935 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundMailItemServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundMailItemServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -52,7 +52,8 @@ class InboundMailItemServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundMailItemService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class InboundMailItemServiceImpl internal constructor(private val clientOptions: ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: InboundMailItemRetrieveParams, @@ -80,7 +81,7 @@ class InboundMailItemServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -93,7 +94,6 @@ class InboundMailItemServiceImpl internal constructor(private val clientOptions: private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundMailItemListParams, @@ -108,7 +108,7 @@ class InboundMailItemServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundRealTimePaymentsTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundRealTimePaymentsTransferServiceImpl.kt index c0e7c01c1..1bac9db55 100755 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundRealTimePaymentsTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundRealTimePaymentsTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -58,7 +58,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundRealTimePaymentsTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -69,7 +70,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: InboundRealTimePaymentsTransferRetrieveParams, @@ -90,7 +90,7 @@ internal constructor(private val clientOptions: ClientOptions) : .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -103,7 +103,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundRealTimePaymentsTransferListParams, @@ -118,7 +117,7 @@ internal constructor(private val clientOptions: ClientOptions) : .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundWireDrawdownRequestServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundWireDrawdownRequestServiceImpl.kt index fc5e57495..b41c6b587 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundWireDrawdownRequestServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundWireDrawdownRequestServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -57,7 +57,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireDraw class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundWireDrawdownRequestService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -68,7 +69,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireDraw private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: InboundWireDrawdownRequestRetrieveParams, @@ -89,7 +89,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireDraw .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -102,7 +102,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireDraw private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundWireDrawdownRequestListParams, @@ -117,7 +116,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireDraw .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundWireTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundWireTransferServiceImpl.kt index 3b45decd7..8a1290124 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundWireTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/InboundWireTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -63,7 +63,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundWireTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -74,7 +75,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: InboundWireTransferRetrieveParams, @@ -92,7 +92,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -105,7 +105,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: InboundWireTransferListParams, @@ -120,7 +119,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -140,7 +139,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran private val reverseHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun reverse( params: InboundWireTransferReverseParams, @@ -159,7 +157,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { reverseHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiAccountEnrollmentServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiAccountEnrollmentServiceImpl.kt index a72455054..a0a00c40e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiAccountEnrollmentServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiAccountEnrollmentServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -74,7 +74,8 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountEnrollmentService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -85,7 +86,6 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: IntrafiAccountEnrollmentCreateParams, @@ -101,7 +101,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -114,7 +114,6 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: IntrafiAccountEnrollmentRetrieveParams, @@ -135,7 +134,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -148,7 +147,6 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: IntrafiAccountEnrollmentListParams, @@ -163,7 +161,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -183,7 +181,6 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE private val unenrollHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun unenroll( params: IntrafiAccountEnrollmentUnenrollParams, @@ -209,7 +206,7 @@ internal constructor(private val clientOptions: ClientOptions) : IntrafiAccountE .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { unenrollHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiBalanceServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiBalanceServiceImpl.kt index 1f47ab2d9..f43052afc 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiBalanceServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiBalanceServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -42,7 +42,8 @@ class IntrafiBalanceServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : IntrafiBalanceService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,7 @@ class IntrafiBalanceServiceImpl internal constructor(private val clientOptions: ) private val intrafiBalanceHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun intrafiBalance( params: IntrafiBalanceIntrafiBalanceParams, @@ -70,7 +71,7 @@ class IntrafiBalanceServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { intrafiBalanceHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiExclusionServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiExclusionServiceImpl.kt index 8a049e26f..0baa10a1d 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiExclusionServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/IntrafiExclusionServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -69,7 +69,8 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : IntrafiExclusionService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -79,7 +80,7 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: IntrafiExclusionCreateParams, @@ -95,7 +96,7 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -107,7 +108,7 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: IntrafiExclusionRetrieveParams, @@ -125,7 +126,7 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -138,7 +139,6 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: IntrafiExclusionListParams, @@ -153,7 +153,7 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -172,7 +172,7 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions } private val archiveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun archive( params: IntrafiExclusionArchiveParams, @@ -191,7 +191,7 @@ class IntrafiExclusionServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { archiveHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/LockboxServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/LockboxServiceImpl.kt index 2e3610d50..5bf790592 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/LockboxServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/LockboxServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -57,7 +57,8 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : LockboxService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -66,8 +67,7 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: LockboxCreateParams, @@ -83,7 +83,7 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -95,7 +95,7 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: LockboxRetrieveParams, @@ -113,7 +113,7 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -124,8 +124,7 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO } } - private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val updateHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun update( params: LockboxUpdateParams, @@ -144,7 +143,7 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -157,7 +156,6 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: LockboxListParams, @@ -172,7 +170,7 @@ class LockboxServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthApplicationServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthApplicationServiceImpl.kt index df9188047..7a1bca392 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthApplicationServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthApplicationServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -52,7 +52,8 @@ class OAuthApplicationServiceImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : OAuthApplicationService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class OAuthApplicationServiceImpl internal constructor(private val clientOptions ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: OAuthApplicationRetrieveParams, @@ -80,7 +81,7 @@ class OAuthApplicationServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -93,7 +94,6 @@ class OAuthApplicationServiceImpl internal constructor(private val clientOptions private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: OAuthApplicationListParams, @@ -108,7 +108,7 @@ class OAuthApplicationServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthConnectionServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthConnectionServiceImpl.kt index 2ec59267e..5d619edda 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthConnectionServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthConnectionServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -52,7 +52,8 @@ class OAuthConnectionServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : OAuthConnectionService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class OAuthConnectionServiceImpl internal constructor(private val clientOptions: ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: OAuthConnectionRetrieveParams, @@ -80,7 +81,7 @@ class OAuthConnectionServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -93,7 +94,6 @@ class OAuthConnectionServiceImpl internal constructor(private val clientOptions: private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: OAuthConnectionListParams, @@ -108,7 +108,7 @@ class OAuthConnectionServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthTokenServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthTokenServiceImpl.kt index 39df59f89..a842e6391 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthTokenServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/OAuthTokenServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class OAuthTokenServiceImpl internal constructor(private val clientOptions: Clie class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : OAuthTokenService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class OAuthTokenServiceImpl internal constructor(private val clientOptions: Clie ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: OAuthTokenCreateParams, @@ -67,7 +68,7 @@ class OAuthTokenServiceImpl internal constructor(private val clientOptions: Clie .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PendingTransactionServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PendingTransactionServiceImpl.kt index eb22e905f..cecbf4919 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PendingTransactionServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PendingTransactionServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -69,7 +69,8 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : PendingTransactionService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -79,7 +80,7 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: PendingTransactionCreateParams, @@ -95,7 +96,7 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -107,7 +108,7 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: PendingTransactionRetrieveParams, @@ -125,7 +126,7 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -138,7 +139,6 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: PendingTransactionListParams, @@ -153,7 +153,7 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -172,7 +172,7 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio } private val releaseHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun release( params: PendingTransactionReleaseParams, @@ -191,7 +191,7 @@ class PendingTransactionServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { releaseHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PhysicalCardProfileServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PhysicalCardProfileServiceImpl.kt index b61f74ebb..40e0ff72d 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PhysicalCardProfileServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PhysicalCardProfileServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -79,7 +79,8 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : PhysicalCardProfileService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -90,7 +91,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: PhysicalCardProfileCreateParams, @@ -106,7 +106,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -119,7 +119,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: PhysicalCardProfileRetrieveParams, @@ -137,7 +136,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -150,7 +149,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: PhysicalCardProfileListParams, @@ -165,7 +163,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -185,7 +183,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val archiveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun archive( params: PhysicalCardProfileArchiveParams, @@ -204,7 +201,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { archiveHandler.handle(it) } .also { @@ -217,7 +214,6 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro private val cloneHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun clone( params: PhysicalCardProfileCloneParams, @@ -236,7 +232,7 @@ internal constructor(private val clientOptions: ClientOptions) : PhysicalCardPro .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { cloneHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PhysicalCardServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PhysicalCardServiceImpl.kt index 978652388..012caa92b 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PhysicalCardServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/PhysicalCardServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -69,7 +69,8 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : PhysicalCardService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -79,7 +80,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: PhysicalCardCreateParams, @@ -95,7 +96,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -107,7 +108,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: PhysicalCardRetrieveParams, @@ -125,7 +126,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -137,7 +138,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl } private val updateHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun update( params: PhysicalCardUpdateParams, @@ -156,7 +157,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { updateHandler.handle(it) } .also { @@ -169,7 +170,6 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: PhysicalCardListParams, @@ -184,7 +184,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ProgramServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ProgramServiceImpl.kt index 17a4f3360..8196bf916 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ProgramServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/ProgramServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -46,7 +46,8 @@ class ProgramServiceImpl internal constructor(private val clientOptions: ClientO class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : ProgramService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -56,7 +57,7 @@ class ProgramServiceImpl internal constructor(private val clientOptions: ClientO ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: ProgramRetrieveParams, @@ -74,7 +75,7 @@ class ProgramServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -87,7 +88,6 @@ class ProgramServiceImpl internal constructor(private val clientOptions: ClientO private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: ProgramListParams, @@ -102,7 +102,7 @@ class ProgramServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RealTimeDecisionServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RealTimeDecisionServiceImpl.kt index 8aa5de595..43b8eb353 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RealTimeDecisionServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RealTimeDecisionServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -51,7 +51,8 @@ class RealTimeDecisionServiceImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : RealTimeDecisionService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -61,7 +62,7 @@ class RealTimeDecisionServiceImpl internal constructor(private val clientOptions ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: RealTimeDecisionRetrieveParams, @@ -79,7 +80,7 @@ class RealTimeDecisionServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -91,7 +92,7 @@ class RealTimeDecisionServiceImpl internal constructor(private val clientOptions } private val actionHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun action( params: RealTimeDecisionActionParams, @@ -110,7 +111,7 @@ class RealTimeDecisionServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { actionHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RealTimePaymentsTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RealTimePaymentsTransferServiceImpl.kt index 313da062b..e215aa58e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RealTimePaymentsTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RealTimePaymentsTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -82,7 +82,8 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : RealTimePaymentsTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -93,7 +94,6 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: RealTimePaymentsTransferCreateParams, @@ -109,7 +109,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -122,7 +122,6 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: RealTimePaymentsTransferRetrieveParams, @@ -143,7 +142,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -156,7 +155,6 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: RealTimePaymentsTransferListParams, @@ -171,7 +169,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -191,7 +189,6 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment private val approveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun approve( params: RealTimePaymentsTransferApproveParams, @@ -217,7 +214,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -230,7 +227,6 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment private val cancelHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun cancel( params: RealTimePaymentsTransferCancelParams, @@ -252,7 +248,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RoutingNumberServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RoutingNumberServiceImpl.kt index bdaf50144..5dd9da36c 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RoutingNumberServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/RoutingNumberServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -41,7 +41,8 @@ class RoutingNumberServiceImpl internal constructor(private val clientOptions: C class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : RoutingNumberService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,6 @@ class RoutingNumberServiceImpl internal constructor(private val clientOptions: C private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: RoutingNumberListParams, @@ -67,7 +67,7 @@ class RoutingNumberServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/SupplementalDocumentServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/SupplementalDocumentServiceImpl.kt index e96b85cd3..c41832bcc 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/SupplementalDocumentServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/SupplementalDocumentServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -53,7 +53,8 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : SupplementalDocumentService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -64,7 +65,6 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: SupplementalDocumentCreateParams, @@ -80,7 +80,7 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -93,7 +93,6 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: SupplementalDocumentListParams, @@ -108,7 +107,7 @@ internal constructor(private val clientOptions: ClientOptions) : SupplementalDoc .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/TransactionServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/TransactionServiceImpl.kt index 1675a6b29..38782bb61 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/TransactionServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/TransactionServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.parseable @@ -52,7 +52,8 @@ class TransactionServiceImpl internal constructor(private val clientOptions: Cli class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : TransactionService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -62,7 +63,7 @@ class TransactionServiceImpl internal constructor(private val clientOptions: Cli ) private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: TransactionRetrieveParams, @@ -80,7 +81,7 @@ class TransactionServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -93,7 +94,6 @@ class TransactionServiceImpl internal constructor(private val clientOptions: Cli private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: TransactionListParams, @@ -108,7 +108,7 @@ class TransactionServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/WireDrawdownRequestServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/WireDrawdownRequestServiceImpl.kt index 7011b9f2f..8de84220c 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/WireDrawdownRequestServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/WireDrawdownRequestServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -63,7 +63,8 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : WireDrawdownRequestService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -74,7 +75,6 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: WireDrawdownRequestCreateParams, @@ -90,7 +90,7 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -103,7 +103,6 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq private val retrieveHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun retrieve( params: WireDrawdownRequestRetrieveParams, @@ -121,7 +120,7 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -134,7 +133,6 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: WireDrawdownRequestListParams, @@ -149,7 +147,7 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/WireTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/WireTransferServiceImpl.kt index 2e563d634..6a4ee137a 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/WireTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/WireTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -77,7 +77,8 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : WireTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -87,7 +88,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: WireTransferCreateParams, @@ -103,7 +104,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { @@ -115,7 +116,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl } private val retrieveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun retrieve( params: WireTransferRetrieveParams, @@ -133,7 +134,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { retrieveHandler.handle(it) } .also { @@ -146,7 +147,6 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun list( params: WireTransferListParams, @@ -161,7 +161,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { listHandler.handle(it) } .also { @@ -180,7 +180,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl } private val approveHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun approve( params: WireTransferApproveParams, @@ -199,7 +199,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { approveHandler.handle(it) } .also { @@ -211,7 +211,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl } private val cancelHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun cancel( params: WireTransferCancelParams, @@ -230,7 +230,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { cancelHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AccountStatementServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AccountStatementServiceImpl.kt index f8a91eff5..514ae2ee2 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AccountStatementServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AccountStatementServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class AccountStatementServiceImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountStatementService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class AccountStatementServiceImpl internal constructor(private val clientOptions ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: AccountStatementCreateParams, @@ -67,7 +68,7 @@ class AccountStatementServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AccountTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AccountTransferServiceImpl.kt index 6622eb538..90b46d30e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AccountTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AccountTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -43,7 +43,8 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AccountTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -53,7 +54,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: ) private val completeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun complete( params: AccountTransferCompleteParams, @@ -77,7 +78,7 @@ class AccountTransferServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { completeHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AchTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AchTransferServiceImpl.kt index 0d7761683..17b97cfbe 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AchTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/AchTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -75,7 +75,8 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : AchTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -85,7 +86,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli ) private val acknowledgeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun acknowledge( params: AchTransferAcknowledgeParams, @@ -109,7 +110,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { acknowledgeHandler.handle(it) } .also { @@ -121,7 +122,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli } private val createNotificationOfChangeHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun createNotificationOfChange( params: AchTransferCreateNotificationOfChangeParams, @@ -145,7 +146,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createNotificationOfChangeHandler.handle(it) } .also { @@ -157,7 +158,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli } private val returnHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun return_( params: AchTransferReturnParams, @@ -176,7 +177,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { returnHandler.handle(it) } .also { @@ -188,7 +189,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli } private val settleHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun settle( params: AchTransferSettleParams, @@ -207,7 +208,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { settleHandler.handle(it) } .also { @@ -219,7 +220,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli } private val submitHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun submit( params: AchTransferSubmitParams, @@ -238,7 +239,7 @@ class AchTransferServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { submitHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardAuthorizationExpirationServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardAuthorizationExpirationServiceImpl.kt index 691ec4cf9..38ebdbaf5 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardAuthorizationExpirationServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardAuthorizationExpirationServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -47,7 +47,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardAuthorizationExpirationService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -57,7 +58,7 @@ internal constructor(private val clientOptions: ClientOptions) : ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardAuthorizationExpirationCreateParams, @@ -73,7 +74,7 @@ internal constructor(private val clientOptions: ClientOptions) : .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardAuthorizationServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardAuthorizationServiceImpl.kt index 3636bd217..5fde2ad25 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardAuthorizationServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardAuthorizationServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class CardAuthorizationServiceImpl internal constructor(private val clientOption class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardAuthorizationService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -52,7 +53,6 @@ class CardAuthorizationServiceImpl internal constructor(private val clientOption private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: CardAuthorizationCreateParams, @@ -68,7 +68,7 @@ class CardAuthorizationServiceImpl internal constructor(private val clientOption .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardDisputeServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardDisputeServiceImpl.kt index 7f3c71b2b..a78487adb 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardDisputeServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardDisputeServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -43,7 +43,8 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardDisputeService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -53,7 +54,7 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli ) private val actionHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun action( params: CardDisputeActionParams, @@ -72,7 +73,7 @@ class CardDisputeServiceImpl internal constructor(private val clientOptions: Cli .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { actionHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardFuelConfirmationServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardFuelConfirmationServiceImpl.kt index 93ddcc49c..df7c9550e 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardFuelConfirmationServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardFuelConfirmationServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -43,7 +43,8 @@ internal constructor(private val clientOptions: ClientOptions) : CardFuelConfirm class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardFuelConfirmationService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -53,7 +54,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardFuelConfirm ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardFuelConfirmationCreateParams, @@ -69,7 +70,7 @@ internal constructor(private val clientOptions: ClientOptions) : CardFuelConfirm .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardIncrementServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardIncrementServiceImpl.kt index dcb5d222c..96678bbeb 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardIncrementServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardIncrementServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class CardIncrementServiceImpl internal constructor(private val clientOptions: C class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardIncrementService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class CardIncrementServiceImpl internal constructor(private val clientOptions: C ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardIncrementCreateParams, @@ -67,7 +68,7 @@ class CardIncrementServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardRefundServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardRefundServiceImpl.kt index 48b1bac17..db98439c9 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardRefundServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardRefundServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class CardRefundServiceImpl internal constructor(private val clientOptions: Clie class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardRefundService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class CardRefundServiceImpl internal constructor(private val clientOptions: Clie ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardRefundCreateParams, @@ -67,7 +68,7 @@ class CardRefundServiceImpl internal constructor(private val clientOptions: Clie .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardReversalServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardReversalServiceImpl.kt index a74064475..3618c0d95 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardReversalServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardReversalServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class CardReversalServiceImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardReversalService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class CardReversalServiceImpl internal constructor(private val clientOptions: Cl ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardReversalCreateParams, @@ -67,7 +68,7 @@ class CardReversalServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardSettlementServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardSettlementServiceImpl.kt index 9721359e1..422a65955 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardSettlementServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CardSettlementServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class CardSettlementServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CardSettlementService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class CardSettlementServiceImpl internal constructor(private val clientOptions: ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: CardSettlementCreateParams, @@ -67,7 +68,7 @@ class CardSettlementServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CheckDepositServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CheckDepositServiceImpl.kt index ab295bf86..53b47052c 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CheckDepositServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CheckDepositServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -59,7 +59,8 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CheckDepositService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -69,7 +70,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl ) private val rejectHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun reject( params: CheckDepositRejectParams, @@ -93,7 +94,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { rejectHandler.handle(it) } .also { @@ -105,7 +106,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl } private val returnHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun return_( params: CheckDepositReturnParams, @@ -129,7 +130,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { returnHandler.handle(it) } .also { @@ -141,7 +142,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl } private val submitHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun submit( params: CheckDepositSubmitParams, @@ -165,7 +166,7 @@ class CheckDepositServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { submitHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CheckTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CheckTransferServiceImpl.kt index 0e93be737..cb64e2f21 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CheckTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/CheckTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -43,7 +43,8 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : CheckTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -53,7 +54,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C ) private val mailHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun mail( params: CheckTransferMailParams, @@ -72,7 +73,7 @@ class CheckTransferServiceImpl internal constructor(private val clientOptions: C .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { mailHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/DigitalWalletTokenRequestServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/DigitalWalletTokenRequestServiceImpl.kt index 4751d0eca..62dbeb54a 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/DigitalWalletTokenRequestServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/DigitalWalletTokenRequestServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -46,7 +46,8 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTo class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTokenRequestService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -57,7 +58,6 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTo private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: DigitalWalletTokenRequestCreateParams, @@ -73,7 +73,7 @@ internal constructor(private val clientOptions: ClientOptions) : DigitalWalletTo .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/DocumentServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/DocumentServiceImpl.kt index 7c2b78e88..f0843a991 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/DocumentServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/DocumentServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -38,7 +38,8 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : DocumentService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -48,7 +49,7 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: DocumentCreateParams, @@ -64,7 +65,7 @@ class DocumentServiceImpl internal constructor(private val clientOptions: Client .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundAchTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundAchTransferServiceImpl.kt index c5d312de3..63b79d486 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundAchTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundAchTransferServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundAchTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: InboundAchTransferCreateParams, @@ -67,7 +68,7 @@ class InboundAchTransferServiceImpl internal constructor(private val clientOptio .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundCheckDepositServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundCheckDepositServiceImpl.kt index 9c3d72cac..6aecc2213 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundCheckDepositServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundCheckDepositServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -43,7 +43,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundCheckDepositService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: InboundCheckDepositCreateParams, @@ -70,7 +70,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundCheckDep .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundFundsHoldServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundFundsHoldServiceImpl.kt index 360f5e1fe..56aa25348 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundFundsHoldServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundFundsHoldServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -43,7 +43,8 @@ class InboundFundsHoldServiceImpl internal constructor(private val clientOptions class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundFundsHoldService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,6 @@ class InboundFundsHoldServiceImpl internal constructor(private val clientOptions private val releaseHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun release( params: InboundFundsHoldReleaseParams, @@ -78,7 +78,7 @@ class InboundFundsHoldServiceImpl internal constructor(private val clientOptions .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { releaseHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundMailItemServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundMailItemServiceImpl.kt index 078af0525..39fc2dc5a 100755 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundMailItemServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundMailItemServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class InboundMailItemServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundMailItemService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class InboundMailItemServiceImpl internal constructor(private val clientOptions: ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: InboundMailItemCreateParams, @@ -67,7 +68,7 @@ class InboundMailItemServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundRealTimePaymentsTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundRealTimePaymentsTransferServiceImpl.kt index bd9cfda2c..614b000f8 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundRealTimePaymentsTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundRealTimePaymentsTransferServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -47,7 +47,8 @@ internal constructor(private val clientOptions: ClientOptions) : class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundRealTimePaymentsTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -58,7 +59,6 @@ internal constructor(private val clientOptions: ClientOptions) : private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: InboundRealTimePaymentsTransferCreateParams, @@ -74,7 +74,7 @@ internal constructor(private val clientOptions: ClientOptions) : .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundWireDrawdownRequestServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundWireDrawdownRequestServiceImpl.kt index 7ca469149..a2f622b4f 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundWireDrawdownRequestServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundWireDrawdownRequestServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -46,7 +46,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireDraw class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundWireDrawdownRequestService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -57,7 +58,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireDraw private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: InboundWireDrawdownRequestCreateParams, @@ -73,7 +73,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireDraw .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundWireTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundWireTransferServiceImpl.kt index a2b7896a0..cc4959ed3 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundWireTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InboundWireTransferServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -43,7 +43,8 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InboundWireTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -54,7 +55,6 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun create( params: InboundWireTransferCreateParams, @@ -70,7 +70,7 @@ internal constructor(private val clientOptions: ClientOptions) : InboundWireTran .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InterestPaymentServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InterestPaymentServiceImpl.kt index 65b23246f..a994818ff 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InterestPaymentServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/InterestPaymentServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -41,7 +41,8 @@ class InterestPaymentServiceImpl internal constructor(private val clientOptions: class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : InterestPaymentService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -51,7 +52,7 @@ class InterestPaymentServiceImpl internal constructor(private val clientOptions: ) private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun create( params: InterestPaymentCreateParams, @@ -67,7 +68,7 @@ class InterestPaymentServiceImpl internal constructor(private val clientOptions: .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/PhysicalCardServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/PhysicalCardServiceImpl.kt index 4710ff7a3..8d950be39 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/PhysicalCardServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/PhysicalCardServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -51,7 +51,8 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : PhysicalCardService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -61,7 +62,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl ) private val advanceShipmentHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun advanceShipment( params: PhysicalCardAdvanceShipmentParams, @@ -85,7 +86,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { advanceShipmentHandler.handle(it) } .also { @@ -97,7 +98,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl } private val trackingUpdatesHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun trackingUpdates( params: PhysicalCardTrackingUpdatesParams, @@ -121,7 +122,7 @@ class PhysicalCardServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { trackingUpdatesHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/ProgramServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/ProgramServiceImpl.kt index 109a88b50..aa26674dc 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/ProgramServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/ProgramServiceImpl.kt @@ -3,13 +3,13 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -38,7 +38,8 @@ class ProgramServiceImpl internal constructor(private val clientOptions: ClientO class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : ProgramService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -47,8 +48,7 @@ class ProgramServiceImpl internal constructor(private val clientOptions: ClientO clientOptions.toBuilder().apply(modifier::accept).build() ) - private val createHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + private val createHandler: Handler = jsonHandler(clientOptions.jsonMapper) override fun create( params: ProgramCreateParams, @@ -64,7 +64,7 @@ class ProgramServiceImpl internal constructor(private val clientOptions: ClientO .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { createHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/RealTimePaymentsTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/RealTimePaymentsTransferServiceImpl.kt index ff25bdb81..01853c660 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/RealTimePaymentsTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/RealTimePaymentsTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -48,7 +48,8 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : RealTimePaymentsTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -59,7 +60,6 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment private val completeHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun complete( params: RealTimePaymentsTransferCompleteParams, @@ -86,7 +86,7 @@ internal constructor(private val clientOptions: ClientOptions) : RealTimePayment .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { completeHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/WireDrawdownRequestServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/WireDrawdownRequestServiceImpl.kt index f1c0c4832..2e922c37c 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/WireDrawdownRequestServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/WireDrawdownRequestServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -45,7 +45,8 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : WireDrawdownRequestService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -56,7 +57,6 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq private val refuseHandler: Handler = jsonHandler(clientOptions.jsonMapper) - .withErrorHandler(errorHandler) override fun refuse( params: WireDrawdownRequestRefuseParams, @@ -80,7 +80,7 @@ internal constructor(private val clientOptions: ClientOptions) : WireDrawdownReq .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { refuseHandler.handle(it) } .also { diff --git a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/WireTransferServiceImpl.kt b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/WireTransferServiceImpl.kt index 79503555a..bd9fffa97 100644 --- a/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/WireTransferServiceImpl.kt +++ b/increase-java-core/src/main/kotlin/com/increase/api/services/blocking/simulations/WireTransferServiceImpl.kt @@ -3,14 +3,14 @@ package com.increase.api.services.blocking.simulations import com.increase.api.core.ClientOptions -import com.increase.api.core.JsonValue import com.increase.api.core.RequestOptions import com.increase.api.core.checkRequired +import com.increase.api.core.handlers.errorBodyHandler import com.increase.api.core.handlers.errorHandler import com.increase.api.core.handlers.jsonHandler -import com.increase.api.core.handlers.withErrorHandler import com.increase.api.core.http.HttpMethod import com.increase.api.core.http.HttpRequest +import com.increase.api.core.http.HttpResponse import com.increase.api.core.http.HttpResponse.Handler import com.increase.api.core.http.HttpResponseFor import com.increase.api.core.http.json @@ -51,7 +51,8 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) : WireTransferService.WithRawResponse { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val errorHandler: Handler = + errorHandler(errorBodyHandler(clientOptions.jsonMapper)) override fun withOptions( modifier: Consumer @@ -61,7 +62,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl ) private val reverseHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun reverse( params: WireTransferReverseParams, @@ -85,7 +86,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { reverseHandler.handle(it) } .also { @@ -97,7 +98,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl } private val submitHandler: Handler = - jsonHandler(clientOptions.jsonMapper).withErrorHandler(errorHandler) + jsonHandler(clientOptions.jsonMapper) override fun submit( params: WireTransferSubmitParams, @@ -121,7 +122,7 @@ class WireTransferServiceImpl internal constructor(private val clientOptions: Cl .prepare(clientOptions, params) val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions)) val response = clientOptions.httpClient.execute(request, requestOptions) - return response.parseable { + return errorHandler.handle(response).parseable { response .use { submitHandler.handle(it) } .also { diff --git a/increase-java-core/src/test/kotlin/com/increase/api/services/ErrorHandlingTest.kt b/increase-java-core/src/test/kotlin/com/increase/api/services/ErrorHandlingTest.kt index 2b349874d..3868bdc9c 100644 --- a/increase-java-core/src/test/kotlin/com/increase/api/services/ErrorHandlingTest.kt +++ b/increase-java-core/src/test/kotlin/com/increase/api/services/ErrorHandlingTest.kt @@ -85,6 +85,33 @@ internal class ErrorHandlingTest { assertThat(e.body()).isEqualTo(ERROR_JSON) } + @Test + fun accountsCreate400WithRawResponse() { + val accountService = client.accounts().withRawResponse() + stubFor( + post(anyUrl()) + .willReturn( + status(400).withHeader(HEADER_NAME, HEADER_VALUE).withBody(ERROR_JSON_BYTES) + ) + ) + + val e = + assertThrows { + accountService.create( + AccountCreateParams.builder() + .name("New Account!") + .entityId("entity_n8y8tnk2p9339ti393yi") + .informationalEntityId("informational_entity_id") + .programId("program_i2v2os4mwza1oetokh9i") + .build() + ) + } + + assertThat(e.statusCode()).isEqualTo(400) + assertThat(e.headers().toMap()).contains(entry(HEADER_NAME, listOf(HEADER_VALUE))) + assertThat(e.body()).isEqualTo(ERROR_JSON) + } + @Test fun accountsCreate401() { val accountService = client.accounts() @@ -112,6 +139,33 @@ internal class ErrorHandlingTest { assertThat(e.body()).isEqualTo(ERROR_JSON) } + @Test + fun accountsCreate401WithRawResponse() { + val accountService = client.accounts().withRawResponse() + stubFor( + post(anyUrl()) + .willReturn( + status(401).withHeader(HEADER_NAME, HEADER_VALUE).withBody(ERROR_JSON_BYTES) + ) + ) + + val e = + assertThrows { + accountService.create( + AccountCreateParams.builder() + .name("New Account!") + .entityId("entity_n8y8tnk2p9339ti393yi") + .informationalEntityId("informational_entity_id") + .programId("program_i2v2os4mwza1oetokh9i") + .build() + ) + } + + assertThat(e.statusCode()).isEqualTo(401) + assertThat(e.headers().toMap()).contains(entry(HEADER_NAME, listOf(HEADER_VALUE))) + assertThat(e.body()).isEqualTo(ERROR_JSON) + } + @Test fun accountsCreate403() { val accountService = client.accounts() @@ -139,6 +193,33 @@ internal class ErrorHandlingTest { assertThat(e.body()).isEqualTo(ERROR_JSON) } + @Test + fun accountsCreate403WithRawResponse() { + val accountService = client.accounts().withRawResponse() + stubFor( + post(anyUrl()) + .willReturn( + status(403).withHeader(HEADER_NAME, HEADER_VALUE).withBody(ERROR_JSON_BYTES) + ) + ) + + val e = + assertThrows { + accountService.create( + AccountCreateParams.builder() + .name("New Account!") + .entityId("entity_n8y8tnk2p9339ti393yi") + .informationalEntityId("informational_entity_id") + .programId("program_i2v2os4mwza1oetokh9i") + .build() + ) + } + + assertThat(e.statusCode()).isEqualTo(403) + assertThat(e.headers().toMap()).contains(entry(HEADER_NAME, listOf(HEADER_VALUE))) + assertThat(e.body()).isEqualTo(ERROR_JSON) + } + @Test fun accountsCreate404() { val accountService = client.accounts() @@ -166,6 +247,33 @@ internal class ErrorHandlingTest { assertThat(e.body()).isEqualTo(ERROR_JSON) } + @Test + fun accountsCreate404WithRawResponse() { + val accountService = client.accounts().withRawResponse() + stubFor( + post(anyUrl()) + .willReturn( + status(404).withHeader(HEADER_NAME, HEADER_VALUE).withBody(ERROR_JSON_BYTES) + ) + ) + + val e = + assertThrows { + accountService.create( + AccountCreateParams.builder() + .name("New Account!") + .entityId("entity_n8y8tnk2p9339ti393yi") + .informationalEntityId("informational_entity_id") + .programId("program_i2v2os4mwza1oetokh9i") + .build() + ) + } + + assertThat(e.statusCode()).isEqualTo(404) + assertThat(e.headers().toMap()).contains(entry(HEADER_NAME, listOf(HEADER_VALUE))) + assertThat(e.body()).isEqualTo(ERROR_JSON) + } + @Test fun accountsCreate422() { val accountService = client.accounts() @@ -193,6 +301,33 @@ internal class ErrorHandlingTest { assertThat(e.body()).isEqualTo(ERROR_JSON) } + @Test + fun accountsCreate422WithRawResponse() { + val accountService = client.accounts().withRawResponse() + stubFor( + post(anyUrl()) + .willReturn( + status(422).withHeader(HEADER_NAME, HEADER_VALUE).withBody(ERROR_JSON_BYTES) + ) + ) + + val e = + assertThrows { + accountService.create( + AccountCreateParams.builder() + .name("New Account!") + .entityId("entity_n8y8tnk2p9339ti393yi") + .informationalEntityId("informational_entity_id") + .programId("program_i2v2os4mwza1oetokh9i") + .build() + ) + } + + assertThat(e.statusCode()).isEqualTo(422) + assertThat(e.headers().toMap()).contains(entry(HEADER_NAME, listOf(HEADER_VALUE))) + assertThat(e.body()).isEqualTo(ERROR_JSON) + } + @Test fun accountsCreate429() { val accountService = client.accounts() @@ -220,6 +355,33 @@ internal class ErrorHandlingTest { assertThat(e.body()).isEqualTo(ERROR_JSON) } + @Test + fun accountsCreate429WithRawResponse() { + val accountService = client.accounts().withRawResponse() + stubFor( + post(anyUrl()) + .willReturn( + status(429).withHeader(HEADER_NAME, HEADER_VALUE).withBody(ERROR_JSON_BYTES) + ) + ) + + val e = + assertThrows { + accountService.create( + AccountCreateParams.builder() + .name("New Account!") + .entityId("entity_n8y8tnk2p9339ti393yi") + .informationalEntityId("informational_entity_id") + .programId("program_i2v2os4mwza1oetokh9i") + .build() + ) + } + + assertThat(e.statusCode()).isEqualTo(429) + assertThat(e.headers().toMap()).contains(entry(HEADER_NAME, listOf(HEADER_VALUE))) + assertThat(e.body()).isEqualTo(ERROR_JSON) + } + @Test fun accountsCreate500() { val accountService = client.accounts() @@ -247,6 +409,33 @@ internal class ErrorHandlingTest { assertThat(e.body()).isEqualTo(ERROR_JSON) } + @Test + fun accountsCreate500WithRawResponse() { + val accountService = client.accounts().withRawResponse() + stubFor( + post(anyUrl()) + .willReturn( + status(500).withHeader(HEADER_NAME, HEADER_VALUE).withBody(ERROR_JSON_BYTES) + ) + ) + + val e = + assertThrows { + accountService.create( + AccountCreateParams.builder() + .name("New Account!") + .entityId("entity_n8y8tnk2p9339ti393yi") + .informationalEntityId("informational_entity_id") + .programId("program_i2v2os4mwza1oetokh9i") + .build() + ) + } + + assertThat(e.statusCode()).isEqualTo(500) + assertThat(e.headers().toMap()).contains(entry(HEADER_NAME, listOf(HEADER_VALUE))) + assertThat(e.body()).isEqualTo(ERROR_JSON) + } + @Test fun accountsCreate999() { val accountService = client.accounts() @@ -274,6 +463,33 @@ internal class ErrorHandlingTest { assertThat(e.body()).isEqualTo(ERROR_JSON) } + @Test + fun accountsCreate999WithRawResponse() { + val accountService = client.accounts().withRawResponse() + stubFor( + post(anyUrl()) + .willReturn( + status(999).withHeader(HEADER_NAME, HEADER_VALUE).withBody(ERROR_JSON_BYTES) + ) + ) + + val e = + assertThrows { + accountService.create( + AccountCreateParams.builder() + .name("New Account!") + .entityId("entity_n8y8tnk2p9339ti393yi") + .informationalEntityId("informational_entity_id") + .programId("program_i2v2os4mwza1oetokh9i") + .build() + ) + } + + assertThat(e.statusCode()).isEqualTo(999) + assertThat(e.headers().toMap()).contains(entry(HEADER_NAME, listOf(HEADER_VALUE))) + assertThat(e.body()).isEqualTo(ERROR_JSON) + } + @Test fun accountsCreateInvalidJsonBody() { val accountService = client.accounts() diff --git a/increase-java-example/build.gradle.kts b/increase-java-example/build.gradle.kts index cf015693e..dbe0da68f 100644 --- a/increase-java-example/build.gradle.kts +++ b/increase-java-example/build.gradle.kts @@ -17,5 +17,12 @@ tasks.withType().configureEach { } application { - mainClass = "com.increase.api.example.Main" + // Use `./gradlew :increase-java-example:run` to run `Main` + // Use `./gradlew :increase-java-example:run -Dexample=Something` to run `SomethingExample` + mainClass = "com.increase.api.example.${ + if (project.hasProperty("example")) + "${project.property("example")}Example" + else + "Main" + }" }