zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-12 22:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Clean up Improved(Input|Output)Stream

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

18
java/google/registry/util/ImprovedInputStream.java
View file

@ -14,7 +14,6 @@
package google.registry.util;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.flogger.FluentLogger;
@ -47,18 +46,17 @@ public class ImprovedInputStream extends FilterInputStream {
private long count;
private long mark = -1;
private final long expected;
private final boolean shouldClose;
private final String name;
public ImprovedInputStream(@WillCloseWhenClosed InputStream out) {
this(out, true, -1);
public ImprovedInputStream(String name, @WillCloseWhenClosed InputStream out) {
this(name, out, true);
}
public ImprovedInputStream(InputStream in, boolean shouldClose, long expected) {
public ImprovedInputStream(String name, InputStream in, boolean shouldClose) {
super(checkNotNull(in, "in"));
checkArgument(expected >= -1, "expected >= 0 or -1");
this.shouldClose = shouldClose;
this.expected = expected;
this.name = name;
}
@Override
@ -126,16 +124,12 @@ public class ImprovedInputStream extends FilterInputStream {
if (in == null) {
return;
}
logger.atInfo().log("%s closed with %,d bytes read", getClass().getSimpleName(), count);
if (expected != -1 && count != expected) {
throw new IOException(String.format("%s expected %,d bytes but read %,d bytes",
getClass().getCanonicalName(), expected, count));
}
onClose();
if (shouldClose) {
in.close();
}
in = null;
logger.atInfo().log("%s closed with %,d bytes read", name, count);
}
/**