SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-792 Fix Supplier streaming in s-c-function-web

Browse Source 
Resolves #792
This commit is contained in:
Oleg Zhurakousky
2022-01-24 15:36:24 +01:00
parent 5283554d7c
commit 7a0c3bf6b3
10 changed files with 108 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.function.web.flux;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -74,11 +75,17 @@ public class FunctionController {
return (Mono<ResponseEntity<?>>) FunctionWebRequestProcessingHelper.processRequest(wrapper(request), body, false);
}
@SuppressWarnings("unchecked")
@PostMapping(path = "/**", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
@ResponseBody
public Mono<ResponseEntity<?>> postStream(ServerWebExchange request, @RequestBody(required = false) Flux<String> body) {
return (Mono<ResponseEntity<?>>) FunctionWebRequestProcessingHelper.processRequest(wrapper(request), body, false);
public Publisher<?> postStream(ServerWebExchange request, @RequestBody(required = false) Flux<String> body) {
return FunctionWebRequestProcessingHelper.processRequest(wrapper(request), body, true);
}
@GetMapping(path = "/**", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
@ResponseBody
public Publisher<?> getStream(ServerWebExchange request) {
FunctionWrapper wrapper = wrapper(request);
return FunctionWebRequestProcessingHelper.processRequest(wrapper, wrapper.getArgument(), true);
}
@SuppressWarnings("unchecked")
@@ -89,14 +96,6 @@ public class FunctionController {
return (Mono<ResponseEntity<?>>) FunctionWebRequestProcessingHelper.processRequest(wrapper, wrapper.getArgument(), false);
}
@SuppressWarnings("unchecked")
@GetMapping(path = "/**", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
@ResponseBody
public Mono<ResponseEntity<?>> getStream(ServerWebExchange request) {
FunctionWrapper wrapper = wrapper(request);
return (Mono<ResponseEntity<?>>) FunctionWebRequestProcessingHelper.processRequest(wrapper, wrapper.getArgument(), true);
}
private FunctionWrapper wrapper(ServerWebExchange request) {
FunctionInvocationWrapper function = (FunctionInvocationWrapper) request
.getAttribute(WebRequestConstants.HANDLER);

11
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionController.java
View File

@@ -94,21 +94,18 @@ public class FunctionController {
.headers(response.getHeaders()).body((Publisher<?>) response.getBody()));
}
@SuppressWarnings("unchecked")
@GetMapping(path = "/**", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
@ResponseBody
public Mono<ResponseEntity<Publisher<?>>> getStream(WebRequest request) {
public Publisher<?> getStream(WebRequest request) {
FunctionWrapper wrapper = wrapper(request);
return ((Mono<ResponseEntity<?>>) FunctionWebRequestProcessingHelper
.processRequest(wrapper, wrapper.getArgument(), true)).map(response -> ResponseEntity.ok()
.headers(response.getHeaders()).body((Publisher<?>) response.getBody()));
return FunctionWebRequestProcessingHelper
.processRequest(wrapper, wrapper.getArgument(), true);
}
@PostMapping(path = "/**")
@ResponseBody
public Object post(WebRequest request, @RequestBody(required = false) String body) {
String argument = StringUtils.hasText(body) ? body : "";
return FunctionWebRequestProcessingHelper.processRequest(wrapper(request), argument, false);
return FunctionWebRequestProcessingHelper.processRequest(wrapper(request), body, false);
}
@GetMapping(path = "/**")

6
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java
View File

@@ -84,7 +84,7 @@ public final class FunctionWebRequestProcessingHelper {
}
@SuppressWarnings({ "rawtypes", "unchecked" })
public static Object processRequest(FunctionWrapper wrapper, Object argument, boolean eventStream) {
public static Publisher<?> processRequest(FunctionWrapper wrapper, Object argument, boolean eventStream) {
FunctionInvocationWrapper function = wrapper.getFunction();
HttpHeaders headers = wrapper.getHeaders();
@@ -95,7 +95,7 @@ public final class FunctionWebRequestProcessingHelper {
function.setSkipOutputConversion(true);
}
Object input = argument == null ? Flux.empty() : (argument instanceof Publisher ? Flux.from((Publisher) argument) : inputMessage);
Object input = argument == null ? "" : (argument instanceof Publisher ? Flux.from((Publisher) argument) : inputMessage);
Object result = function.apply(input);
if (function.isConsumer()) {
@@ -111,7 +111,7 @@ public final class FunctionWebRequestProcessingHelper {
if (result instanceof Publisher) {
pResult = (Publisher) result;
if (eventStream) {
return Flux.from(pResult).then(Mono.fromSupplier(() -> responseOkBuilder.body(result)));
return Flux.from(pResult);
}
if (pResult instanceof Flux) {

2
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java
View File

@@ -333,6 +333,8 @@ public class HttpPostIntegrationTests {
@Test
@DirtiesContext
public void uppercaseSSE() throws Exception {
String s = this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON)
.body("[\"foo\",\"bar\"]"), String.class).getBody();
assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON)
.body("[\"foo\",\"bar\"]"), String.class).getBody())
.isEqualTo(sse("(FOO)", "(BAR)"));

12
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java
View File

@@ -64,6 +64,18 @@ public class UserSubmittedTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
}
@Test
public void testIssue274WithData() throws Exception {
SpringApplication.run(Issue274Configuration.class);
TestRestTemplate testRestTemplate = new TestRestTemplate();
String port = System.getProperty("server.port");
Thread.sleep(200);
ResponseEntity<String> response = testRestTemplate
.postForEntity(new URI("http://localhost:" + port + "/echo"), "hello", String.class);
assertThat(response.getBody()).isEqualTo("HELLO");
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
}
@SpringBootApplication
protected static class Issue274Configuration {

24
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java
View File

@@ -290,12 +290,29 @@ public class HttpPostIntegrationTests {
@Test
public void uppercaseSSE() throws Exception {
assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase"))
.accept(EVENT_STREAM).contentType(MediaType.APPLICATION_JSON)
String s = this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON)
.body("[\"foo\",\"bar\"]"), String.class).getBody();
assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON)
.body("[\"foo\",\"bar\"]"), String.class).getBody())
.isEqualTo(sse("(FOO)", "(BAR)"));
}
// @Test
// public void uppercaseSSE() throws Exception {
// assertThat(this.rest.exchange(RequestEntity.post(new URI("/uppercase"))
// .accept(EVENT_STREAM).contentType(MediaType.APPLICATION_JSON)
// .body("[\"foo\",\"bar\"]"), String.class).getBody())
// .isEqualTo(sse("(FOO)", "(BAR)"));
//
//// String body = this.rest.exchange(RequestEntity.post(new URI("/uppercase")).contentType(MediaType.APPLICATION_JSON)
//// .body("[\"foo\",\"bar\"]"), String.class).getBody();
//
//// System.out.println(body);
//
//// assertThat(body)
//// .isEqualTo(sse("(FOO)", "(BAR)"));
// }
@Test
public void sum() throws Exception {
@@ -334,7 +351,8 @@ public class HttpPostIntegrationTests {
}
private String sse(String... values) {
return "data:" + StringUtils.arrayToDelimitedString(values, "\n\ndata:") + "\n\n";
//return "data:" + StringUtils.arrayToDelimitedString(values, "\n\ndata:") + "\n\n";
return "[\"" + StringUtils.arrayToDelimitedString(values, "\",\"") + "\"]";
}
@EnableAutoConfiguration