Migrate to okhttp 4.6.0

onoderis · onoderis · commit 09dd34ec1c4d · 2022-06-04T23:27:19.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <java-websocket.version>1.5.1</java-websocket.version>
         <socket.io-client.version>1.0.0</socket.io-client.version>
-        <okhttp.version>3.14.9</okhttp.version>
+        <okhttp.version>4.6.0</okhttp.version> <!-- version is aligned to ktor-client -->
         <pircbotx.version>2.1</pircbotx.version>
         <kotlin-either.version>2.0.1</kotlin-either.version>
         <guava.version>25.1-jre</guava.version>
diff --git a/src/main/kotlin/failchat/github/GithubClient.kt b/src/main/kotlin/failchat/github/GithubClient.kt
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import failchat.exception.UnexpectedResponseCodeException
 import failchat.exception.UnexpectedResponseException
-import failchat.util.isEmpty
 import failchat.util.thenUse
 import failchat.util.toFuture
 import mu.KLogging
@@ -29,8 +28,8 @@ class GithubClient(
         return httpClient.newCall(request)
                 .toFuture()
                 .thenUse {
-                    if (it.code() != 200) throw UnexpectedResponseCodeException(it.code())
-                    val responseBody = it.body() ?: throw UnexpectedResponseException("null body")
+                    if (it.code != 200) throw UnexpectedResponseCodeException(it.code)
+                    val responseBody = it.body ?: throw UnexpectedResponseException("null body")
                     val releasesNode = objectMapper.readTree(responseBody.string())
                     findLatestRelease(releasesNode) ?: throw NoReleasesFoundException()
                 }
diff --git a/src/main/kotlin/failchat/goodgame/GgApi2Client.kt b/src/main/kotlin/failchat/goodgame/GgApi2Client.kt
@@ -29,8 +29,8 @@ class GgApi2Client(
 
         val response = httpClient.newCall(request).await()
 
-        if (response.code() != 200) throw UnexpectedResponseCodeException(response.code())
-        val responseBody = response.body() ?: throw UnexpectedResponseException("null body")
+        if (response.code != 200) throw UnexpectedResponseCodeException(response.code)
+        val responseBody = response.body ?: throw UnexpectedResponseException("null body")
         val responseNode = objectMapper.readTree(responseBody.string())
 
 
diff --git a/src/main/kotlin/failchat/goodgame/GgApiClient.kt b/src/main/kotlin/failchat/goodgame/GgApiClient.kt
@@ -36,8 +36,8 @@ class GgApiClient(
         return httpClient.newCall(request)
                 .await()
                 .use {
-                    if (it.code() != 200) throw UnexpectedResponseCodeException(it.code())
-                    val responseBody = it.body() ?: throw UnexpectedResponseException("null body")
+                    if (it.code != 200) throw UnexpectedResponseCodeException(it.code)
+                    val responseBody = it.body ?: throw UnexpectedResponseException("null body")
                     val jsContent = responseBody.string()
                     parseGlobalEmoticons(jsContent) + parseChannelEmoticons(jsContent)
                 }
@@ -84,8 +84,8 @@ class GgApiClient(
         return httpClient.newCall(request)
                 .await()
                 .use {
-                    if (it.code() != 200) throw UnexpectedResponseCodeException(it.code())
-                    val responseBody = it.body() ?: throw UnexpectedResponseException("null body")
+                    if (it.code != 200) throw UnexpectedResponseCodeException(it.code)
+                    val responseBody = it.body ?: throw UnexpectedResponseException("null body")
                     objectMapper.readTree(responseBody.string())
                 }
     }
diff --git a/src/main/kotlin/failchat/peka2tv/Peka2tvApiClient.kt b/src/main/kotlin/failchat/peka2tv/Peka2tvApiClient.kt
@@ -72,8 +72,8 @@ class Peka2tvApiClient(
         return httpClient.newCall(request)
                 .toFuture()
                 .thenUse {
-                    if (it.code() != 200) throw UnexpectedResponseCodeException(it.code())
-                    val responseBody = it.body() ?: throw UnexpectedResponseException("null body")
+                    if (it.code != 200) throw UnexpectedResponseCodeException(it.code)
+                    val responseBody = it.body ?: throw UnexpectedResponseException("null body")
                     return@thenUse objectMapper.readTree(responseBody.string())
                 }
     }
diff --git a/src/main/kotlin/failchat/reporter/GAEventReporter.kt b/src/main/kotlin/failchat/reporter/GAEventReporter.kt
@@ -53,7 +53,7 @@ class GAEventReporter(
                 .newCall(request)
                 .await()
                 .use { response ->
-                    val code = response.code()
+                    val code = response.code
                     if (code !in 200..299) throw UnexpectedResponseCodeException(code)
                     logger.info("Event successfully reported: {}.{}", category, action)
                 }
diff --git a/src/main/kotlin/failchat/twitch/BttvApiClient.kt b/src/main/kotlin/failchat/twitch/BttvApiClient.kt
@@ -28,8 +28,8 @@ class BttvApiClient(
         return httpClient.newCall(request)
                 .toFuture()
                 .thenUse {
-                    if (it.code() != 200) throw UnexpectedResponseCodeException(it.code())
-                    val responseBody = it.body() ?: throw UnexpectedResponseException("null body")
+                    if (it.code != 200) throw UnexpectedResponseCodeException(it.code)
+                    val responseBody = it.body ?: throw UnexpectedResponseException("null body")
                     val bodyString = responseBody.string()
                     return@thenUse parseEmoticons(bodyString, Origin.BTTV_GLOBAL)
                 }
@@ -50,12 +50,12 @@ class BttvApiClient(
         return httpClient.newCall(request)
                 .toFuture()
                 .thenUse {
-                    when (it.code()) {
+                    when (it.code) {
                         200 -> {}
                         404 -> throw BttvChannelNotFoundException(channel)
-                        else -> throw UnexpectedResponseCodeException(it.code())
+                        else -> throw UnexpectedResponseCodeException(it.code)
                     }
-                    val responseBody = it.body() ?: throw UnexpectedResponseException("null body")
+                    val responseBody = it.body ?: throw UnexpectedResponseException("null body")
                     val bodyString = responseBody.string()
                     return@thenUse parseEmoticons(bodyString, Origin.BTTV_CHANNEL)
                 }
diff --git a/src/main/kotlin/failchat/twitch/FfzApiClient.kt b/src/main/kotlin/failchat/twitch/FfzApiClient.kt
@@ -24,7 +24,7 @@ class FfzApiClient(
                 .build()
 
         val parsedBody = httpClient.newCall(request).await().use {
-            if (it.code() == 404) throw FfzChannelNotFoundException(roomName)
+            if (it.code == 404) throw FfzChannelNotFoundException(roomName)
             val bodyText = it.getBodyIfStatusIs(200).nonNullBody.string()
             objectMapper.readTree(bodyText)
         }
diff --git a/src/main/kotlin/failchat/twitch/SevenTvApiClient.kt b/src/main/kotlin/failchat/twitch/SevenTvApiClient.kt
@@ -26,8 +26,8 @@ class SevenTvApiClient(
         return httpClient.newCall(request)
                 .await()
                 .use {
-                    if (it.code() != 200) throw UnexpectedResponseCodeException(it.code())
-                    val responseBody = it.body() ?: throw UnexpectedResponseException("null body")
+                    if (it.code != 200) throw UnexpectedResponseCodeException(it.code)
+                    val responseBody = it.body ?: throw UnexpectedResponseException("null body")
                     val bodyString = responseBody.string()
                     parseEmoticons(bodyString, Origin.SEVEN_TV_GLOBAL)
                 }
@@ -48,9 +48,9 @@ class SevenTvApiClient(
         return httpClient.newCall(request)
                 .await()
                 .use {
-                    if (it.code() == 404) throw SevenTvChannelNotFoundException(channelName)
-                    if (it.code() != 200) throw UnexpectedResponseCodeException(it.code())
-                    val responseBody = it.body() ?: throw UnexpectedResponseException("null body")
+                    if (it.code == 404) throw SevenTvChannelNotFoundException(channelName)
+                    if (it.code != 200) throw UnexpectedResponseCodeException(it.code)
+                    val responseBody = it.body ?: throw UnexpectedResponseException("null body")
                     val bodyString = responseBody.string()
                     parseEmoticons(bodyString, Origin.SEVEN_TV_CHANNEL)
                 }
diff --git a/src/main/kotlin/failchat/util/OkHttp.kt b/src/main/kotlin/failchat/util/OkHttp.kt
@@ -5,6 +5,7 @@ import failchat.exception.UnexpectedResponseException
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody
 import okhttp3.Response
 import okhttp3.ResponseBody
@@ -14,8 +15,8 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 
-val jsonMediaType: MediaType = MediaType.parse("application/json")!!
-val textMediaType: MediaType = MediaType.parse("text/plain")!!
+val jsonMediaType: MediaType = "application/json".toMediaTypeOrNull()!!
+val textMediaType: MediaType = "text/plain".toMediaTypeOrNull()!!
 val emptyBody: RequestBody = RequestBody.create(textMediaType, "")
 
 fun Call.toFuture(): CompletableFuture<Response> {
@@ -47,11 +48,11 @@ suspend fun Call.await(): Response {
 }
 
 fun Response.getBodyIfStatusIs(expectedStatus: Int): Response {
-    if (this.code() != expectedStatus) {
-        throw UnexpectedResponseCodeException(this.code(), request().url().toString())
+    if (this.code != expectedStatus) {
+        throw UnexpectedResponseCodeException(this.code, request.url.toString())
     }
     return this
 }
 
 val Response.nonNullBody: ResponseBody
-    get() = this.body() ?: throw UnexpectedResponseException("null body")
+    get() = this.body ?: throw UnexpectedResponseException("null body")
diff --git a/src/test/kotlin/failchat/chat/handlers/EmojiHandlerTest.kt b/src/test/kotlin/failchat/chat/handlers/EmojiHandlerTest.kt
@@ -42,9 +42,9 @@ class EmojiHandlerTest {
                 .url((message.elements[0] as Emoticon).url)
                 .build()
 
-        val response = okHttpClient.newCall(request).execute()
-
-        assertEquals(200, response.code())
+        okHttpClient.newCall(request).execute().use { response ->
+            assertEquals(200, response.code)
+        }
     }
 
 }
diff --git a/src/test/kotlin/failchat/experiment/OkHttpWsClient.kt b/src/test/kotlin/failchat/experiment/OkHttpWsClient.kt
@@ -45,15 +45,15 @@ class OkHttpWsClient {
             webSocket.send(joinMessage.toString())
         }
 
-        override fun onFailure(webSocket: WebSocket?, t: Throwable?, response: Response?) = response.use { println("onFailure $t") }
+        override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) = response.use { println("onFailure $t") }
 
-        override fun onClosing(webSocket: WebSocket?, code: Int, reason: String?) = println("onClosing $code, $reason")
+        override fun onClosing(webSocket: WebSocket, code: Int, reason: String) = println("onClosing $code, $reason")
 
-        override fun onMessage(webSocket: WebSocket?, text: String?) = println("onMessage: $text")
+        override fun onMessage(webSocket: WebSocket, text: String) = println("onMessage: $text")
 
-        override fun onMessage(webSocket: WebSocket?, bytes: ByteString?) = println("onMessage bytes")
+        override fun onMessage(webSocket: WebSocket, bytes: ByteString) = println("onMessage bytes")
 
-        override fun onClosed(webSocket: WebSocket?, code: Int, reason: String?) = println("onClosed $code $reason")
+        override fun onClosed(webSocket: WebSocket, code: Int, reason: String) = println("onClosed $code $reason")
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ class Peka2tvApiClient(`
`72`	`72`	`return httpClient.newCall(request)`
`73`	`73`	`.toFuture()`
`74`	`74`	`.thenUse {`
`75`		`- if (it.code() != 200) throw UnexpectedResponseCodeException(it.code())`
`76`		`- val responseBody = it.body() ?: throw UnexpectedResponseException("null body")`
	`75`	`+ if (it.code != 200) throw UnexpectedResponseCodeException(it.code)`
	`76`	`+ val responseBody = it.body ?: throw UnexpectedResponseException("null body")`
`77`	`77`	`return@thenUse objectMapper.readTree(responseBody.string())`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class GAEventReporter(`
`53`	`53`	`.newCall(request)`
`54`	`54`	`.await()`
`55`	`55`	`.use { response ->`
`56`		`- val code = response.code()`
	`56`	`+ val code = response.code`
`57`	`57`	`if (code !in 200..299) throw UnexpectedResponseCodeException(code)`
`58`	`58`	`logger.info("Event successfully reported: {}.{}", category, action)`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class FfzApiClient(`
`24`	`24`	`.build()`
`25`	`25`
`26`	`26`	`val parsedBody = httpClient.newCall(request).await().use {`
`27`		`- if (it.code() == 404) throw FfzChannelNotFoundException(roomName)`
	`27`	`+ if (it.code == 404) throw FfzChannelNotFoundException(roomName)`
`28`	`28`	`val bodyText = it.getBodyIfStatusIs(200).nonNullBody.string()`
`29`	`29`	`objectMapper.readTree(bodyText)`
`30`	`30`	`}`