Merge branch '6.0.x'

Author: sdeleuze

spring-web/src/test/java/org/springframework/web/client/RestClientIntegrationTests.java

@@ -701,18 +701,6 @@ void filterForErrorHandling(ClientHttpRequestFactory requestFactory) {
 	}
 
 
-	@ParameterizedRestClientTest
-	void invalidDomain(ClientHttpRequestFactory requestFactory) {
-		startServer(requestFactory);
-
-		String url = "http://example.invalid";
-		assertThatExceptionOfType(ResourceAccessException.class).isThrownBy(() ->
-			this.restClient.get().uri(url).retrieve().toBodilessEntity()
-		);
-
-	}
-
-
 	private void prepareResponse(Consumer<MockResponse> consumer) {
 		MockResponse response = new MockResponse();
 		consumer.accept(response);

spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java

@@ -1198,23 +1198,6 @@ void exchangeResponseCookies(ClientHttpConnector connector) {
 		expectRequestCount(1);
 	}
 
-	@ParameterizedWebClientTest
-	void invalidDomain(ClientHttpConnector connector) {
-		startServer(connector);
-
-		String url = "http://example.invalid";
-		Mono<Void> result = this.webClient.get().uri(url).retrieve().bodyToMono(Void.class);
-
-		StepVerifier.create(result)
-				.expectErrorSatisfies(throwable -> {
-					assertThat(throwable).isInstanceOf(WebClientRequestException.class);
-					WebClientRequestException ex = (WebClientRequestException) throwable;
-					assertThat(ex.getMethod()).isEqualTo(HttpMethod.GET);
-					assertThat(ex.getUri()).isEqualTo(URI.create(url));
-				})
-				.verify();
-	}
-
 	@ParameterizedWebClientTest
 	void malformedResponseChunksOnBodilessEntity(ClientHttpConnector connector) {
 		Mono<?> result = doMalformedChunkedResponseTest(connector, ResponseSpec::toBodilessEntity);