chore: fix conflict

Author: TomerAberbach

lithic-java-core/src/main/kotlin/com/lithic/api/services/async/CardServiceAsyncImpl.kt

@@ -586,8 +586,9 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien
         }
     }
 
-    private val errorHandler: Handler<JsonValue> = errorHandler(clientOptions.jsonMapper)
-    private val embedHandler: Handler<String> = stringHandler().withErrorHandler(errorHandler)
+    private val errorHandler: Handler<HttpResponse> =
+        errorHandler(errorBodyHandler(clientOptions.jsonMapper))
+    private val embedHandler: Handler<String> = stringHandler()
 
     override fun getEmbedHtml(
         params: CardGetEmbedHtmlParams,
@@ -614,7 +615,7 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien
                 .build()
         return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response
             ->
-            response.let { embedHandler.handle(it) }
+            errorHandler.handle(response).let { embedHandler.handle(it) }
         }
     }
 

lithic-java-core/src/main/kotlin/com/lithic/api/services/async/EventServiceAsyncImpl.kt

@@ -3,10 +3,10 @@
 package com.lithic.api.services.async
 
 import com.lithic.api.core.ClientOptions
+import com.lithic.api.core.JsonValue
 import com.lithic.api.core.RequestOptions
 import com.lithic.api.core.checkRequired
 import com.lithic.api.core.handlers.emptyHandler
-
 import com.lithic.api.core.handlers.errorBodyHandler
 import com.lithic.api.core.handlers.errorHandler
 import com.lithic.api.core.handlers.jsonHandler

lithic-java-core/src/main/kotlin/com/lithic/api/services/blocking/CardServiceImpl.kt

@@ -522,8 +522,9 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti
         }
     }
 
-    private val errorHandler: Handler<JsonValue> = errorHandler(clientOptions.jsonMapper)
-    private val embedHandler: Handler<String> = stringHandler().withErrorHandler(errorHandler)
+    private val errorHandler: Handler<HttpResponse> =
+        errorHandler(errorBodyHandler(clientOptions.jsonMapper))
+    private val embedHandler: Handler<String> = stringHandler()
 
     override fun getEmbedHtml(
         params: CardGetEmbedHtmlParams,
@@ -549,7 +550,7 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti
                 .putHeader("Accept", "text/html")
                 .build()
         return clientOptions.httpClient.execute(request, requestOptions).let { response ->
-            response.let { embedHandler.handle(it) }
+            errorHandler.handle(response).let { embedHandler.handle(it) }
         }
     }
 

lithic-java-core/src/main/kotlin/com/lithic/api/services/blocking/EventServiceImpl.kt

@@ -3,10 +3,10 @@
 package com.lithic.api.services.blocking
 
 import com.lithic.api.core.ClientOptions
+import com.lithic.api.core.JsonValue
 import com.lithic.api.core.RequestOptions
 import com.lithic.api.core.checkRequired
 import com.lithic.api.core.handlers.emptyHandler
-
 import com.lithic.api.core.handlers.errorBodyHandler
 import com.lithic.api.core.handlers.errorHandler
 import com.lithic.api.core.handlers.jsonHandler