Skip to content

Commit d7ab5b4

Browse files
committed
Refactor HttpRequestSpec to HttpRequestValues
HttpRequestValues is immutable and exposes a builder. See gh-28386
1 parent 564f8ba commit d7ab5b4

File tree

12 files changed

+484
-348
lines changed

12 files changed

+484
-348
lines changed

spring-web/src/main/java/org/springframework/web/service/invoker/HttpClientAdapter.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@
3333
*/
3434
public interface HttpClientAdapter {
3535

36-
Mono<Void> requestToVoid(HttpRequestSpec spec);
36+
Mono<Void> requestToVoid(HttpRequestValues requestValues);
3737

38-
Mono<HttpHeaders> requestToHeaders(HttpRequestSpec spec);
38+
Mono<HttpHeaders> requestToHeaders(HttpRequestValues requestValues);
3939

40-
<T> Mono<T> requestToBody(HttpRequestSpec spec, ParameterizedTypeReference<T> bodyType);
40+
<T> Mono<T> requestToBody(HttpRequestValues requestValues, ParameterizedTypeReference<T> bodyType);
4141

42-
<T> Flux<T> requestToBodyFlux(HttpRequestSpec spec, ParameterizedTypeReference<T> bodyType);
42+
<T> Flux<T> requestToBodyFlux(HttpRequestValues requestValues, ParameterizedTypeReference<T> bodyType);
4343

44-
Mono<ResponseEntity<Void>> requestToBodilessEntity(HttpRequestSpec spec);
44+
Mono<ResponseEntity<Void>> requestToBodilessEntity(HttpRequestValues requestValues);
4545

46-
<T> Mono<ResponseEntity<T>> requestToEntity(HttpRequestSpec spec, ParameterizedTypeReference<T> bodyType);
46+
<T> Mono<ResponseEntity<T>> requestToEntity(HttpRequestValues requestValues, ParameterizedTypeReference<T> bodyType);
4747

48-
<T> Mono<ResponseEntity<Flux<T>>> requestToEntityFlux(HttpRequestSpec spec, ParameterizedTypeReference<T> bodyType);
48+
<T> Mono<ResponseEntity<Flux<T>>> requestToEntityFlux(HttpRequestValues requestValues, ParameterizedTypeReference<T> bodyType);
4949

5050
}

spring-web/src/main/java/org/springframework/web/service/invoker/HttpMethodArgumentResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class HttpMethodArgumentResolver implements HttpServiceArgumentResolver {
3838

3939
@Override
4040
public void resolve(
41-
@Nullable Object argument, MethodParameter parameter, HttpRequestSpec requestSpec) {
41+
@Nullable Object argument, MethodParameter parameter, HttpRequestValues.Builder requestValues) {
4242

4343
if (argument == null) {
4444
return;
@@ -47,7 +47,7 @@ public void resolve(
4747
if (logger.isTraceEnabled()) {
4848
logger.trace("Resolved HTTP method to: " + httpMethod.name());
4949
}
50-
requestSpec.setHttpMethod(httpMethod);
50+
requestValues.setHttpMethod(httpMethod);
5151
}
5252
}
5353

spring-web/src/main/java/org/springframework/web/service/invoker/HttpRequestSpec.java

Lines changed: 0 additions & 196 deletions
This file was deleted.

0 commit comments

Comments
 (0)