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

Add tests for DataBlockInputStream and fix implementation oddities

Browse Source 
Fix issues with `DataBlockInputStream` including the fact that remain
bytes were not tracked correctly. Also add some tests and fix a few
other unusual details with the implementation.

Closes gh-38066
This commit is contained in:
Phillip Webb
2023-10-26 22:26:14 -07:00
parent 4af9ed4d1d
commit beb49e1933
4 changed files with 156 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/zip/DataBlock.java
View File

@@ -73,8 +73,9 @@ public interface DataBlock {
/**
* Return this {@link DataBlock} as an {@link InputStream}.
* @return an {@link InputStream} to read the data block content
* @throws IOException on IO error
*/
default InputStream asInputStream() {
default InputStream asInputStream() throws IOException {
return new DataBlockInputStream(this);
}

38
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/zip/DataBlockInputStream.java
View File

@@ -20,7 +20,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.zip.ZipException;
/**
* {@link InputStream} backed by a {@link DataBlock}.
@@ -35,10 +34,11 @@ class DataBlockInputStream extends InputStream {
private long remaining;
private volatile boolean closing;
private volatile boolean closed;
DataBlockInputStream(DataBlock dataBlock) {
DataBlockInputStream(DataBlock dataBlock) throws IOException {
this.dataBlock = dataBlock;
this.remaining = dataBlock.size();
}
@Override
@@ -49,7 +49,6 @@ class DataBlockInputStream extends InputStream {
@Override
public int read(byte[] b, int off, int len) throws IOException {
int result;
ensureOpen();
ByteBuffer dst = ByteBuffer.wrap(b, off, len);
int count = this.dataBlock.read(dst, this.pos);
@@ -57,23 +56,15 @@ class DataBlockInputStream extends InputStream {
this.pos += count;
this.remaining -= count;
}
result = count;
if (this.remaining == 0) {
close();
}
return result;
return count;
}
@Override
public long skip(long n) throws IOException {
long result;
result = (n > 0) ? maxForwardSkip(n) : maxBackwardSkip(n);
this.pos += result;
this.remaining -= result;
if (this.remaining == 0) {
close();
}
return result;
long count = (n > 0) ? maxForwardSkip(n) : maxBackwardSkip(n);
this.pos += count;
this.remaining -= count;
return count;
}
private long maxForwardSkip(long n) {
@@ -87,21 +78,24 @@ class DataBlockInputStream extends InputStream {
@Override
public int available() {
if (this.closed) {
return 0;
}
return (this.remaining < Integer.MAX_VALUE) ? (int) this.remaining : Integer.MAX_VALUE;
}
private void ensureOpen() throws ZipException {
if (this.closing) {
throw new ZipException("InputStream closed");
private void ensureOpen() throws IOException {
if (this.closed) {
throw new IOException("InputStream closed");
}
}
@Override
public void close() throws IOException {
if (this.closing) {
if (this.closed) {
return;
}
this.closing = true;
this.closed = true;
if (this.dataBlock instanceof Closeable closeable) {
closeable.close();
}