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

GH-475 Fix support for Flux<List> type conversion

Browse Source 
At the moment support is rudimentary but given that BeanFactoryAwareFunctionRegistry provides all the necessary type conversion functionality the true fix should consider utilizing it.

Resolves #475
This commit is contained in:
Oleg Zhurakousky
2020-03-31 14:46:22 +02:00
parent 1d784c199d
commit 21d68ff3c8
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RequestProcessor.java
View File

@@ -145,7 +145,7 @@ public class RequestProcessor {
Type jsonType = body.startsWith("[") Type jsonType = body.startsWith("[")
&& Collection.class.isAssignableFrom(inputType) && Collection.class.isAssignableFrom(inputType)
|| body.startsWith("{") ? inputType : Collection.class; || body.startsWith("{") ? inputType : Collection.class;
if (body.startsWith("[")) { if (body.startsWith("[") && itemType instanceof Class) {
jsonType = ResolvableType.forClassWithGenerics((Class<?>) jsonType, jsonType = ResolvableType.forClassWithGenerics((Class<?>) jsonType,
(Class<?>) itemType).getType(); (Class<?>) itemType).getType();
} }

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

@@ -351,6 +351,15 @@ public class HttpPostIntegrationTests {
String.class).getBody()).isEqualTo("{\"A\":2,\"B\":1}"); String.class).getBody()).isEqualTo("{\"A\":2,\"B\":1}");
} }
@Test
public void fluxWithList() throws Exception {
List<String> list = Arrays.asList("A", "B", "A");
assertThat(this.rest.exchange(
RequestEntity.post(new URI("/fluxCollectionEcho")).accept(MediaType.APPLICATION_JSON)
.contentType(MediaType.APPLICATION_JSON).body(list),
String.class).getBody()).isEqualTo("[\"A\",\"B\",\"A\"]");
}
private String sse(String... values) { private String sse(String... values) {
return "data:" + StringUtils.arrayToDelimitedString(values, "\n\ndata:") + "\n\n"; return "data:" + StringUtils.arrayToDelimitedString(values, "\n\ndata:") + "\n\n";
} }
@@ -481,6 +490,11 @@ public class HttpPostIntegrationTests {
(map, word) -> map.merge(word, 1, Integer::sum)); (map, word) -> map.merge(word, 1, Integer::sum));
} }
@Bean
public Function<Flux<List<String>>, Flux<String>> fluxCollectionEcho() {
return flux -> flux.flatMap(v -> Flux.fromIterable(v));
}
} }
public static class Foo { public static class Foo {