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

Add some tests for JSON mime types in rest endpoints

Browse Source
This commit is contained in:
Dave Syer
2017-01-06 14:11:48 +00:00
parent 4ad01be090
commit 3357a93cef
3 changed files with 53 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java
View File

@@ -16,29 +16,14 @@
package org.springframework.cloud.function.web;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.IntPredicate;
import org.reactivestreams.Publisher;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.core.ResolvableType;
import org.springframework.core.codec.StringDecoder;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.http.MediaType;
import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.codec.HttpMessageReader;
import org.springframework.util.MimeType;
import org.springframework.http.codec.ServerSentEventHttpMessageReader;
import org.springframework.web.reactive.config.WebReactiveConfigurer;
import reactor.core.publisher.Flux;
/**
* @author Mark Fisher
*/
@@ -47,66 +32,10 @@ public class RestApplication implements WebReactiveConfigurer {
@Override
public void extendMessageReaders(List<HttpMessageReader<?>> readers) {
readers.add(0, new DecoderHttpMessageReader<>(new SseDecoder()));
readers.add(0, new ServerSentEventHttpMessageReader());
}
public static void main(String[] args) {
SpringApplication.run(RestApplication.class, args);
}
}
class SseDecoder extends StringDecoder {
private static final IntPredicate NEWLINE_DELIMITER = b -> b == '\n' || b == '\r';
@Override
public boolean canDecode(ResolvableType elementType, MimeType mimeType) {
return super.canDecode(elementType, mimeType)
&& MediaType.TEXT_EVENT_STREAM.isCompatibleWith(mimeType);
}
@Override
public Flux<String> decode(Publisher<DataBuffer> inputStream,
ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
Flux<DataBuffer> inputFlux = Flux.from(inputStream);
inputFlux = Flux.from(inputStream).flatMap(SseDecoder::splitOnNewline);
return inputFlux.map(buffer -> decodeDataBuffer(buffer, mimeType));
}
private static Flux<DataBuffer> splitOnNewline(DataBuffer dataBuffer) {
List<DataBuffer> results = new ArrayList<>();
int startIdx = 0;
int endIdx;
final int limit = dataBuffer.readableByteCount();
do {
endIdx = dataBuffer.indexOf(NEWLINE_DELIMITER, startIdx);
endIdx = dataBuffer.indexOf(NEWLINE_DELIMITER, endIdx + 1);
int length = (endIdx != -1 ? endIdx - startIdx + 1 : limit - startIdx) - 7;
if (length > 0) {
DataBuffer token = dataBuffer.slice(startIdx + 5, length);
results.add(DataBufferUtils.retain(token));
}
startIdx = endIdx + 1;
}
while (startIdx < limit && endIdx != -1);
DataBufferUtils.release(dataBuffer);
return Flux.fromIterable(results);
}
private String decodeDataBuffer(DataBuffer dataBuffer, MimeType mimeType) {
Charset charset = getCharset(mimeType);
CharBuffer charBuffer = charset.decode(dataBuffer.asByteBuffer());
DataBufferUtils.release(dataBuffer);
return charBuffer.toString();
}
private Charset getCharset(MimeType mimeType) {
if (mimeType != null && mimeType.getCharset() != null) {
return mimeType.getCharset();
}
else {
return DEFAULT_CHARSET;
}
}
}

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

@@ -16,9 +16,12 @@
package org.springframework.cloud.function.web;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
import java.util.function.Supplier;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,6 +61,16 @@ public class RestApplicationTests {
String.class).getBody()).isEqualTo(sse("foo", "bar"));
}
@Test
public void wordsJson() throws Exception {
assertThat(rest
.exchange(
RequestEntity.get(new URI("http://localhost:" + port + "/words"))
.accept(MediaType.APPLICATION_JSON).build(),
String.class)
.getBody()).isEqualTo("[\"foo\",\"bar\"]");
}
@Test
public void words() throws Exception {
assertThat(rest.exchange(
@@ -71,6 +84,32 @@ public class RestApplicationTests {
"foo\nbar", String.class)).isEqualTo("[FOO][BAR]");
}
@Test
@Ignore("Not working even though the JSON stream is")
// Not working because we convert the JSON to objects in
// FunctionExtractingFunctionCatalog, so all we need from Spring Reactive is a String,
// and the StringDecoder splits on newlines
public void uppercaseJsonArray() throws Exception {
assertThat(rest
.exchange(
RequestEntity.post(new URI("http://localhost:" + port + "/maps"))
.contentType(MediaType.APPLICATION_JSON)
.body("[{\"value\":\"foo\"},{\"value\":\"bar\"}]"),
String.class)
.getBody()).isEqualTo("{\"value\":\"FOO\"}{\"value\":\"BAR\"}");
}
@Test
public void uppercaseJsonStream() throws Exception {
assertThat(rest
.exchange(
RequestEntity.post(new URI("http://localhost:" + port + "/maps"))
.contentType(MediaType.APPLICATION_JSON)
.body("{\"value\":\"foo\"}\n{\"value\":\"bar\"}"),
String.class)
.getBody()).isEqualTo("{\"value\":\"FOO\"}{\"value\":\"BAR\"}");
}
@Test
public void uppercaseSSE() throws Exception {
assertThat(rest.exchange(
@@ -92,6 +131,14 @@ public class RestApplicationTests {
return flux -> flux.map(value -> "[" + value.trim().toUpperCase() + "]");
}
@Bean
public Function<Flux<HashMap<String, String>>, Flux<Map<String, String>>> maps() {
return flux -> flux.map(value -> {
value.put("value", value.get("value").trim().toUpperCase());
return value;
});
}
@Bean
public Supplier<Flux<String>> words() {
return () -> Flux.fromArray(new String[] { "foo", "bar" });