Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reactor StringEncoder into CharSequenceEncoder

Browse Source 
This commit refactors the StringEncoder to a CharSequenceEncoder, in
order to support StringBuilders, Groovy GStrings, etc.

Issue: https://github.com/spring-projects/spring-reactive/issues/120
This commit is contained in:
Arjen Poutsma
2016-07-21 12:18:19 +02:00
committed by Rossen Stoyanchev
parent 0f6505e32f
commit b0d7625e3e
11 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-core/src/test/java/org/springframework/core/codec/StringEncoderTests.java → spring-core/src/test/java/org/springframework/core/codec/CharSequenceEncoderTests.java
View File

@@ -27,6 +27,7 @@ import reactor.test.TestSubscriber;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.support.DataBufferUtils;
import org.springframework.util.MimeTypeUtils;
@@ -37,35 +38,46 @@ import static org.junit.Assert.assertTrue;
* @author Sebastien Deleuze
*/
@RunWith(Parameterized.class)
public class StringEncoderTests extends AbstractDataBufferAllocatingTestCase {
public class CharSequenceEncoderTests extends AbstractDataBufferAllocatingTestCase {
private StringEncoder encoder;
private CharSequenceEncoder encoder;
@Before
public void createEncoder() {
this.encoder = new StringEncoder();
this.encoder = new CharSequenceEncoder();
}
@Test
public void canWrite() {
assertTrue(this.encoder.canEncode(ResolvableType.forClass(String.class), MimeTypeUtils.TEXT_PLAIN));
assertTrue(this.encoder.canEncode(ResolvableType.forClass(StringBuilder.class), MimeTypeUtils.TEXT_PLAIN));
assertTrue(this.encoder.canEncode(ResolvableType.forClass(StringBuffer.class), MimeTypeUtils.TEXT_PLAIN));
assertFalse(this.encoder.canEncode(ResolvableType.forClass(Integer.class), MimeTypeUtils.TEXT_PLAIN));
assertFalse(this.encoder.canEncode(ResolvableType.forClass(String.class), MimeTypeUtils.APPLICATION_JSON));
}
@Test
public void write() throws InterruptedException {
Flux<String> output = Flux.from(
this.encoder.encode(Flux.just("foo"), this.bufferFactory, null, null))
.map(chunk -> {
byte[] b = new byte[chunk.readableByteCount()];
chunk.read(b);
DataBufferUtils.release(chunk);
return new String(b, StandardCharsets.UTF_8);
});
public void writeString() throws InterruptedException {
Flux<String> stringFlux = Flux.just("foo");
Flux<DataBuffer> output = Flux.from(
this.encoder.encode(stringFlux, this.bufferFactory, null, null));
TestSubscriber
.subscribe(output)
.assertValues("foo");
.assertNoError()
.assertComplete()
.assertValuesWith(stringConsumer("foo"));
}
@Test
public void writeStringBuilder() throws InterruptedException {
Flux<StringBuilder> stringBuilderFlux = Flux.just(new StringBuilder("foo"));
Flux<DataBuffer> output = Flux.from(
this.encoder.encode(stringBuilderFlux, this.bufferFactory, null, null));
TestSubscriber
.subscribe(output)
.assertNoError()
.assertComplete()
.assertValuesWith(stringConsumer("foo"));
}
}