Upgrade to OkHttp 5.1

Closes gh-1304

Author: bclozel

platform/build.gradle

@@ -40,7 +40,7 @@ dependencies {
 		api("com.jayway.jsonpath:json-path:2.9.0")
 		api("org.skyscreamer:jsonassert:1.5.3")
 		api("org.awaitility:awaitility:4.3.0")
-		api("com.squareup.okhttp3:mockwebserver:4.12.0")
+		api("com.squareup.okhttp3:mockwebserver3:5.1.0")
 		api("org.hamcrest:hamcrest:3.0")
 
 		api("com.h2database:h2:2.3.232")

spring-graphql/build.gradle

@@ -77,7 +77,7 @@ dependencies {
 	testImplementation 'com.querydsl:querydsl-core'
 	testImplementation 'com.querydsl:querydsl-collections'
 	testImplementation 'jakarta.servlet:jakarta.servlet-api'
-	testImplementation 'com.squareup.okhttp3:mockwebserver'
+	testImplementation 'com.squareup.okhttp3:mockwebserver3'
 	testImplementation 'io.rsocket:rsocket-transport-local'
 	testImplementation 'jakarta.persistence:jakarta.persistence-api'
 	testImplementation 'jakarta.validation:jakarta.validation-api'
@@ -98,7 +98,7 @@ dependencies {
 
 	testFixturesApi 'org.springframework:spring-webflux'
 	testFixturesApi 'org.junit.jupiter:junit-jupiter-engine'
-	testFixturesApi 'com.squareup.okhttp3:mockwebserver'
+	testFixturesApi 'com.squareup.okhttp3:mockwebserver3'
 	testFixturesApi 'tools.jackson.core:jackson-databind'
 	testFixturesApi 'com.fasterxml.jackson.core:jackson-databind'
 }

spring-graphql/src/test/java/org/springframework/graphql/client/HttpGraphQlClientProtocolTests.java

@@ -19,8 +19,8 @@
 import java.io.IOException;
 import java.util.stream.Stream;
 
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
+import mockwebserver3.MockResponse;
+import mockwebserver3.MockWebServer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -60,7 +60,7 @@ void setup() throws IOException {
 
 	@AfterEach
 	void tearDown() throws IOException {
-		this.server.shutdown();
+		this.server.close();
 	}
 
 
@@ -277,8 +277,7 @@ void prepareBadRequestResponse(String body) {
 		}
 
 		void prepareBadRequestResponse() {
-			MockResponse mockResponse = new MockResponse();
-			mockResponse.setResponseCode(400);
+			MockResponse mockResponse = new MockResponse.Builder().code(400).build();
 			server.enqueue(mockResponse);
 		}
 
@@ -322,10 +321,10 @@ GraphQlClient createClient(ClientType type) {
 	}
 
 	private void prepareResponse(int status, MediaType contentType, String body) {
-		MockResponse mockResponse = new MockResponse();
-		mockResponse.setResponseCode(status);
-		mockResponse.setHeader("Content-Type", contentType.toString());
-		mockResponse.setBody(body);
+		MockResponse mockResponse = new MockResponse.Builder().code(status)
+				.setHeader("Content-Type", contentType.toString())
+				.body(body)
+				.build();
 		this.server.enqueue(mockResponse);
 	}
 

spring-graphql/src/test/java/org/springframework/graphql/client/HttpGraphQlTransportIntegrationTests.java

@@ -20,8 +20,8 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
+import mockwebserver3.MockResponse;
+import mockwebserver3.MockWebServer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -61,16 +61,17 @@ void shouldSerializeFieldValues(ProjectInput projectInput, String variable, Mock
 				.build();
 		HttpGraphQlClient graphQlClient = HttpGraphQlClient.create(webClient);
 
-		server.enqueue(new MockResponse().addHeader("Content-Type", MediaTypes.APPLICATION_GRAPHQL_RESPONSE)
-				.setBody("""
+		server.enqueue(new MockResponse.Builder().addHeader("Content-Type", MediaTypes.APPLICATION_GRAPHQL_RESPONSE)
+				.body("""
 						{
 							"data": {
 								"createProject": {
 									"id": "spring-graphql"
 								}
 							}
 						}
-						"""));
+						""")
+				.build());
 		graphQlClient.document("""
 						mutation createProject($project: ProjectInput!) {
 							  createProject($project: $project) {
@@ -81,7 +82,7 @@ mutation createProject($project: ProjectInput!) {
 				.variables(Map.of("project", projectInput))
 				.executeSync();
 
-		assertThat(server.takeRequest().getBody().readUtf8()).contains("\"variables\":{\"project\":" + variable + "}");
+		assertThat(server.takeRequest().getBody().utf8()).contains("\"variables\":{\"project\":" + variable + "}");
 	}
 
 	static Stream<Arguments> argumentValues() {
@@ -101,8 +102,8 @@ void shouldStreamSubscriptionResultsOverSse(MockWebServer server) {
 				.document("subscription TestSubscription { bookSearch(author:\"Orwell\") { id name } ")
 				.executeSubscription();
 
-		server.enqueue(new MockResponse().addHeader("Content-Type", MediaType.TEXT_EVENT_STREAM_VALUE)
-				.setBody("""
+		server.enqueue(new MockResponse.Builder().addHeader("Content-Type", MediaType.TEXT_EVENT_STREAM_VALUE)
+				.body("""
 						event:next
 						data:{"data":{"bookSearch":{"id":"1","name":"Nineteen Eighty-Four"}}}
 
@@ -111,7 +112,8 @@ void shouldStreamSubscriptionResultsOverSse(MockWebServer server) {
 
 						event:complete
 
-						"""));
+						""")
+				.build());
 
 		StepVerifier.create(responses)
 				.assertNext(item -> assertThat(item.field("bookSearch").toEntity(Book.class).getName()).isEqualTo("Nineteen Eighty-Four"))
@@ -127,8 +129,8 @@ void shouldStreamSubscriptionErrorsOverSse(MockWebServer server) {
 				.document("subscription TestSubscription { bookSearch(author:\"Orwell\") { id name } ")
 				.executeSubscription();
 
-		server.enqueue(new MockResponse().addHeader("Content-Type", MediaType.TEXT_EVENT_STREAM_VALUE)
-				.setBody("""
+		server.enqueue(new MockResponse.Builder().addHeader("Content-Type", MediaType.TEXT_EVENT_STREAM_VALUE)
+				.body("""
 						event:next
 						data:{"data":{"bookSearch":{"id":"1","name":"Nineteen Eighty-Four"}}}
 
@@ -137,7 +139,8 @@ void shouldStreamSubscriptionErrorsOverSse(MockWebServer server) {
 
 						event:complete
 
-						"""));
+						""")
+				.build());
 		StepVerifier.create(responses)
 				.assertNext(item -> assertThat(item.field("bookSearch").toEntity(Book.class).getName()).isEqualTo("Nineteen Eighty-Four"))
 				.assertNext(item -> {

spring-graphql/src/testFixtures/java/org/springframework/graphql/MockWebServerExtension.java

@@ -16,7 +16,7 @@
 
 package org.springframework.graphql;
 
-import okhttp3.mockwebserver.MockWebServer;
+import mockwebserver3.MockWebServer;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -54,8 +54,8 @@ public void beforeEach(ExtensionContext extensionContext) throws Exception {
 	}
 
 	@Override
-	public void afterEach(ExtensionContext extensionContext) throws Exception {
-		this.mockWebServer.shutdown();
+	public void afterEach(ExtensionContext extensionContext) {
+		this.mockWebServer.close();
 	}
 
 }