-
Notifications
You must be signed in to change notification settings - Fork 671
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[IO-427] Add TrailerInputStream #497
base: master
Are you sure you want to change the base?
Changes from 2 commits
14639d2
59d74a3
edc394e
7c5cbb3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,168 @@ | ||
/* | ||
* 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.apache.commons.io.input; | ||
|
||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import org.apache.commons.io.IOUtils; | ||
|
||
/** | ||
* Reads the underlying input stream while holding back the trailer. | ||
* | ||
* <p> | ||
* "Normal" read calls read the underlying stream except the last few bytes (the trailer). The | ||
* trailer is updated with each read call. The trailer can be gotten by one of the copyTrailer | ||
* overloads. | ||
* </p> | ||
* | ||
* <p> | ||
* It is safe to fetch the trailer at any time but the trailer will change with each read call | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That seems wonky. I'd almost prefer iot to throw IllegalStateException unitl it has the real trailer |
||
* until the underlying stream is EOF. | ||
* </p> | ||
* | ||
* <p> | ||
* Useful, e.g., for handling checksums: payload is followed by a fixed size hash, so while | ||
* streaming the payload the trailer finally contains the expected hash (this example needs | ||
* extra caution to revert actions when the final checksum match fails). | ||
* </p> | ||
*/ | ||
public final class TrailerInputStream extends InputStream { | ||
|
||
private final InputStream source; | ||
sebbASF marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/** | ||
* Invariant: After every method call which exited without exception, the trailer has to be | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. has to be --> is |
||
* completely filled. | ||
*/ | ||
private final byte[] trailer; | ||
|
||
/** | ||
* Constructs the TrailerInputStream and initializes the trailer buffer. | ||
* | ||
* <p> | ||
* Reads exactly {@code trailerLength} bytes from {@code source}. | ||
* </p> | ||
* | ||
* @param source underlying stream from which is read. | ||
* @param trailerLength the length of the trailer which is hold back (must be >= 0). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. held back |
||
* @throws IOException initializing the trailer buffer failed. | ||
*/ | ||
public TrailerInputStream(final InputStream source, final int trailerLength) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use the Builder pattern to avoid constructor creep. For example There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What should be the default value of There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Personally I prefer constructors, especially when as here there's exactly one constructor. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There does not need to be a default if none makes sense, an exception can be thrown at build time or in the private ctor for nonsensical values. If experience has taught us anything here, it's that there will be constructor creep in the future, so please use a builder. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IMHO builders are vastly overused. They're not native to Java's design, and constructors are more natural. There's a place for builders, but they shouldn't be the default. |
||
throws IOException { | ||
if (trailerLength < 0) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't see the point of allowing a zero-length trailer Also, it probably make sense to have an upper limit. |
||
throw new IllegalArgumentException("Trailer length must be >= 0: " + trailerLength); | ||
} | ||
this.source = source; | ||
this.trailer = trailerLength == 0 ? IOUtils.EMPTY_BYTE_ARRAY : new byte[trailerLength]; | ||
IOUtils.readFully(this.source, this.trailer); | ||
} | ||
|
||
@Override | ||
public int read() throws IOException { | ||
// Does exactly on source read call. | ||
// Copies this.trailer.length bytes if source is not EOF. | ||
final int newByte = this.source.read(); | ||
if (newByte == IOUtils.EOF || this.trailer.length == 0) { | ||
return newByte; | ||
} | ||
final int ret = this.trailer[0]; | ||
System.arraycopy(this.trailer, 1, this.trailer, 0, this.trailer.length - 1); | ||
this.trailer[this.trailer.length - 1] = (byte) newByte; | ||
return ret; | ||
} | ||
|
||
@Override | ||
public int read(final byte[] b, final int off, final int len) throws IOException { | ||
// Does at most 2 IOUtils.read calls to source. | ||
// Copies at most 2 * this.trailer.length bytes. | ||
// All other bytes are directly written to the target buffer. | ||
if (off < 0 || len < 0 || b.length - off < len) { | ||
throw new IndexOutOfBoundsException(); | ||
} | ||
if (len == 0) { | ||
return 0; | ||
} | ||
final int readIntoBuffer; | ||
int read; | ||
// fist step: move trailer + read data | ||
// overview - b: [---------], t: [1234] --> b: [1234abcde], t: [fghi] | ||
if (len <= this.trailer.length) { | ||
// 1 IOUtils.read calls to source, copies this.trailer.length bytes | ||
// trailer can fill b, so only read into trailer needed | ||
// b: [----], trailer: [123456789] --> b: [1234], trailer: [----56789] | ||
System.arraycopy(this.trailer, 0, b, off, len); | ||
readIntoBuffer = len; | ||
// b: [1234], trailer: [----56789] --> b: [1234], trailer: [56789----] | ||
System.arraycopy(this.trailer, len, this.trailer, 0, this.trailer.length - len); | ||
// b: [1234], trailer: [56789----] --> b: [1234], trailer: [56789abcd] | ||
read = IOUtils.read(this.source, this.trailer, this.trailer.length - len, len); | ||
} else { | ||
// 1 or 2 IOUtils.read calls to source, copies this.trailer.length bytes | ||
// trailer smaller than b, so need to read into b and trailer | ||
// b: [---------], t: [1234] --> b: [1234-----], t: [----] | ||
System.arraycopy(this.trailer, 0, b, off, this.trailer.length); | ||
// b: [1234-----], t: [----] --> b: [1234abcde], t: [----] | ||
read = IOUtils.read( | ||
this.source, b, off + this.trailer.length, len - this.trailer.length); | ||
readIntoBuffer = this.trailer.length + read; | ||
// b: [1234abcde], t: [----] --> b: [1234abcde], t: [fghi] | ||
if (read == len - this.trailer.length) { // don't try reading data when stream source EOF | ||
read += IOUtils.read(this.source, this.trailer); | ||
} | ||
} | ||
// if less data than requested has been read, the trailer buffer is not full | ||
// --> need to fill the trailer with the last bytes from b | ||
// (only possible if we reached EOF) | ||
// second step: ensure that trailer is completely filled with data | ||
// overview - b: [abcdefghi], t: [jk--] --> b: [abcdefg--], t: [hijk] | ||
final int underflow = Math.min(len - read, this.trailer.length); | ||
if (underflow > 0) { | ||
// at most this.trailer.length are copied to fill the trailer buffer | ||
if (underflow < this.trailer.length) { | ||
// trailer not completely empty, so move data to the end | ||
// b: [abcdefghi], t: [jk--] --> b: [abcdefghi], t: [--jk] | ||
System.arraycopy( | ||
this.trailer, 0, this.trailer, underflow, this.trailer.length - underflow); | ||
} | ||
// fill trailer with last bytes from b | ||
// b: [abcdefghi], t: [--jk] --> b: [abcdefg--], t: [hijk] | ||
System.arraycopy(b, off + readIntoBuffer - underflow, this.trailer, 0, underflow); | ||
} | ||
// IOUtils.read reads as many bytes as possible, so reading 0 bytes means EOF. | ||
// Then, we have to mark this. | ||
return read == 0 && len != 0 ? IOUtils.EOF : read; | ||
} | ||
|
||
@Override | ||
public int available() throws IOException { | ||
return this.source.available(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. shouldn't this subtract the bytes in the trailer? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The trailer is filled in the constructor. So every single byte read after the constructor finished causes exactly one byte to return to the caller of the |
||
} | ||
|
||
@Override | ||
public void close() throws IOException { | ||
try { | ||
this.source.close(); | ||
} finally { | ||
super.close(); | ||
} | ||
} | ||
|
||
public int getTrailerLength() { | ||
return this.trailer.length; | ||
} | ||
|
||
public byte[] copyTrailer() { | ||
sebbASF marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. copyTrailer --> getTrailer |
||
return this.trailer.clone(); | ||
} | ||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getTrailer