Corrected error handling in HttpClient and children

sjahreis · sjahreis · commit 5c9ae9346f7c · 2023-03-01T10:21:38.000+01:00
diff --git a/kotlin-http-client/kotlin-http-client-api/src/main/kotlin/com/linkedplanet/kotlinhttpclient/api/http/HttpClient.kt b/kotlin-http-client/kotlin-http-client-api/src/main/kotlin/com/linkedplanet/kotlinhttpclient/api/http/HttpClient.kt
@@ -1,7 +1,6 @@
 package com.linkedplanet.kotlinhttpclient.api.http
 
 import arrow.core.Either
-import com.linkedplanet.kotlinhttpclient.error.DomainError
 import com.linkedplanet.kotlinhttpclient.error.HttpDomainError
 import java.lang.reflect.Type
 
@@ -21,7 +20,7 @@ interface HttpClient {
         params: Map<String, String>,
         body: String?,
         contentType: String?
-    ): Either<DomainError, HttpResponse<ByteArray>>
+    ): Either<HttpDomainError, HttpResponse<ByteArray>>
 
     suspend fun executeUpload(
         method: String,
diff --git a/kotlin-http-client/kotlin-http-client-atlas/src/main/kotlin/com/linkedplanet/kotlinhttpclient/atlas/AtlasHttpClient.kt b/kotlin-http-client/kotlin-http-client-atlas/src/main/kotlin/com/linkedplanet/kotlinhttpclient/atlas/AtlasHttpClient.kt
@@ -75,7 +75,7 @@ class AtlasHttpClient(private val appLink: ApplicationLink) : BaseHttpClient() {
                 }
             })
         } catch (e: ResponseException) {
-            Either.Left(HttpDomainError(-1, "Jira/Insight hat ein internes Problem festgestellt", ""))
+            Either.Left(HttpDomainError(400, "Jira/Insight hat ein internes Problem festgestellt", e.message.toString()))
         }
 
     override suspend fun executeDownload(
@@ -121,7 +121,7 @@ class AtlasHttpClient(private val appLink: ApplicationLink) : BaseHttpClient() {
                 }
             })
         } catch (e: ResponseException) {
-            Either.Left(HttpDomainError(-1, "Jira/Insight hat ein internes Problem festgestellt", ""))
+            Either.Left(HttpDomainError(400, "Jira/Insight hat ein internes Problem festgestellt", e.message.toString()))
         }
 
     override suspend fun executeUpload(
@@ -169,6 +169,6 @@ class AtlasHttpClient(private val appLink: ApplicationLink) : BaseHttpClient() {
                 }
             })
         } catch (e: ResponseException) {
-            Either.Left(HttpDomainError(-1, "Jira/Insight hat ein internes Problem festgestellt", ""))
+            Either.Left(HttpDomainError(400, "Jira/Insight hat ein internes Problem festgestellt", e.message.toString()))
         }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class AtlasHttpClient(private val appLink: ApplicationLink) : BaseHttpClient() {`
`75`	`75`	`}`
`76`	`76`	`})`
`77`	`77`	`} catch (e: ResponseException) {`
`78`		`- Either.Left(HttpDomainError(-1, "Jira/Insight hat ein internes Problem festgestellt", ""))`
	`78`	`+ Either.Left(HttpDomainError(400, "Jira/Insight hat ein internes Problem festgestellt", e.message.toString()))`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`override suspend fun executeDownload(`
`@@ -121,7 +121,7 @@ class AtlasHttpClient(private val appLink: ApplicationLink) : BaseHttpClient() {`
`121`	`121`	`}`
`122`	`122`	`})`
`123`	`123`	`} catch (e: ResponseException) {`
`124`		`- Either.Left(HttpDomainError(-1, "Jira/Insight hat ein internes Problem festgestellt", ""))`
	`124`	`+ Either.Left(HttpDomainError(400, "Jira/Insight hat ein internes Problem festgestellt", e.message.toString()))`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`override suspend fun executeUpload(`
`@@ -169,6 +169,6 @@ class AtlasHttpClient(private val appLink: ApplicationLink) : BaseHttpClient() {`
`169`	`169`	`}`
`170`	`170`	`})`
`171`	`171`	`} catch (e: ResponseException) {`
`172`		`- Either.Left(HttpDomainError(-1, "Jira/Insight hat ein internes Problem festgestellt", ""))`
	`172`	`+ Either.Left(HttpDomainError(400, "Jira/Insight hat ein internes Problem festgestellt", e.message.toString()))`
`173`	`173`	`}`
`174`	`174`	`}`