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

Add support for POSTing a single POJO

Browse Source 
You need to cache the request body so it can be read twice, once
to see if it's an array, and again to turn it into a POJO.
This commit is contained in:
Dave Syer
2017-05-16 10:26:10 +01:00
parent ff78bfc438
commit 120d2da496
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/request/FluxHandlerMethodArgumentResolver.java
View File

@@ -23,6 +23,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.cloud.function.context.FunctionInspector; import org.springframework.cloud.function.context.FunctionInspector;
@@ -34,6 +35,7 @@ import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.web.util.ContentCachingRequestWrapper;
/** /**
* Converter for request bodies of type <code>Flux<String></code>. * Converter for request bodies of type <code>Flux<String></code>.
@@ -72,24 +74,26 @@ public class FluxHandlerMethodArgumentResolver
type = Object.class; type = Object.class;
} }
List<Object> body; List<Object> body;
ContentCachingRequestWrapper nativeRequest = new ContentCachingRequestWrapper(
webRequest.getNativeRequest(HttpServletRequest.class));
if (isPlainText(webRequest) && CharSequence.class.isAssignableFrom(type)) { if (isPlainText(webRequest) && CharSequence.class.isAssignableFrom(type)) {
body = Arrays.asList(StreamUtils.copyToString(webRequest body = Arrays.asList(StreamUtils.copyToString(nativeRequest.getInputStream(),
.getNativeRequest(HttpServletRequest.class).getInputStream(),
Charset.forName("UTF-8"))); Charset.forName("UTF-8")));
} }
else { else {
body = mapper.readValue( try {
webRequest.getNativeRequest(HttpServletRequest.class) body = mapper.readValue(nativeRequest.getInputStream(), mapper
.getInputStream(), .getTypeFactory().constructCollectionLikeType(ArrayList.class, type));
mapper.getTypeFactory().constructCollectionLikeType(ArrayList.class, } catch (JsonMappingException e) {
type)); body = Arrays.asList(mapper.readValue(nativeRequest.getContentAsByteArray(), type));
}
} }
return new FluxRequest<Object>(body); return new FluxRequest<Object>(body);
} }
private boolean isPlainText(NativeWebRequest webRequest) { private boolean isPlainText(NativeWebRequest webRequest) {
String value = webRequest.getHeader("Content-Type"); String value = webRequest.getHeader("Content-Type");
if (value!=null) { if (value != null) {
return MediaType.valueOf(value).isCompatibleWith(MediaType.TEXT_PLAIN); return MediaType.valueOf(value).isCompatibleWith(MediaType.TEXT_PLAIN);
} }
return false; return false;

10
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/RestApplicationTests.java
View File

@@ -273,6 +273,16 @@ public class RestApplicationTests {
.isEqualTo("[{\"value\":\"FOO\"},{\"value\":\"BAR\"}]"); .isEqualTo("[{\"value\":\"FOO\"},{\"value\":\"BAR\"}]");
} }
@Test
public void uppercaseFoo() throws Exception {
// Single Foo can be parsed
ResponseEntity<String> result = rest.exchange(RequestEntity
.post(new URI("/upFoos")).contentType(MediaType.APPLICATION_JSON)
.body("{\"value\":\"foo\"}"), String.class);
assertThat(result.getBody())
.isEqualTo("[{\"value\":\"FOO\"}]");
}
@Test @Test
public void bareUppercase() throws Exception { public void bareUppercase() throws Exception {
ResponseEntity<String> result = rest.exchange(RequestEntity ResponseEntity<String> result = rest.exchange(RequestEntity