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

Add ReactiveHttpRequestValues

Browse Source 
Separate collection and handling of reactive request values into a
subclass of HttpRequestValues.

Closes gh-30117
This commit is contained in:
rstoyanchev
2023-07-11 07:42:04 +01:00
parent 3209cf5c7a
commit a3e37597aa
9 changed files with 436 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/test/java/org/springframework/web/service/invoker/HttpRequestValuesTests.java
View File

@@ -125,9 +125,9 @@ class HttpRequestValuesTests {
.build();
@SuppressWarnings("unchecked")
MultiValueMap<String, HttpEntity<?>> map = (MultiValueMap<String, HttpEntity<?>>) requestValues.getBodyValue();
MultiValueMap<String, Object> map = (MultiValueMap<String, Object>) requestValues.getBodyValue();
assertThat(map).hasSize(2);
assertThat(map.getFirst("form field").getBody()).isEqualTo("form value");
assertThat(map.getFirst("form field")).isEqualTo("form value");
assertThat(map.getFirst("entity")).isEqualTo(entity);
}
@@ -146,9 +146,9 @@ class HttpRequestValuesTests {
assertThat(uriTemplate).isEqualTo("/path?{queryParam0}={queryParam0[0]}");
@SuppressWarnings("unchecked")
MultiValueMap<String, HttpEntity<?>> map = (MultiValueMap<String, HttpEntity<?>>) requestValues.getBodyValue();
MultiValueMap<String, Object> map = (MultiValueMap<String, Object>) requestValues.getBodyValue();
assertThat(map).hasSize(1);
assertThat(map.getFirst("form field").getBody()).isEqualTo("form value");
assertThat(map.getFirst("form field")).isEqualTo("form value");
}
}

47
spring-web/src/test/java/org/springframework/web/service/invoker/RequestBodyArgumentResolverTests.java
View File

@@ -23,6 +23,7 @@ import org.reactivestreams.Publisher;
import reactor.core.publisher.Mono;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.lang.Nullable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.service.annotation.GetExchange;
@@ -32,12 +33,11 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/**
* Unit tests for {@link RequestBodyArgumentResolver}.
*
* @author Rossen Stoyanchev
*/
class RequestBodyArgumentResolverTests {
private final TestExchangeAdapter client = new TestExchangeAdapter();
private final TestReactorExchangeAdapter client = new TestReactorExchangeAdapter();
private final Service service =
HttpServiceProxyFactory.builderFor(this.client).build().createClient(Service.class);
@@ -48,8 +48,8 @@ class RequestBodyArgumentResolverTests {
String body = "bodyValue";
this.service.execute(body);
assertThat(getRequestValues().getBodyValue()).isEqualTo(body);
assertThat(getRequestValues().getBody()).isNull();
assertThat(getBodyValue()).isEqualTo(body);
assertThat(getPublisherBody()).isNull();
}
@Test
@@ -57,9 +57,9 @@ class RequestBodyArgumentResolverTests {
Mono<String> bodyMono = Mono.just("bodyValue");
this.service.executeMono(bodyMono);
assertThat(getRequestValues().getBodyValue()).isNull();
assertThat(getRequestValues().getBody()).isSameAs(bodyMono);
assertThat(getRequestValues().getBodyElementType()).isEqualTo(new ParameterizedTypeReference<String>() {});
assertThat(getBodyValue()).isNull();
assertThat(getPublisherBody()).isSameAs(bodyMono);
assertThat(getBodyElementType()).isEqualTo(new ParameterizedTypeReference<String>() {});
}
@Test
@@ -68,10 +68,10 @@ class RequestBodyArgumentResolverTests {
String bodyValue = "bodyValue";
this.service.executeSingle(Single.just(bodyValue));
assertThat(getRequestValues().getBodyValue()).isNull();
assertThat(getRequestValues().getBodyElementType()).isEqualTo(new ParameterizedTypeReference<String>() {});
assertThat(getBodyValue()).isNull();
assertThat(getBodyElementType()).isEqualTo(new ParameterizedTypeReference<String>() {});
Publisher<?> body = getRequestValues().getBody();
Publisher<?> body = getPublisherBody();
assertThat(body).isNotNull();
assertThat(((Mono<String>) body).block()).isEqualTo(bodyValue);
}
@@ -104,17 +104,32 @@ class RequestBodyArgumentResolverTests {
void ignoreNull() {
this.service.execute(null);
assertThat(getRequestValues().getBodyValue()).isNull();
assertThat(getRequestValues().getBody()).isNull();
assertThat(getBodyValue()).isNull();
assertThat(getPublisherBody()).isNull();
this.service.executeMono(null);
assertThat(getRequestValues().getBodyValue()).isNull();
assertThat(getRequestValues().getBody()).isNull();
assertThat(getBodyValue()).isNull();
assertThat(getPublisherBody()).isNull();
}
private HttpRequestValues getRequestValues() {
return this.client.getRequestValues();
@Nullable
private Object getBodyValue() {
return getReactiveRequestValues().getBodyValue();
}
@Nullable
private Publisher<?> getPublisherBody() {
return getReactiveRequestValues().getBodyPublisher();
}
@Nullable
private ParameterizedTypeReference<?> getBodyElementType() {
return getReactiveRequestValues().getBodyPublisherElementType();
}
private ReactiveHttpRequestValues getReactiveRequestValues() {
return (ReactiveHttpRequestValues) this.client.getRequestValues();
}

2
spring-web/src/test/java/org/springframework/web/service/invoker/RequestPartArgumentResolverTests.java
View File

@@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
class RequestPartArgumentResolverTests {
private final TestExchangeAdapter client = new TestExchangeAdapter();
private final TestReactorExchangeAdapter client = new TestReactorExchangeAdapter();
private final Service service =
HttpServiceProxyFactory.builderFor(this.client).build().createClient(Service.class);