mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '3.2.x' into 3.3.x
Closes gh-41191
This commit is contained in:
commit
b593734edd
@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.springframework.boot.test.web.client;
|
package org.springframework.boot.test.web.client;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.security.KeyManagementException;
|
import java.security.KeyManagementException;
|
||||||
import java.security.KeyStoreException;
|
import java.security.KeyStoreException;
|
||||||
@ -58,10 +57,9 @@ import org.springframework.http.RequestEntity;
|
|||||||
import org.springframework.http.RequestEntity.UriTemplateRequestEntity;
|
import org.springframework.http.RequestEntity.UriTemplateRequestEntity;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.http.client.ClientHttpRequestFactory;
|
import org.springframework.http.client.ClientHttpRequestFactory;
|
||||||
import org.springframework.http.client.ClientHttpResponse;
|
|
||||||
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
|
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.web.client.DefaultResponseErrorHandler;
|
import org.springframework.web.client.NoOpResponseErrorHandler;
|
||||||
import org.springframework.web.client.RequestCallback;
|
import org.springframework.web.client.RequestCallback;
|
||||||
import org.springframework.web.client.ResponseExtractor;
|
import org.springframework.web.client.ResponseExtractor;
|
||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
@ -1078,14 +1076,6 @@ public class TestRestTemplate {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class NoOpResponseErrorHandler extends DefaultResponseErrorHandler {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void handleError(ClientHttpResponse response) throws IOException {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final class TrustSelfSignedStrategy implements TrustStrategy {
|
private static final class TrustSelfSignedStrategy implements TrustStrategy {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -45,6 +45,7 @@ import org.springframework.mock.http.client.MockClientHttpResponse;
|
|||||||
import org.springframework.test.util.ReflectionTestUtils;
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
import org.springframework.util.ReflectionUtils;
|
import org.springframework.util.ReflectionUtils;
|
||||||
import org.springframework.util.ReflectionUtils.MethodCallback;
|
import org.springframework.util.ReflectionUtils.MethodCallback;
|
||||||
|
import org.springframework.web.client.NoOpResponseErrorHandler;
|
||||||
import org.springframework.web.client.ResponseErrorHandler;
|
import org.springframework.web.client.ResponseErrorHandler;
|
||||||
import org.springframework.web.client.RestOperations;
|
import org.springframework.web.client.RestOperations;
|
||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
@ -223,13 +224,12 @@ class TestRestTemplateTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void withBasicAuthShouldUseNoOpErrorHandler() throws Exception {
|
void withBasicAuthShouldUseNoOpErrorHandler() {
|
||||||
TestRestTemplate originalTemplate = new TestRestTemplate("foo", "bar");
|
TestRestTemplate originalTemplate = new TestRestTemplate("foo", "bar");
|
||||||
ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class);
|
ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class);
|
||||||
originalTemplate.getRestTemplate().setErrorHandler(errorHandler);
|
originalTemplate.getRestTemplate().setErrorHandler(errorHandler);
|
||||||
TestRestTemplate basicAuthTemplate = originalTemplate.withBasicAuth("user", "password");
|
TestRestTemplate basicAuthTemplate = originalTemplate.withBasicAuth("user", "password");
|
||||||
assertThat(basicAuthTemplate.getRestTemplate().getErrorHandler()).isInstanceOf(
|
assertThat(basicAuthTemplate.getRestTemplate().getErrorHandler()).isInstanceOf(NoOpResponseErrorHandler.class);
|
||||||
Class.forName("org.springframework.boot.test.web.client.TestRestTemplate$NoOpResponseErrorHandler"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Loading…
Reference in New Issue
Block a user