admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use concatWith instead of mergeWith

Browse Source
This commit is contained in:
Arjen Poutsma
2018-09-11 13:24:41 +02:00
parent 1a0522b805
commit 09af706af6
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class FormHttpMessageReaderTests extends AbstractDataBufferAllocatingTest
public void readFormError() {
DataBuffer fooBuffer = stringBuffer("name=value");
Flux<DataBuffer> body =
Flux.just(fooBuffer).mergeWith(Flux.error(new RuntimeException()));
Flux.just(fooBuffer).concatWith(Flux.error(new RuntimeException()));
MockServerHttpRequest request = request(body);
Flux<MultiValueMap<String, String>> result = this.reader.read(null, request, null);
spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
+1 -1
View File
@@ -176,7 +176,7 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractDataBufferAll
Flux<DataBuffer> body =
Flux.just(stringBuffer("data:foo\ndata:bar\n\ndata:baz\n\n"))
.mergeWith(Flux.error(new RuntimeException()));
.concatWith(Flux.error(new RuntimeException()));
MockServerHttpRequest request = MockServerHttpRequest.post("/")
.body(body);