Updated okhttp3 dependency

Author: bastianeicher

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-okhttp3 = "4.12.0"
+okhttp3 = "5.3.2"
 uri-templates = "2.1.8"
 kotlinx-serialization = "1.8.0"
 jackson = "2.19.0"

typedrest/src/main/kotlin/net/typedrest/endpoints/generic/ElementEndpointImpl.kt

@@ -82,13 +82,12 @@ open class ElementEndpointImpl<TEntity>(
     }
 
     private fun tryReadAs(response: Response): TEntity? {
-        val body = response.body
-        if (body == null || response.code == HttpStatusCode.NoContent.code) {
+        if (response.code == HttpStatusCode.NoContent.code) {
             return null
         }
 
         return try {
-            deserialize(body, entityType)
+            deserialize(response.body, entityType)
         } catch (ex: Exception) {
             null
         }

typedrest/src/main/kotlin/net/typedrest/endpoints/generic/GenericCollectionEndpointImpl.kt

@@ -72,7 +72,7 @@ open class GenericCollectionEndpointImpl<TEntity, TElementEndpoint : ElementEndp
         execute(Request.Builder().get().uri(uri).header("Range", "${rangeUnit}=${from ?: ""}-${to ?: ""}").build())
             .use { response ->
                 PartialResponse(
-                    response.body?.let { deserializeList(it, entityType) } ?: throw NotFoundException("Result not deserializable as List<${entityType.simpleName}>"),
+                    deserializeList(response.body, entityType) ?: throw NotFoundException("Result not deserializable as List<${entityType.simpleName}>"),
                     HttpContentRangeHeader.parse(response.headers)
                 )
             }

typedrest/src/main/kotlin/net/typedrest/endpoints/raw/BlobEndpointImpl.kt

@@ -30,10 +30,8 @@ open class BlobEndpointImpl(referrer: Endpoint, relativeUri: URI) : AbstractEndp
     override val isDownloadAllowed: Boolean?
         get() = isMethodAllowed(HttpMethod.GET)
 
-    override fun download(): InputStream {
-        val response = execute(Request.Builder().get().uri(uri).build())
-        return response.body?.byteStream() ?: throw IllegalStateException("Response body is null")
-    }
+    override fun download(): InputStream =
+        execute(Request.Builder().get().uri(uri).build()).body.byteStream()
 
     override val isUploadAllowed: Boolean?
         get() = isMethodAllowed(HttpMethod.PUT)

typedrest/src/main/kotlin/net/typedrest/endpoints/rpc/FunctionEndpointImpl.kt

@@ -36,7 +36,7 @@ open class FunctionEndpointImpl<TEntity, TResult>(
 
     override fun invoke(entity: TEntity): TResult =
         execute(Request.Builder().post(serialize(entity, entityType)).uri(uri).build()).use { response ->
-            response.body?.let { deserialize(it, resultType) }
+            deserialize(response.body, resultType)
                 ?: throw NotFoundException("Result not deserializable as ${resultType.simpleName}")
         }
 }

typedrest/src/main/kotlin/net/typedrest/endpoints/rpc/ProducerEndpointImpl.kt

@@ -32,7 +32,7 @@ open class ProducerEndpointImpl<TResult>(
 
     override fun invoke(): TResult =
         execute(Request.Builder().post("".toRequestBody()).uri(uri).build()).use { response ->
-            response.body?.let { deserialize(it, resultType) }
+            deserialize(response.body, resultType)
                 ?: throw NotFoundException("Result not deserializable as ${resultType.simpleName}")
         }
 }

typedrest/src/main/kotlin/net/typedrest/errors/DefaultErrorHandler.kt

@@ -14,7 +14,7 @@ open class DefaultErrorHandler : ErrorHandler {
     override fun handle(response: Response) {
         if (response.isSuccessful) return
 
-        val message = response.body?.let(::extractJsonMessage)
+        val message = extractJsonMessage(response.body)
             ?: "${response.request.url} responded with ${response.code} ${response.message}"
 
         throw mapException(HttpStatusCode.parse(response.code) ?: HttpStatusCode.InternalServerError, message, response)

typedrest/src/main/kotlin/net/typedrest/http/ResponseCache.kt

@@ -17,21 +17,21 @@ class ResponseCache private constructor(response: Response) {
          */
         @JvmStatic
         fun from(response: Response): ResponseCache? =
-            if (response.isSuccessful && response.code != HttpStatusCode.NoContent.code && !response.cacheControl.noStore && response.body != null) {
+            if (response.isSuccessful && response.code != HttpStatusCode.NoContent.code && !response.cacheControl.noStore) {
                 ResponseCache(response)
             } else null
 
         private val dateFormat = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss 'GMT'", Locale.US)
             .apply { timeZone = TimeZone.getTimeZone("GMT") }
     }
 
-    private val bodyByteString = response.body?.byteString()
-    private val contentType = response.body?.contentType()
+    private val bodyByteString = response.body.byteString()
+    private val contentType = response.body.contentType()
 
     /**
      * Returns a copy of the cached [RequestBody].
      */
-    fun getBody() = bodyByteString?.toResponseBody(contentType) ?: throw IllegalArgumentException("Missing content.")
+    fun getBody() = bodyByteString.toResponseBody(contentType)
 
     private var expires =
         if (response.cacheControl.noCache) {

typedrest/src/main/kotlin/net/typedrest/links/HalLinkExtractor.kt

@@ -10,7 +10,7 @@ import okhttp3.Response
 class HalLinkExtractor : LinkExtractor {
     override fun getLinks(response: Response): List<Link> =
         if (response.header("Content-Type") == "application/hal+json") {
-            parseJsonBody(response.body?.string().orEmpty())
+            parseJsonBody(response.body.string())
         } else emptyList()
 
     private fun parseJsonBody(body: String): List<Link> =