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

Revert "Remove mandatory dependency on Reactor Stream"

Browse Source 
This reverts commit d5e6f70483d4a6c8af3cc5e97e52a54e98199169.
This commit is contained in:
Rossen Stoyanchev
2016-01-07 15:23:55 -05:00
parent 318092cfd0
commit c3a8bf4d17
3 changed files with 11 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web-reactive/src/main/java/org/springframework/util/ByteBufferPublisherInputStream.java
View File

@@ -19,13 +19,11 @@ package org.springframework.util;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscription;
import org.springframework.reactor.rx.subscriber.BlockingQueueSubscriber;
import reactor.rx.Streams;
/**
* {@code InputStream} implementation based on a byte array {@link Publisher}.
@@ -62,7 +60,7 @@ public class ByteBufferPublisherInputStream extends InputStream {
public ByteBufferPublisherInputStream(Publisher<ByteBuffer> publisher, int requestSize) {
Assert.notNull(publisher, "'publisher' must not be null");
this.queue = new BlockingQueueSubscriber<>(publisher, null, new ArrayBlockingQueue<>(requestSize), false, requestSize);
this.queue = Streams.from(publisher).toBlockingQueue(requestSize);
}