root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Apply predicate to BufferingClientHttpRequestFactory 

The bufferingPredicate configured in RestClient.Builder can and should also
be used in the (existing) shouldBuffer protected method in
BufferingClientHttpRequestFactory since the factory is no longer intended
for direct use, and in any case the setting should apply in all cases
including when there are no interceptors.

See gh-33785
This commit is contained in:
rstoyanchev 2025-01-08 15:07:01 +00:00
parent 808d1b6413
commit 819a13f22d
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestFactory.java
View File

@ -20,6 +20,8 @@ import java.io.IOException;
import java.net.URI;
import java.util.function.BiPredicate;
import org.jspecify.annotations.Nullable;
import org.springframework.http.HttpMethod;
/**
@ -38,26 +40,37 @@ import org.springframework.http.HttpMethod;
*/
public class BufferingClientHttpRequestFactory extends AbstractClientHttpRequestFactoryWrapper {
private final BiPredicate<URI, HttpMethod> bufferingPredicate;
/**
* Create a buffering wrapper for the given {@link ClientHttpRequestFactory}.
* @param requestFactory the target request factory to wrap
*/
public BufferingClientHttpRequestFactory(ClientHttpRequestFactory requestFactory) {
this(requestFactory, null);
}
/**
* Constructor variant with an additional predicate to decide whether to
* buffer the response.
*/
public BufferingClientHttpRequestFactory(
ClientHttpRequestFactory requestFactory,
@Nullable BiPredicate<URI, HttpMethod> bufferingPredicate) {
super(requestFactory);
this.bufferingPredicate = (bufferingPredicate != null ? bufferingPredicate : (uri, method) -> true);
}
@Override
protected ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod, ClientHttpRequestFactory requestFactory)
throws IOException {
protected ClientHttpRequest createRequest(
URI uri, HttpMethod httpMethod, ClientHttpRequestFactory requestFactory) throws IOException {
ClientHttpRequest request = requestFactory.createRequest(uri, httpMethod);
if (shouldBuffer(uri, httpMethod)) {
return new BufferingClientHttpRequestWrapper(request);
}
else {
return request;
}
return (shouldBuffer(uri, httpMethod) ? new BufferingClientHttpRequestWrapper(request) : request);
}
/**
@ -70,7 +83,7 @@ public class BufferingClientHttpRequestFactory extends AbstractClientHttpRequest
* @return {@code true} if the exchange should be buffered; {@code false} otherwise
*/
protected boolean shouldBuffer(URI uri, HttpMethod httpMethod) {
return true;
return this.bufferingPredicate.test(uri, httpMethod);
}
}

3
spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java
View File

@ -656,7 +656,8 @@ final class DefaultRestClient implements RestClient {
}
}
else if (DefaultRestClient.this.bufferingPredicate != null) {
factory = new BufferingClientHttpRequestFactory(DefaultRestClient.this.clientRequestFactory);
factory = new BufferingClientHttpRequestFactory(
DefaultRestClient.this.clientRequestFactory, DefaultRestClient.this.bufferingPredicate);
}
else {
factory = DefaultRestClient.this.clientRequestFactory;