Use CharsetDecoder to decode a DataBuffer into a String.

Author: mp911de

spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java

@@ -16,6 +16,7 @@
 
 package org.springframework.core.codec.support;
 
+import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
@@ -38,11 +39,13 @@
  * @author Sebastien Deleuze
  * @author Brian Clozel
  * @author Arjen Poutsma
+ * @author Mark Paluch
  * @see StringEncoder
  */
 public class StringDecoder extends AbstractDecoder<String> {
 
 	public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
+	public static final String EMPTY = "";
 
 	private final boolean reduceToSingleBuffer;
 
@@ -82,9 +85,13 @@ public Flux<String> decode(Publisher<DataBuffer> inputStream, ResolvableType typ
 		}
 		Charset charset = getCharset(mimeType);
 		return inputFlux.map(content -> {
-			byte[] bytes = new byte[content.readableByteCount()];
-			content.read(bytes);
-			return new String(bytes, charset);
+			// fast-path exit.
+			if(content.readableByteCount() == 0) {
+				return EMPTY;
+			}
+
+			CharBuffer charBuffer = charset.decode(content.asByteBuffer());
+			return charBuffer.toString();
 		});
 	}
 

spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringDecoderTests.java

@@ -33,6 +33,7 @@
 /**
  * @author Sebastien Deleuze
  * @author Brian Clozel
+ * @author Mark Paluch
  */
 public class StringDecoderTests extends AbstractAllocatingTestCase {
 
@@ -92,4 +93,14 @@ public void decodeSingle() throws InterruptedException {
 		assertEquals("foobar", result);
 	}
 
+	@Test
+	public void decodeEmpty() throws InterruptedException {
+		Flux<DataBuffer> source = Flux.just(stringBuffer(""));
+		Single<String> single = RxJava1SingleConverter.from(this.decoder.decode(source,
+				ResolvableType.forClassWithGenerics(Single.class, String.class),
+				MediaType.TEXT_PLAIN));
+		String result = single.toBlocking().value();
+		assertEquals("", result);
+	}
+
 }