Clean up Improved(Input|Output)Stream

Two main changes:

- Replaced getClass().getSimpleName() in the logs with a constructor-given name. Right now what we have is a lot of identical classes with slightly different names so that the logs would be different. With this change - we can later get rid of a lot of these classes and replace them with simple wrappers.

- Removed the "expected" feature. Only Tar uses it - and it can override onClose to do that (that's what it's there for!)

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=202129563
This commit is contained in:
guyben 2018-06-26 08:05:47 -07:00 committed by Ben McIlwain
parent 07aead3ca4
commit 3550045636
8 changed files with 34 additions and 37 deletions

View file

@ -246,7 +246,7 @@ public final class Ghostryde {
private final DateTime modified;
Input(@WillCloseWhenClosed InputStream input, String name, DateTime modified) {
super(input);
super("Input", input);
this.name = checkNotNull(name, "name");
this.modified = checkNotNull(modified, "modified");
}
@ -273,7 +273,7 @@ public final class Ghostryde {
@NotThreadSafe
public static final class Output extends ImprovedOutputStream {
Output(@WillCloseWhenClosed OutputStream os) {
super(os);
super("Output", os);
}
}
@ -287,7 +287,7 @@ public final class Ghostryde {
@NotThreadSafe
public static final class Encryptor extends ImprovedOutputStream {
Encryptor(@WillCloseWhenClosed OutputStream os) {
super(os);
super("Encryptor", os);
}
}
@ -303,7 +303,7 @@ public final class Ghostryde {
private final PGPPublicKeyEncryptedData crypt;
Decryptor(@WillCloseWhenClosed InputStream input, PGPPublicKeyEncryptedData crypt) {
super(input);
super("Decryptor", input);
this.crypt = checkNotNull(crypt, "crypt");
}
@ -340,7 +340,7 @@ public final class Ghostryde {
@NotThreadSafe
public static final class Compressor extends ImprovedOutputStream {
Compressor(@WillCloseWhenClosed OutputStream os) {
super(os);
super("Compressor", os);
}
}
@ -354,7 +354,7 @@ public final class Ghostryde {
@NotThreadSafe
public static final class Decompressor extends ImprovedInputStream {
Decompressor(@WillCloseWhenClosed InputStream input) {
super(input);
super("Decompressor", input);
}
}