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

Use concatWith instead of mergeWith

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/test/java/org/springframework/core/codec/ByteArrayDecoderTests.java
View File

@ -69,7 +69,7 @@ public class ByteArrayDecoderTests extends AbstractDataBufferAllocatingTestCase
public void decodeError() {
DataBuffer fooBuffer = stringBuffer("foo");
Flux<DataBuffer> source =
Flux.just(fooBuffer).mergeWith(Flux.error(new RuntimeException()));
Flux.just(fooBuffer).concatWith(Flux.error(new RuntimeException()));
Flux<byte[]> output = this.decoder.decode(source,
ResolvableType.forClassWithGenerics(Publisher.class, byte[].class),
null, Collections.emptyMap());

2
spring-core/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java
View File

@ -68,7 +68,7 @@ public class ByteBufferDecoderTests extends AbstractDataBufferAllocatingTestCase
public void decodeError() {
DataBuffer fooBuffer = stringBuffer("foo");
Flux<DataBuffer> source =
Flux.just(fooBuffer).mergeWith(Flux.error(new RuntimeException()));
Flux.just(fooBuffer).concatWith(Flux.error(new RuntimeException()));
Flux<ByteBuffer> output = this.decoder.decode(source,
ResolvableType.forClassWithGenerics(Publisher.class, ByteBuffer.class),
null, Collections.emptyMap());

2
spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java
View File

@ -77,7 +77,7 @@ public class ResourceDecoderTests extends AbstractDataBufferAllocatingTestCase {
public void decodeError() {
DataBuffer fooBuffer = stringBuffer("foo");
Flux<DataBuffer> source =
Flux.just(fooBuffer).mergeWith(Flux.error(new RuntimeException()));
Flux.just(fooBuffer).concatWith(Flux.error(new RuntimeException()));
Flux<Resource> result = this.decoder

2
spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java
View File

@ -177,7 +177,7 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
public void decodeError() {
DataBuffer fooBuffer = stringBuffer("foo\n");
Flux<DataBuffer> source =
Flux.just(fooBuffer).mergeWith(Flux.error(new RuntimeException()));
Flux.just(fooBuffer).concatWith(Flux.error(new RuntimeException()));
Flux<String> output = this.decoder.decode(source,
ResolvableType.forClass(String.class), null, Collections.emptyMap());

2
spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java
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);

2
spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
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);