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

Send content type to web response if available

Browse Source
This commit is contained in:
Dave Syer
2017-01-23 09:37:02 +00:00
parent 896139ba67
commit 425be34b98
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FluxResponseBodyEmitter.java
View File

@@ -16,7 +16,9 @@
package org.springframework.cloud.function.web.flux;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter;
import reactor.core.publisher.Flux;
@@ -28,6 +30,8 @@ import reactor.core.publisher.Flux;
*/
class FluxResponseBodyEmitter<T> extends ResponseBodyEmitter {
private MediaType mediaType;
public FluxResponseBodyEmitter(Flux<T> observable) {
this(null, null, observable);
}
@@ -35,7 +39,17 @@ class FluxResponseBodyEmitter<T> extends ResponseBodyEmitter {
public FluxResponseBodyEmitter(Long timeout, MediaType mediaType,
Flux<T> observable) {
super(timeout);
this.mediaType = mediaType;
new ResponseBodyEmitterSubscriber<>(mediaType, observable, this);
}
@Override
protected void extendResponse(ServerHttpResponse outputMessage) {
super.extendResponse(outputMessage);
HttpHeaders headers = outputMessage.getHeaders();
if (headers.getContentType() == null && this.mediaType!=null && !MediaType.ALL.equals(this.mediaType)) {
headers.setContentType(this.mediaType);
}
}
}

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

@@ -104,17 +104,18 @@ public class RestApplicationTests {
.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);
assertThat(result.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
}
@Test
public void sentencesAcceptSse() throws Exception {
assertThat(rest.exchange(
ResponseEntity<String> result = rest.exchange(
RequestEntity.get(new URI("http://localhost:" + port + "/sentences"))
.accept(EVENT_STREAM).build(),
String.class).getBody())
String.class);
assertThat(result.getBody())
.isEqualTo(sse("[\"go\",\"home\"]", "[\"come\",\"back\"]"));
assertThat(result.getHeaders().getContentType().isCompatibleWith(EVENT_STREAM)).isTrue();
}
@Test