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

Refactoring external contribution

Browse Source 
Created abstract CharSequence decoder, which is extended by
StringDecoder and CharBufferDecoder.

See gh-29741
This commit is contained in:
Arjen Poutsma
2023-09-19 15:13:00 +02:00
parent 59771318ce
commit ecd3f191b6
4 changed files with 276 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
spring-core/src/main/java/org/springframework/core/codec/AbstractCharSequenceDecoder.java Normal file
View File

@@ -0,0 +1,205 @@
/*
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.core.codec;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.core.io.buffer.LimitedDataBufferList;
import org.springframework.core.log.LogFormatUtils;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
/**
* Abstract base class that decodes from a data buffer stream to a
* {@code CharSequence} stream.
*
* @author Arjen Poutsma
* @since 6.1
* @param <T> the character sequence type
*/
public abstract class AbstractCharSequenceDecoder<T extends CharSequence> extends AbstractDataBufferDecoder<T> {
/** The default charset to use, i.e. "UTF-8". */
public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
/** The default delimiter strings to use, i.e. {@code \r\n} and {@code \n}. */
public static final List<String> DEFAULT_DELIMITERS = List.of("\r\n", "\n");
private final List<String> delimiters;
private final boolean stripDelimiter;
private Charset defaultCharset = DEFAULT_CHARSET;
private final ConcurrentMap<Charset, byte[][]> delimitersCache = new ConcurrentHashMap<>();
/**
* Create a new {@code AbstractCharSequenceDecoder} with the given parameters.
*/
protected AbstractCharSequenceDecoder(List<String> delimiters, boolean stripDelimiter, MimeType... mimeTypes) {
super(mimeTypes);
Assert.notEmpty(delimiters, "'delimiters' must not be empty");
this.delimiters = new ArrayList<>(delimiters);
this.stripDelimiter = stripDelimiter;
}
/**
* Set the default character set to fall back on if the MimeType does not specify any.
* <p>By default this is {@code UTF-8}.
* @param defaultCharset the charset to fall back on
*/
public void setDefaultCharset(Charset defaultCharset) {
this.defaultCharset = defaultCharset;
}
/**
* Return the configured {@link #setDefaultCharset(Charset) defaultCharset}.
*/
public Charset getDefaultCharset() {
return this.defaultCharset;
}
@Override
public final Flux<T> decode(Publisher<DataBuffer> input, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
byte[][] delimiterBytes = getDelimiterBytes(mimeType);
LimitedDataBufferList chunks = new LimitedDataBufferList(getMaxInMemorySize());
DataBufferUtils.Matcher matcher = DataBufferUtils.matcher(delimiterBytes);
return Flux.from(input)
.concatMapIterable(buffer -> processDataBuffer(buffer, matcher, chunks))
.concatWith(Mono.defer(() -> {
if (chunks.isEmpty()) {
return Mono.empty();
}
DataBuffer lastBuffer = chunks.get(0).factory().join(chunks);
chunks.clear();
return Mono.just(lastBuffer);
}))
.doFinally(signalType -> chunks.releaseAndClear())
.doOnDiscard(DataBuffer.class, DataBufferUtils::release)
.map(buffer -> decode(buffer, elementType, mimeType, hints));
}
private byte[][] getDelimiterBytes(@Nullable MimeType mimeType) {
return this.delimitersCache.computeIfAbsent(getCharset(mimeType), charset -> {
byte[][] result = new byte[this.delimiters.size()][];
for (int i = 0; i < this.delimiters.size(); i++) {
result[i] = this.delimiters.get(i).getBytes(charset);
}
return result;
});
}
private Collection<DataBuffer> processDataBuffer(DataBuffer buffer, DataBufferUtils.Matcher matcher,
LimitedDataBufferList chunks) {
boolean release = true;
try {
List<DataBuffer> result = null;
do {
int endIndex = matcher.match(buffer);
if (endIndex == -1) {
chunks.add(buffer);
release = false;
break;
}
DataBuffer split = buffer.split(endIndex + 1);
if (result == null) {
result = new ArrayList<>();
}
int delimiterLength = matcher.delimiter().length;
if (chunks.isEmpty()) {
if (this.stripDelimiter) {
split.writePosition(split.writePosition() - delimiterLength);
}
result.add(split);
}
else {
chunks.add(split);
DataBuffer joined = buffer.factory().join(chunks);
if (this.stripDelimiter) {
joined.writePosition(joined.writePosition() - delimiterLength);
}
result.add(joined);
chunks.clear();
}
}
while (buffer.readableByteCount() > 0);
return (result != null ? result : Collections.emptyList());
}
finally {
if (release) {
DataBufferUtils.release(buffer);
}
}
}
@Override
public final T decode(DataBuffer dataBuffer, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
Charset charset = getCharset(mimeType);
T value = decodeInternal(dataBuffer, charset);
DataBufferUtils.release(dataBuffer);
LogFormatUtils.traceDebug(logger, traceOn -> {
String formatted = LogFormatUtils.formatValue(value, !traceOn);
return Hints.getLogPrefix(hints) + "Decoded " + formatted;
});
return value;
}
private Charset getCharset(@Nullable MimeType mimeType) {
if (mimeType != null) {
Charset charset = mimeType.getCharset();
if (charset != null) {
return charset;
}
}
return getDefaultCharset();
}
/**
* Template method that decodes the given data buffer into {@code T}, given
* the charset.
*/
protected abstract T decodeInternal(DataBuffer dataBuffer, Charset charset);
}

168
spring-core/src/main/java/org/springframework/core/codec/CharBufferDecoder.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,28 +16,14 @@
package org.springframework.core.codec; package org.springframework.core.codec;
import java.nio.ByteBuffer;
import java.nio.CharBuffer; import java.nio.CharBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.core.io.buffer.LimitedDataBufferList;
import org.springframework.core.log.LogFormatUtils;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.MimeType; import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils; import org.springframework.util.MimeTypeUtils;
@@ -49,55 +35,16 @@ import org.springframework.util.MimeTypeUtils;
* avoiding split-character issues. The default delimiters used by default are * avoiding split-character issues. The default delimiters used by default are
* {@code \n} and {@code \r\n} but that can be customized. * {@code \n} and {@code \r\n} but that can be customized.
* *
* @author Sebastien Deleuze * @author Markus Heiden
* @author Brian Clozel
* @author Arjen Poutsma * @author Arjen Poutsma
* @author Mark Paluch * @since 6.1
* @see CharSequenceEncoder * @see CharSequenceEncoder
*/ */
public final class CharBufferDecoder extends AbstractDataBufferDecoder<CharBuffer> { public final class CharBufferDecoder extends AbstractCharSequenceDecoder<CharBuffer> {
/**
* The default charset "UTF-8".
*/
public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
/**
* The default delimiter strings to use, i.e. {@code \r\n} and {@code \n}.
*/
public static final List<String> DEFAULT_DELIMITERS = List.of("\r\n", "\n");
private final List<String> delimiters; public CharBufferDecoder(List<String> delimiters, boolean stripDelimiter, MimeType... mimeTypes) {
super(delimiters, stripDelimiter, mimeTypes);
private final boolean stripDelimiter;
private Charset defaultCharset = DEFAULT_CHARSET;
private final ConcurrentMap<Charset, byte[][]> delimitersCache = new ConcurrentHashMap<>();
private CharBufferDecoder(List<String> delimiters, boolean stripDelimiter, MimeType... mimeTypes) {
super(mimeTypes);
Assert.notEmpty(delimiters, "'delimiters' must not be empty");
this.delimiters = new ArrayList<>(delimiters);
this.stripDelimiter = stripDelimiter;
}
/**
* Set the default character set to fall back on if the MimeType does not specify any.
* <p>By default this is {@code UTF-8}.
* @param defaultCharset the charset to fall back on
*/
public void setDefaultCharset(Charset defaultCharset) {
this.defaultCharset = defaultCharset;
}
/**
* Return the configured {@link #setDefaultCharset(Charset) defaultCharset}.
*/
public Charset getDefaultCharset() {
return this.defaultCharset;
} }
@Override @Override
@@ -106,105 +53,12 @@ public final class CharBufferDecoder extends AbstractDataBufferDecoder<CharBuffe
} }
@Override @Override
public Flux<CharBuffer> decode(Publisher<DataBuffer> input, ResolvableType elementType, protected CharBuffer decodeInternal(DataBuffer dataBuffer, Charset charset) {
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) { ByteBuffer byteBuffer = ByteBuffer.allocate(dataBuffer.readableByteCount());
dataBuffer.toByteBuffer(byteBuffer);
byte[][] delimiterBytes = getDelimiterBytes(mimeType); return charset.decode(byteBuffer);
LimitedDataBufferList chunks = new LimitedDataBufferList(getMaxInMemorySize());
DataBufferUtils.Matcher matcher = DataBufferUtils.matcher(delimiterBytes);
return Flux.from(input)
.concatMapIterable(buffer -> processDataBuffer(buffer, matcher, chunks))
.concatWith(Mono.defer(() -> {
if (chunks.isEmpty()) {
return Mono.empty();
}
DataBuffer lastBuffer = chunks.get(0).factory().join(chunks);
chunks.clear();
return Mono.just(lastBuffer);
}))
.doOnTerminate(chunks::releaseAndClear)
.doOnDiscard(DataBuffer.class, DataBufferUtils::release)
.map(buffer -> decode(buffer, elementType, mimeType, hints));
} }
private byte[][] getDelimiterBytes(@Nullable MimeType mimeType) {
return this.delimitersCache.computeIfAbsent(getCharset(mimeType), charset -> {
byte[][] result = new byte[this.delimiters.size()][];
for (int i = 0; i < this.delimiters.size(); i++) {
result[i] = this.delimiters.get(i).getBytes(charset);
}
return result;
});
}
private Collection<DataBuffer> processDataBuffer(
DataBuffer buffer, DataBufferUtils.Matcher matcher, LimitedDataBufferList chunks) {
boolean release = true;
try {
List<DataBuffer> result = null;
do {
int endIndex = matcher.match(buffer);
if (endIndex == -1) {
chunks.add(buffer);
release = false;
break;
}
DataBuffer split = buffer.split(endIndex + 1);
if (result == null) {
result = new ArrayList<>();
}
int delimiterLength = matcher.delimiter().length;
if (chunks.isEmpty()) {
if (this.stripDelimiter) {
split.writePosition(split.writePosition() - delimiterLength);
}
result.add(split);
}
else {
chunks.add(split);
DataBuffer joined = buffer.factory().join(chunks);
if (this.stripDelimiter) {
joined.writePosition(joined.writePosition() - delimiterLength);
}
result.add(joined);
chunks.clear();
}
}
while (buffer.readableByteCount() > 0);
return (result != null ? result : Collections.emptyList());
}
finally {
if (release) {
DataBufferUtils.release(buffer);
}
}
}
@Override
public CharBuffer decode(DataBuffer dataBuffer, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
Charset charset = getCharset(mimeType);
CharBuffer charBuffer = charset.decode(dataBuffer.toByteBuffer());
DataBufferUtils.release(dataBuffer);
LogFormatUtils.traceDebug(logger, traceOn -> {
String formatted = LogFormatUtils.formatValue(charBuffer, !traceOn);
return Hints.getLogPrefix(hints) + "Decoded " + formatted;
});
return charBuffer;
}
private Charset getCharset(@Nullable MimeType mimeType) {
if (mimeType != null && mimeType.getCharset() != null) {
return mimeType.getCharset();
}
else {
return getDefaultCharset();
}
}
/** /**
* Create a {@code CharBufferDecoder} for {@code "text/plain"}. * Create a {@code CharBufferDecoder} for {@code "text/plain"}.

155
spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java
View File

@@ -17,26 +17,11 @@
package org.springframework.core.codec; package org.springframework.core.codec;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.core.io.buffer.LimitedDataBufferList;
import org.springframework.core.log.LogFormatUtils;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.MimeType; import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils; import org.springframework.util.MimeTypeUtils;
@@ -55,48 +40,10 @@ import org.springframework.util.MimeTypeUtils;
* @since 5.0 * @since 5.0
* @see CharSequenceEncoder * @see CharSequenceEncoder
*/ */
public final class StringDecoder extends AbstractDataBufferDecoder<String> { public final class StringDecoder extends AbstractCharSequenceDecoder<String> {
/** The default charset to use, i.e. "UTF-8". */
public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
/** The default delimiter strings to use, i.e. {@code \r\n} and {@code \n}. */
public static final List<String> DEFAULT_DELIMITERS = List.of("\r\n", "\n");
private final List<String> delimiters;
private final boolean stripDelimiter;
private Charset defaultCharset = DEFAULT_CHARSET;
private final ConcurrentMap<Charset, byte[][]> delimitersCache = new ConcurrentHashMap<>();
private StringDecoder(List<String> delimiters, boolean stripDelimiter, MimeType... mimeTypes) { private StringDecoder(List<String> delimiters, boolean stripDelimiter, MimeType... mimeTypes) {
super(mimeTypes); super(delimiters, stripDelimiter, mimeTypes);
Assert.notEmpty(delimiters, "'delimiters' must not be empty");
this.delimiters = new ArrayList<>(delimiters);
this.stripDelimiter = stripDelimiter;
}
/**
* Set the default character set to fall back on if the MimeType does not specify any.
* <p>By default this is {@code UTF-8}.
* @param defaultCharset the charset to fall back on
* @since 5.2.9
*/
public void setDefaultCharset(Charset defaultCharset) {
this.defaultCharset = defaultCharset;
}
/**
* Return the configured {@link #setDefaultCharset(Charset) defaultCharset}.
* @since 5.2.9
*/
public Charset getDefaultCharset() {
return this.defaultCharset;
} }
@@ -105,106 +52,12 @@ public final class StringDecoder extends AbstractDataBufferDecoder<String> {
return (elementType.resolve() == String.class && super.canDecode(elementType, mimeType)); return (elementType.resolve() == String.class && super.canDecode(elementType, mimeType));
} }
@Override
public Flux<String> decode(Publisher<DataBuffer> input, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
byte[][] delimiterBytes = getDelimiterBytes(mimeType);
LimitedDataBufferList chunks = new LimitedDataBufferList(getMaxInMemorySize());
DataBufferUtils.Matcher matcher = DataBufferUtils.matcher(delimiterBytes);
return Flux.from(input)
.concatMapIterable(buffer -> processDataBuffer(buffer, matcher, chunks))
.concatWith(Mono.defer(() -> {
if (chunks.isEmpty()) {
return Mono.empty();
}
DataBuffer lastBuffer = chunks.get(0).factory().join(chunks);
chunks.clear();
return Mono.just(lastBuffer);
}))
.doFinally(signalType -> chunks.releaseAndClear())
.doOnDiscard(DataBuffer.class, DataBufferUtils::release)
.map(buffer -> decode(buffer, elementType, mimeType, hints));
}
private byte[][] getDelimiterBytes(@Nullable MimeType mimeType) {
return this.delimitersCache.computeIfAbsent(getCharset(mimeType), charset -> {
byte[][] result = new byte[this.delimiters.size()][];
for (int i = 0; i < this.delimiters.size(); i++) {
result[i] = this.delimiters.get(i).getBytes(charset);
}
return result;
});
}
private Collection<DataBuffer> processDataBuffer(
DataBuffer buffer, DataBufferUtils.Matcher matcher, LimitedDataBufferList chunks) {
boolean release = true;
try {
List<DataBuffer> result = null;
do {
int endIndex = matcher.match(buffer);
if (endIndex == -1) {
chunks.add(buffer);
release = false;
break;
}
DataBuffer split = buffer.split(endIndex + 1);
if (result == null) {
result = new ArrayList<>();
}
int delimiterLength = matcher.delimiter().length;
if (chunks.isEmpty()) {
if (this.stripDelimiter) {
split.writePosition(split.writePosition() - delimiterLength);
}
result.add(split);
}
else {
chunks.add(split);
DataBuffer joined = buffer.factory().join(chunks);
if (this.stripDelimiter) {
joined.writePosition(joined.writePosition() - delimiterLength);
}
result.add(joined);
chunks.clear();
}
}
while (buffer.readableByteCount() > 0);
return (result != null ? result : Collections.emptyList());
}
finally {
if (release) {
DataBufferUtils.release(buffer);
}
}
}
@Override @Override
public String decode(DataBuffer dataBuffer, ResolvableType elementType, protected String decodeInternal(DataBuffer dataBuffer, Charset charset) {
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) { return dataBuffer.toString(charset);
Charset charset = getCharset(mimeType);
String value = dataBuffer.toString(charset);
DataBufferUtils.release(dataBuffer);
LogFormatUtils.traceDebug(logger, traceOn -> {
String formatted = LogFormatUtils.formatValue(value, !traceOn);
return Hints.getLogPrefix(hints) + "Decoded " + formatted;
});
return value;
} }
private Charset getCharset(@Nullable MimeType mimeType) {
if (mimeType != null && mimeType.getCharset() != null) {
return mimeType.getCharset();
}
else {
return getDefaultCharset();
}
}
/** /**
* Create a {@code StringDecoder} for {@code "text/plain"}. * Create a {@code StringDecoder} for {@code "text/plain"}.

120
spring-core/src/test/java/org/springframework/core/codec/CharBufferDecoderTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.core.codec;
import java.nio.CharBuffer; import java.nio.CharBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@@ -41,9 +42,8 @@ import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Unit tests for {@link CharBufferDecoder}. * Unit tests for {@link CharBufferDecoder}.
* *
* @author Sebastien Deleuze * @author Markus Heiden
* @author Brian Clozel * @author Arjen Poutsma
* @author Mark Paluch
*/ */
class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> { class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
@@ -71,14 +71,7 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
CharBuffer e = charBuffer("é"); CharBuffer e = charBuffer("é");
CharBuffer o = charBuffer("ø"); CharBuffer o = charBuffer("ø");
String s = String.format("%s\n%s\n%s", u, e, o); String s = String.format("%s\n%s\n%s", u, e, o);
Flux<DataBuffer> input = buffers(s, 1, UTF_8); Flux<DataBuffer> input = toDataBuffers(s, 1, UTF_8);
// TODO: temporarily replace testDecodeAll with explicit decode/cancel/empty
// see https://github.com/reactor/reactor-core/issues/2041
// testDecode(input, TYPE, step -> step.expectNext(u, e, o).verifyComplete(), null, null);
// testDecodeCancel(input, TYPE, null, null);
// testDecodeEmpty(TYPE, null, null);
testDecodeAll(input, TYPE, step -> step.expectNext(u, e, o).verifyComplete(), null, null); testDecodeAll(input, TYPE, step -> step.expectNext(u, e, o).verifyComplete(), null, null);
} }
@@ -89,33 +82,38 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
CharBuffer e = charBuffer("é"); CharBuffer e = charBuffer("é");
CharBuffer o = charBuffer("ø"); CharBuffer o = charBuffer("ø");
String s = String.format("%s\n%s\n%s", u, e, o); String s = String.format("%s\n%s\n%s", u, e, o);
Flux<DataBuffer> source = buffers(s, 2, UTF_16BE); Flux<DataBuffer> source = toDataBuffers(s, 2, UTF_16BE);
MimeType mimeType = MimeTypeUtils.parseMimeType("text/plain;charset=utf-16be"); MimeType mimeType = MimeTypeUtils.parseMimeType("text/plain;charset=utf-16be");
testDecode(source, TYPE, step -> step.expectNext(u, e, o).verifyComplete(), mimeType, null); testDecode(source, TYPE, step -> step.expectNext(u, e, o).verifyComplete(), mimeType, null);
} }
private Flux<DataBuffer> buffers(String s, int length, Charset charset) { private Flux<DataBuffer> toDataBuffers(String s, int length, Charset charset) {
byte[] bytes = s.getBytes(charset); byte[] bytes = s.getBytes(charset);
List<byte[]> chunks = new ArrayList<>(); List<byte[]> chunks = new ArrayList<>();
for (int i = 0; i < bytes.length; i += length) { for (int i = 0; i < bytes.length; i += length) {
chunks.add(Arrays.copyOfRange(bytes, i, i + length)); chunks.add(Arrays.copyOfRange(bytes, i, i + length));
} }
return Flux.fromIterable(chunks) return Flux.fromIterable(chunks)
.map(this::buffer); .map(chunk -> {
DataBuffer dataBuffer = this.bufferFactory.allocateBuffer(length);
dataBuffer.write(chunk, 0, chunk.length);
return dataBuffer;
});
} }
@Test @Test
void decodeNewLine() { void decodeNewLine() {
Flux<DataBuffer> input = buffers( Flux<DataBuffer> input = Flux.just(
"\r\nabc\n", stringBuffer("\r\nabc\n"),
"def", stringBuffer("def"),
"ghi\r\n\n", stringBuffer("ghi\r\n\n"),
"jkl", stringBuffer("jkl"),
"mno\npqr\n", stringBuffer("mno\npqr\n"),
"stu", stringBuffer("stu"),
"vw", stringBuffer("vw"),
"xyz"); stringBuffer("xyz")
);
testDecode(input, CharBuffer.class, step -> step testDecode(input, CharBuffer.class, step -> step
.expectNext(charBuffer("")).as("1st") .expectNext(charBuffer("")).as("1st")
@@ -130,11 +128,12 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
} }
@Test @Test
void decodeNewlinesAcrossBuffers() { void decodeNewlinesAcrossBuffers() {
Flux<DataBuffer> input = buffers( Flux<DataBuffer> input = Flux.just(
"\r", stringBuffer("\r"),
"\n", stringBuffer("\n"),
"xyz"); stringBuffer("xyz")
);
testDecode(input, CharBuffer.class, step -> step testDecode(input, CharBuffer.class, step -> step
.expectNext(charBuffer("")) .expectNext(charBuffer(""))
@@ -145,9 +144,9 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
@Test @Test
void maxInMemoryLimit() { void maxInMemoryLimit() {
Flux<DataBuffer> input = buffers( Flux<DataBuffer> input = Flux.just(
"abc\n", "defg\n", stringBuffer("abc\n"), stringBuffer("defg\n"),
"hi", "jkl", "mnop"); stringBuffer("hi"), stringBuffer("jkl"), stringBuffer("mnop"));
this.decoder.setMaxInMemorySize(5); this.decoder.setMaxInMemorySize(5);
@@ -159,8 +158,8 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
@Test @Test
void maxInMemoryLimitDoesNotApplyToParsedItemsThatDontRequireBuffering() { void maxInMemoryLimitDoesNotApplyToParsedItemsThatDontRequireBuffering() {
Flux<DataBuffer> input = buffers( Flux<DataBuffer> input = Flux.just(
"TOO MUCH DATA\nanother line\n\nand another\n"); stringBuffer("TOO MUCH DATA\nanother line\n\nand another\n"));
this.decoder.setMaxInMemorySize(5); this.decoder.setMaxInMemorySize(5);
@@ -176,10 +175,9 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
@Test @Test
// gh-24339 // gh-24339
void maxInMemoryLimitReleaseUnprocessedLinesWhenUnlimited() { void maxInMemoryLimitReleaseUnprocessedLinesWhenUnlimited() {
Flux<DataBuffer> input = buffers("Line 1\nLine 2\nLine 3\n"); Flux<DataBuffer> input = Flux.just(stringBuffer("Line 1\nLine 2\nLine 3\n"));
this.decoder.setMaxInMemorySize(-1); this.decoder.setMaxInMemorySize(-1);
testDecodeCancel(input, ResolvableType.forClass(String.class), null, Collections.emptyMap()); testDecodeCancel(input, ResolvableType.forClass(String.class), null, Collections.emptyMap());
} }
@@ -187,15 +185,16 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
void decodeNewLineIncludeDelimiters() { void decodeNewLineIncludeDelimiters() {
this.decoder = CharBufferDecoder.allMimeTypes(CharBufferDecoder.DEFAULT_DELIMITERS, false); this.decoder = CharBufferDecoder.allMimeTypes(CharBufferDecoder.DEFAULT_DELIMITERS, false);
Flux<DataBuffer> input = buffers( Flux<DataBuffer> input = Flux.just(
"\r\nabc\n", stringBuffer("\r\nabc\n"),
"def", stringBuffer("def"),
"ghi\r\n\n", stringBuffer("ghi\r\n\n"),
"jkl", stringBuffer("jkl"),
"mno\npqr\n", stringBuffer("mno\npqr\n"),
"stu", stringBuffer("stu"),
"vw", stringBuffer("vw"),
"xyz"); stringBuffer("xyz")
);
testDecode(input, CharBuffer.class, step -> step testDecode(input, CharBuffer.class, step -> step
.expectNext(charBuffer("\r\n")) .expectNext(charBuffer("\r\n"))
@@ -220,9 +219,9 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
@Test @Test
void decodeEmptyDataBuffer() { void decodeEmptyDataBuffer() {
Flux<DataBuffer> input = buffers(""); Flux<DataBuffer> input = Flux.just(stringBuffer(""));
Flux<CharBuffer> output = this.decoder.decode(input,
Flux<CharBuffer> output = this.decoder.decode(input, TYPE, null, Collections.emptyMap()); TYPE, null, Collections.emptyMap());
StepVerifier.create(output) StepVerifier.create(output)
.expectNext(charBuffer("")) .expectNext(charBuffer(""))
@@ -232,10 +231,10 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
@Override @Override
@Test @Test
public void decodeToMono() { public void decodeToMono() {
Flux<DataBuffer> input = buffers( Flux<DataBuffer> input = Flux.just(
"foo", stringBuffer("foo"),
"bar", stringBuffer("bar"),
"baz"); stringBuffer("baz"));
testDecodeToMonoAll(input, CharBuffer.class, step -> step testDecodeToMonoAll(input, CharBuffer.class, step -> step
.expectNext(charBuffer("foobarbaz")) .expectNext(charBuffer("foobarbaz"))
@@ -245,24 +244,17 @@ class CharBufferDecoderTests extends AbstractDecoderTests<CharBufferDecoder> {
@Test @Test
void decodeToMonoWithEmptyFlux() { void decodeToMonoWithEmptyFlux() {
Flux<DataBuffer> input = buffers(); Flux<DataBuffer> input = Flux.empty();
testDecodeToMono(input, String.class, step -> step testDecodeToMono(input, String.class, step -> step
.expectComplete() .expectComplete()
.verify()); .verify());
} }
private Flux<DataBuffer> buffers(String... value) { private DataBuffer stringBuffer(String value) {
return Flux.just(value).map(this::buffer); byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
} DataBuffer buffer = this.bufferFactory.allocateBuffer(bytes.length);
buffer.write(bytes);
private DataBuffer buffer(String value) {
return buffer(value.getBytes(UTF_8));
}
private DataBuffer buffer(byte[] value) {
DataBuffer buffer = this.bufferFactory.allocateBuffer(value.length);
buffer.write(value);
return buffer; return buffer;
} }