Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
See gh-29721
This commit is contained in:
rstoyanchev
2023-01-06 16:50:19 +00:00
parent 4bcc24372a
commit c702cd418e
5 changed files with 59 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-test/src/main/java/org/springframework/test/web/client/response/ExecutingResponseCreator.java
View File

@@ -27,15 +27,12 @@ import org.springframework.util.Assert;
import org.springframework.util.StreamUtils;
/**
* A {@code ResponseCreator} which delegates to a {@link ClientHttpRequestFactory}
* to perform the request and return the associated response.
* This is notably useful when testing code that calls multiple remote services, some
* of which need to be actually called rather than further mocked.
* <p>Note that the input request is asserted to be a {@code MockClientHttpRequest} and
* the URI, method, headers and body are copied.
* <p>The factory can typically be obtained from a {@code RestTemplate} but in case this
* is used with e.g. {@code MockRestServiceServer}, make sure to capture the factory early
* before binding the mock server to the RestTemplate (as it replaces the factory):
* {@code ResponseCreator} that obtains the response by executing the request
* through a {@link ClientHttpRequestFactory}. This is useful in scenarios with
* multiple remote services where some need to be called rather than mocked.
* <p>The {@code ClientHttpRequestFactory} is typically obtained from the
* {@code RestTemplate} before it is passed to {@code MockRestServiceServer},
* in effect using the original factory rather than the test factory:
* <pre><code>
* ResponseCreator withActualResponse = new ExecutingResponseCreator(restTemplate);
* MockRestServiceServer server = MockRestServiceServer.bindTo(restTemplate).build();
@@ -53,7 +50,7 @@ public class ExecutingResponseCreator implements ResponseCreator {
/**
* Create a {@code ExecutingResponseCreator} from a {@code ClientHttpRequestFactory}.
* Create an instance with the given {@code ClientHttpRequestFactory}.
* @param requestFactory the request factory to delegate to
*/
public ExecutingResponseCreator(ClientHttpRequestFactory requestFactory) {
@@ -63,7 +60,7 @@ public class ExecutingResponseCreator implements ResponseCreator {
@Override
public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException {
Assert.state(request instanceof MockClientHttpRequest, "Request should be an instance of MockClientHttpRequest");
Assert.state(request instanceof MockClientHttpRequest, "Expected a MockClientHttpRequest");
MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
ClientHttpRequest newRequest = this.requestFactory.createRequest(mockRequest.getURI(), mockRequest.getMethod());
newRequest.getHeaders().putAll(mockRequest.getHeaders());

15
spring-test/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,16 +28,11 @@ import org.springframework.lang.Nullable;
import org.springframework.test.web.client.ResponseCreator;
/**
* Static factory methods for obtaining a {@link ResponseCreator} instance.
* Static factory methods to obtain a {@link ResponseCreator} with a fixed
* response.
*
* <p><strong>Eclipse users:</strong> consider adding this class as a Java editor
* favorite. To navigate, open the Preferences and type "favorites".
*
* <p>See also {@link ExecutingResponseCreator} for a {@code ResponseCreator} that is
* capable of performing an actual request. That case is not offered as a factory method
* here because of the early setup that is likely needed (capturing a request factory
* which wouldn't be available anymore when the factory methods are typically invoked,
* e.g. replaced in a {@code RestTemplate} by the {@code MockRestServiceServer}).
* <p>In addition, see also the {@link ExecutingResponseCreator} implementation
* that performs an actual requests to remote services.
*
* @author Rossen Stoyanchev
* @since 3.2