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

Fix HTTP responses that caller asked to be JSON

Browse Source 
If caller says he accepts application/json we need to be sure that
we send an array. That wasn't quite working and hadn't been tested.
This commit is contained in:
Dave Syer
2017-01-20 17:44:58 +00:00
committed by markfisher
parent 8e3370b717
commit 946f4a3bf3
3 changed files with 15 additions and 3 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/flux/FluxHttpMessageConverter.java
View File

@@ -65,7 +65,7 @@ public class FluxHttpMessageConverter implements HttpMessageConverter<Flux<Objec
MediaType mediaType = inputMessage.getHeaders().getContentType(); MediaType mediaType = inputMessage.getHeaders().getContentType();
if (mediaType != null) { if (mediaType != null) {
if (mediaType.includes(MediaType.APPLICATION_JSON)) { if (!MediaType.ALL.equals(mediaType) && mediaType.includes(MediaType.APPLICATION_JSON)) {
return new JsonObjectDecoder().decode(inputMessage.getBody()); return new JsonObjectDecoder().decode(inputMessage.getBody());
} }
if (mediaType.includes(EVENT_STREAM)) { if (mediaType.includes(EVENT_STREAM)) {

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

@@ -81,7 +81,7 @@ class ResponseBodyEmitterSubscriber<T> implements Subscriber<T>, Runnable {
else { else {
responseBodyEmitter.send(","); responseBodyEmitter.send(",");
} }
if (value.getClass()==String.class) { if (value.getClass()==String.class && !((String)value).contains("\"")) {
object = "\"" + value + "\""; object = "\"" + value + "\"";
} }
} }

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

@@ -34,6 +34,7 @@ import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -96,13 +97,24 @@ public class RestApplicationTests {
.isEqualTo("[\"go\",\"home\"][\"come\",\"back\"]"); .isEqualTo("[\"go\",\"home\"][\"come\",\"back\"]");
} }
@Test
public void sentencesAcceptJson() throws Exception {
ResponseEntity<String> result = rest.exchange(
RequestEntity.get(new URI("http://localhost:" + port + "/sentences"))
.accept(MediaType.APPLICATION_JSON).build(),
String.class);
assertThat(result.getBody()).isEqualTo("[[\"go\",\"home\"],[\"come\",\"back\"]]");
// TODO: test this
// assertThat(result.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
}
@Test @Test
public void sentencesAcceptSse() throws Exception { public void sentencesAcceptSse() throws Exception {
assertThat(rest.exchange( assertThat(rest.exchange(
RequestEntity.get(new URI("http://localhost:" + port + "/sentences")) RequestEntity.get(new URI("http://localhost:" + port + "/sentences"))
.accept(EVENT_STREAM).build(), .accept(EVENT_STREAM).build(),
String.class).getBody()) String.class).getBody())
.isEqualTo(sse("[\"go\",\"home\"]","[\"come\",\"back\"]")); .isEqualTo(sse("[\"go\",\"home\"]", "[\"come\",\"back\"]"));
} }
@Test @Test