root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression in AbstractJackson2Encoder 

Closes gh-29274
This commit is contained in:
rstoyanchev 2022-10-07 18:05:35 +01:00
parent b3afafbf5a
commit 1afc1fc90d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
View File

@ -198,6 +198,7 @@ public abstract class AbstractJackson2Encoder extends Jackson2CodecSupport imple
bufferFactory.join(Arrays.asList(bufferFactory.wrap(prefix), dataBuffer)) : bufferFactory.join(Arrays.asList(bufferFactory.wrap(prefix), dataBuffer)) :
dataBuffer); dataBuffer);
}) })
.switchIfEmpty(Mono.fromCallable(() -> bufferFactory.wrap(helper.getPrefix())))
.concatWith(Mono.fromCallable(() -> bufferFactory.wrap(helper.getSuffix()))); .concatWith(Mono.fromCallable(() -> bufferFactory.wrap(helper.getSuffix())));
} }

8
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java
View File

@ -144,6 +144,14 @@ public class Jackson2JsonEncoderTests extends AbstractEncoderTests<Jackson2JsonE
.verifyComplete()); .verifyComplete());
} }
@Test
public void encodeNonStreamEmpty() {
testEncode(Flux.empty(), Pojo.class, step -> step
.consumeNextWith(expectString("["))
.consumeNextWith(expectString("]"))
.verifyComplete());
}
@Test // gh-29038 @Test // gh-29038
void encodeNonStreamWithErrorAsFirstSignal() { void encodeNonStreamWithErrorAsFirstSignal() {
String message = "I'm a teapot"; String message = "I'm a teapot";