Upgrade okhttp to 5.1.0 and latest mockwebserver (#442)

Signed-off-by: Philip K. Warren <[email protected]>

Author: pkwarren

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ kotlin = "2.1.21"
 kotlinpoet = "2.2.0"
 mavenplugin = "0.34.0"
 moshi = "1.15.2"
-okhttp = "4.12.0"
+okhttp = "5.1.0"
 okio = "3.14.0"
 protobuf = "4.31.1"
 slf4j = "2.0.17"
@@ -45,7 +45,7 @@ moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi
 moshiKotlinCodegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
 okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-tls = { module = "com.squareup.okhttp3:okhttp-tls", version.ref = "okhttp" }
-okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
+okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver3-junit4", version.ref = "okhttp" }
 okio-core = { module = "com.squareup.okio:okio", version.ref = "okio" }
 protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
 protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf" }

okhttp/src/main/kotlin/com/connectrpc/okhttp/ConnectOkHttpClient.kt

@@ -167,7 +167,7 @@ class ConnectOkHttpClient @JvmOverloads constructor(
                         var responseBuffer: Buffer? = null
                         var connEx: ConnectException? = null
                         try {
-                            responseBuffer = response.body?.source()?.use { bufferedSource ->
+                            responseBuffer = response.body.source().use { bufferedSource ->
                                 val buffer = Buffer()
                                 buffer.writeAll(bufferedSource)
                                 buffer

okhttp/src/main/kotlin/com/connectrpc/okhttp/OkHttpStream.kt

@@ -119,7 +119,7 @@ private class ResponseCallback(
                 return@runBlocking
             }
             response.use { resp ->
-                resp.body!!.source().use { sourceBuffer ->
+                resp.body.source().use { sourceBuffer ->
                     var connEx: ConnectException? = null
                     try {
                         while (!sourceBuffer.exhausted()) {

okhttp/src/test/kotlin/com/connectrpc/okhttp/MockWebServerRule.kt

@@ -27,9 +27,10 @@ import com.connectrpc.extensions.GoogleJavaProtobufStrategy
 import com.connectrpc.impl.ProtocolClient
 import com.connectrpc.protocols.NetworkProtocol
 import kotlinx.coroutines.test.runTest
+import mockwebserver3.MockResponse
+import mockwebserver3.junit4.MockWebServerRule
 import okhttp3.OkHttpClient
 import okhttp3.Protocol
-import okhttp3.mockwebserver.MockResponse
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
@@ -45,16 +46,16 @@ class MockWebServerTests {
     @Test
     fun `invalid compressed failure response is handled correctly`() = runTest {
         mockWebServerRule.server.enqueue(
-            MockResponse().apply {
+            MockResponse.Builder().apply {
                 addHeader("accept-encoding", "gzip")
                 addHeader("content-encoding", "gzip")
-                setBody("{}")
-                setResponseCode(401)
-            },
+                body("{}")
+                code(401)
+            }.build(),
         )
         val response = createClient().say(sayRequest { sentence = "hello" })
         mockWebServerRule.server.takeRequest().apply {
-            assertThat(path).isEqualTo("/connectrpc.eliza.v1.ElizaService/Say")
+            assertThat(target).isEqualTo("/connectrpc.eliza.v1.ElizaService/Say")
         }
         assertThat(response).isInstanceOf(ResponseMessage::class.java)
         response.failure { assertThat(it.cause.code).isEqualTo(Code.INTERNAL_ERROR) }
@@ -63,16 +64,16 @@ class MockWebServerTests {
     @Test
     fun `invalid compressed response data is handled correctly`() = runTest {
         mockWebServerRule.server.enqueue(
-            MockResponse().apply {
+            MockResponse.Builder().apply {
                 addHeader("accept-encoding", "gzip")
                 addHeader("content-encoding", "gzip")
-                setBody("this isn't gzipped")
-                setResponseCode(200)
-            },
+                body("this isn't gzipped")
+                code(200)
+            }.build(),
         )
         val response = createClient().say(sayRequest { sentence = "hello" })
         mockWebServerRule.server.takeRequest().apply {
-            assertThat(path).isEqualTo("/connectrpc.eliza.v1.ElizaService/Say")
+            assertThat(target).isEqualTo("/connectrpc.eliza.v1.ElizaService/Say")
         }
         assertThat(response).isInstanceOf(ResponseMessage::class.java)
         response.failure { assertThat(it.cause.code).isEqualTo(Code.INTERNAL_ERROR) }
@@ -81,16 +82,16 @@ class MockWebServerTests {
     @Test
     fun `invalid protobuf response data is handled correctly`() = runTest {
         mockWebServerRule.server.enqueue(
-            MockResponse().apply {
+            MockResponse.Builder().apply {
                 addHeader("accept-encoding", "gzip")
                 addHeader("content-type", "application/proto")
-                setBody("this isn't valid protobuf")
-                setResponseCode(200)
-            },
+                body("this isn't valid protobuf")
+                code(200)
+            }.build(),
         )
         val response = createClient().say(sayRequest { sentence = "hello" })
         mockWebServerRule.server.takeRequest().apply {
-            assertThat(path).isEqualTo("/connectrpc.eliza.v1.ElizaService/Say")
+            assertThat(target).isEqualTo("/connectrpc.eliza.v1.ElizaService/Say")
         }
         assertThat(response).isInstanceOf(ResponseMessage::class.java)
         response.failure { assertThat(it.cause.code).isEqualTo(Code.INTERNAL_ERROR) }
@@ -99,16 +100,16 @@ class MockWebServerTests {
     @Test
     fun `invalid json response data is handled correctly`() = runTest {
         mockWebServerRule.server.enqueue(
-            MockResponse().apply {
+            MockResponse.Builder().apply {
                 addHeader("accept-encoding", "gzip")
                 addHeader("content-type", "application/json")
-                setBody("{ invalid json")
-                setResponseCode(200)
-            },
+                body("{ invalid json")
+                code(200)
+            }.build(),
         )
         val response = createClient(serializationStrategy = GoogleJavaJSONStrategy()).say(sayRequest { sentence = "hello" })
         mockWebServerRule.server.takeRequest().apply {
-            assertThat(path).isEqualTo("/connectrpc.eliza.v1.ElizaService/Say")
+            assertThat(target).isEqualTo("/connectrpc.eliza.v1.ElizaService/Say")
         }
         assertThat(response).isInstanceOf(ResponseMessage::class.java)
         response.failure { assertThat(it.cause.code).isEqualTo(Code.INTERNAL_ERROR) }