diff --git a/spring-web-reactive/src/main/java/org/springframework/util/BufferOutputStream.java b/spring-web-reactive/src/main/java/org/springframework/util/BufferOutputStream.java deleted file mode 100644 index 8f826f67c6..0000000000 --- a/spring-web-reactive/src/main/java/org/springframework/util/BufferOutputStream.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2002-2015 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 - * - * http://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.util; - -import java.io.IOException; -import java.io.OutputStream; - -import reactor.io.buffer.Buffer; - -/** - * Simple extension of {@link OutputStream} that uses {@link Buffer} to stream - * the content - * - * @author Sebastien Deleuze - */ -public class BufferOutputStream extends OutputStream { - - private Buffer buffer; - - public BufferOutputStream(Buffer buffer) { - this.buffer = buffer; - } - - @Override - public void write(int b) throws IOException { - buffer.append(b); - } - - @Override - public void write(byte[] bytes, int off, int len) - throws IOException { - buffer.append(bytes, off, len); - } - - public Buffer getBuffer() { - return buffer; - } - -} diff --git a/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferInputStream.java b/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferInputStream.java deleted file mode 100644 index b3a4945117..0000000000 --- a/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferInputStream.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2015 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 - * - * http://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.util; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.ByteBuffer; - -/** - * Simple {@link InputStream} implementation that exposes currently - * available content of a {@link ByteBuffer}. - * - * From Jackson ByteBufferBackedInputStream - */ -public class ByteBufferInputStream extends InputStream { - - protected final ByteBuffer b; - - public ByteBufferInputStream(ByteBuffer buf) { - b = buf; - } - - @Override - public int available() { - return b.remaining(); - } - - @Override - public int read() throws IOException { - return b.hasRemaining() ? (b.get() & 0xFF) : -1; - } - - @Override - public int read(byte[] bytes, int off, int len) throws IOException { - if (!b.hasRemaining()) return -1; - len = Math.min(len, b.remaining()); - b.get(bytes, off, len); - return len; - } - -} diff --git a/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferPublisherInputStream.java b/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferPublisherInputStream.java deleted file mode 100644 index abc1df3c44..0000000000 --- a/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferPublisherInputStream.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright 2002-2015 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 - * - * http://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.util; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.ByteBuffer; -import java.util.concurrent.BlockingQueue; - -import org.reactivestreams.Publisher; -import org.reactivestreams.Subscription; -import reactor.rx.Stream; - -/** - * {@code InputStream} implementation based on a byte array {@link Publisher}. - * - * @author Arjen Poutsma - * @author Sebastien Deleuze - * @author Stephane Maldini - */ -public class ByteBufferPublisherInputStream extends InputStream { - - private final BlockingQueue queue; - - private ByteBufferInputStream currentStream; - - private boolean completed; - - - /** - * Creates a new {@code ByteArrayPublisherInputStream} based on the given publisher. - * - * @param publisher the publisher to use - */ - public ByteBufferPublisherInputStream(Publisher publisher) { - this(publisher, 1); - } - - /** - * Creates a new {@code ByteArrayPublisherInputStream} based on the given publisher. - * - * @param publisher the publisher to use - * @param requestSize the {@linkplain Subscription#request(long) request size} to use - * on the publisher bound to Integer MAX - */ - public ByteBufferPublisherInputStream(Publisher publisher, int requestSize) { - Assert.notNull(publisher, "'publisher' must not be null"); - - // TODO Avoid using Reactor Stream, it should not be a mandatory dependency of Spring Reactive - this.queue = Stream.from(publisher).toBlockingQueue(requestSize); - } - - - @Override - public int available() throws IOException { - if (completed) { - return 0; - } - InputStream is = currentStream(); - return is != null ? is.available() : 0; - } - - @Override - public int read() throws IOException { - if (completed) { - return -1; - } - InputStream is = currentStream(); - while (is != null) { - int ch = is.read(); - if (ch != -1) { - return ch; - } - else { - is = currentStream(); - } - } - return -1; - } - - @Override - public int read(byte[] b, int off, int len) throws IOException { - if (completed) { - return -1; - } - InputStream is = currentStream(); - if (is == null) { - return -1; - } - else if (b == null) { - throw new NullPointerException(); - } - else if (off < 0 || len < 0 || len > b.length - off) { - throw new IndexOutOfBoundsException(); - } - else if (len == 0) { - return 0; - } - do { - int n = is.read(b, off, len); - if (n > 0) { - return n; - } - else { - is = currentStream(); - } - } - while (is != null); - - return -1; - } - - private InputStream currentStream() throws IOException { - try { - if (this.currentStream != null && this.currentStream.available() > 0) { - return this.currentStream; - } else { - // take() blocks until next or complete() then return null, - // but that's OK since this is a *blocking* InputStream - ByteBuffer signal = this.queue.take(); - if(signal == null){ - this.completed = true; - return null; - } - this.currentStream = new ByteBufferInputStream(signal); - return this.currentStream; - } - } - catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } - catch (Throwable error ){ - this.completed = true; - throw new IOException(error); - } - throw new IOException(); - } - -} diff --git a/spring-web-reactive/src/main/java/org/springframework/util/package-info.java b/spring-web-reactive/src/main/java/org/springframework/util/package-info.java deleted file mode 100644 index 8c69995741..0000000000 --- a/spring-web-reactive/src/main/java/org/springframework/util/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2002-2016 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 - * - * http://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. - */ - -/** - * Miscellaneous utility classes, such as {@code InputStream}/{@code OutputStream} manipulation utilities. - */ -package org.springframework.util;