IO: Rename these fields to follow conventions.

Makes the code clearer IMO.

Author: e3ndr

io/src/main/java/co/casterlabs/commons/io/bytes/reading/_AsInputStream.java

@@ -8,12 +8,12 @@
 
 @AllArgsConstructor
 class _AsInputStream extends InputStream {
-    private final ByteReader reader;
+    private final ByteReader delegate;
 
     @Override
     public int read() throws IOException {
         try {
-            return this.reader.read();
+            return this.delegate.read();
         } catch (EndOfStreamException e) {
             return -1;
         }
@@ -22,7 +22,7 @@ public int read() throws IOException {
     @Override
     public int read(byte[] b, int off, int len) throws IOException {
         try {
-            this.reader.read(b, off, len);
+            this.delegate.read(b, off, len);
             return len;
         } catch (EndOfStreamException e) {
             return -1;

io/src/main/java/co/casterlabs/commons/io/bytes/writing/_AsOutputStream.java

@@ -7,21 +7,21 @@
 
 @AllArgsConstructor
 class _AsOutputStream extends OutputStream {
-    private final ByteWriter writer;
+    private final ByteWriter delegate;
 
     @Override
     public void write(int b) throws IOException {
-        this.writer.write(b);
+        this.delegate.write(b);
     }
 
     @Override
     public void write(byte[] b) throws IOException {
-        this.writer.write(b);
+        this.delegate.write(b);
     }
 
     @Override
     public void write(byte[] b, int off, int len) throws IOException {
-        this.writer.write(b, off, len);
+        this.delegate.write(b, off, len);
     }
 
 }

io/src/main/java/co/casterlabs/commons/io/streams/ForceFlushedOutputStream.java

@@ -21,49 +21,49 @@
  */
 @RequiredArgsConstructor
 public class ForceFlushedOutputStream extends OutputStream {
-    private final OutputStream wrap;
+    private final OutputStream underlying;
 
     /**
      * See: {@link OutputStream#write(int)}
      */
     @Override
     public void write(int b) throws IOException {
-        this.wrap.write(b);
-        this.wrap.flush();
+        this.underlying.write(b);
+        this.underlying.flush();
     }
 
     /**
      * See: {@link OutputStream#write(byte[])}
      */
     @Override
     public void write(byte[] b) throws IOException {
-        this.wrap.write(b);
-        this.wrap.flush();
+        this.underlying.write(b);
+        this.underlying.flush();
     }
 
     /**
      * See: {@link OutputStream#write(byte[], int, int)}
      */
     @Override
     public void write(byte[] b, int off, int len) throws IOException {
-        this.wrap.write(b, off, len);
-        this.wrap.flush();
+        this.underlying.write(b, off, len);
+        this.underlying.flush();
     }
 
     /**
      * See: {@link OutputStream#flush()}
      */
     @Override
     public void flush() throws IOException {
-        this.wrap.flush();
+        this.underlying.flush();
     }
 
     /**
      * See: {@link OutputStream#close()}
      */
     @Override
     public void close() throws IOException {
-        this.wrap.close();
+        this.underlying.close();
     }
 
 }

io/src/main/java/co/casterlabs/commons/io/streams/LimitedInputStream.java

@@ -24,7 +24,7 @@
  */
 @AllArgsConstructor
 public class LimitedInputStream extends InputStream {
-    private final InputStream in;
+    private final InputStream underlying;
     private long remaining;
 
     /**
@@ -41,7 +41,7 @@ public int read() throws IOException {
             return -1;
         }
         this.remaining--;
-        return this.in.read();
+        return this.underlying.read();
     }
 
     @Override
@@ -58,7 +58,7 @@ public int read(byte b[], int off, int len) throws IOException {
             len = (int) this.remaining;
         }
 
-        int read = this.in.read(b, off, len);
+        int read = this.underlying.read(b, off, len);
         this.remaining -= read;
         return read;
     }
@@ -77,7 +77,7 @@ public long skip(long n) throws IOException {
             n = this.remaining;
         }
 
-        long skipped = this.in.skip(n);
+        long skipped = this.underlying.skip(n);
         this.remaining -= skipped;
         return skipped;
     }
@@ -88,7 +88,7 @@ public int available() throws IOException {
             return -1;
         }
 
-        int available = this.in.available();
+        int available = this.underlying.available();
         if (available > this.remaining) {
             return (int) this.remaining;
         }

io/src/main/java/co/casterlabs/commons/io/streams/NonCloseableOutputStream.java

@@ -21,7 +21,7 @@
  */
 @RequiredArgsConstructor
 public class NonCloseableOutputStream extends OutputStream {
-    private final OutputStream out;
+    private final OutputStream underlying;
     private boolean isClosed;
 
     @Override
@@ -33,14 +33,14 @@ public void close() throws IOException {
     @Override
     public void write(int b) throws IOException {
         if (this.isClosed) throw new IOException("NCOutputStream is closed.");
-        this.out.write(b);
+        this.underlying.write(b);
     }
 
     @Override
     public void write(byte[] b, int off, int len) throws IOException {
         if (this.isClosed) throw new IOException("NCOutputStream is closed.");
         if (len == 0) return;
-        this.out.write(b, off, len);
+        this.underlying.write(b, off, len);
     }
 
 }

io/src/main/java/co/casterlabs/commons/io/streams/OverzealousInputStream.java

@@ -5,11 +5,13 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 
 /**
  * Basically we buffered too many bytes, so we need to give them back during a
  * read.
  */
+@RequiredArgsConstructor
 public class OverzealousInputStream extends InputStream {
     private final ReentrantLock lock = new ReentrantLock();
 
@@ -19,10 +21,6 @@ public class OverzealousInputStream extends InputStream {
     private int overageEnd = 0;
     private int overageIndex = 0;
 
-    public OverzealousInputStream(@NonNull InputStream underlying) {
-        this.underlying = underlying;
-    }
-
     private void ensureCapacity(int additionalSize) {
         int requiredCapacity = this.overageEnd - this.overageIndex + additionalSize;
         if (requiredCapacity > this.overage.length) {

io/src/main/java/co/casterlabs/commons/io/streams/PeekableInputStream.java

@@ -14,7 +14,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 
 /**
  * An InputStream wrapper that allows you to "peek" ahead at bytes without
@@ -24,16 +24,13 @@
  * 
  * @see {@link PeekableInputStream#peek(int)}
  */
+@RequiredArgsConstructor
 public class PeekableInputStream extends InputStream {
-    private final InputStream wrapped;
+    private final InputStream underlying;
 
     private byte[] currentBuffer = null;
     private int bufferPos = 0;
 
-    public PeekableInputStream(@NonNull InputStream toWrap) {
-        this.wrapped = toWrap;
-    }
-
     /**
      * @return if the stream is current buffering data as the result of a peek()
      *         operation.
@@ -87,7 +84,7 @@ public synchronized void preBuffer(int nbytes) throws IOException {
                 int bytesReadIntoBuffer = oldAmountBuffered;
                 do {
                     // Keep reading into the buffer until we have the correct amount.
-                    bytesReadIntoBuffer += this.wrapped.read(this.currentBuffer, bytesReadIntoBuffer, newBufferSize - bytesReadIntoBuffer);
+                    bytesReadIntoBuffer += this.underlying.read(this.currentBuffer, bytesReadIntoBuffer, newBufferSize - bytesReadIntoBuffer);
                 } while (bytesReadIntoBuffer < newBufferSize);
             } else {
                 // We need to create a buffer.
@@ -99,7 +96,7 @@ public synchronized void preBuffer(int nbytes) throws IOException {
                 int bytesReadIntoBuffer = 0;
                 do {
                     // Keep reading into the buffer until we have the correct amount.
-                    bytesReadIntoBuffer += this.wrapped.read(this.currentBuffer, bytesReadIntoBuffer, toRead - bytesReadIntoBuffer);
+                    bytesReadIntoBuffer += this.underlying.read(this.currentBuffer, bytesReadIntoBuffer, toRead - bytesReadIntoBuffer);
                 } while (bytesReadIntoBuffer < toRead);
             }
         } // Otherwise, we already have the data buffered :D
@@ -132,7 +129,7 @@ public synchronized int peek(int ahead) throws IOException {
     @Override
     public synchronized int read() throws IOException {
         if (!this.hasDataBuffered()) {
-            return this.wrapped.read();
+            return this.underlying.read();
         }
 
         int result = this.currentBuffer[this.bufferPos++];
@@ -150,7 +147,7 @@ public synchronized int read() throws IOException {
     @Override
     public synchronized int read(byte[] b, int off, int len) throws IOException {
         if (!this.hasDataBuffered()) {
-            return this.wrapped.read(b, off, len);
+            return this.underlying.read(b, off, len);
         }
 
         int nread = Math.min(len, this.amountBuffered());
@@ -171,7 +168,7 @@ public synchronized int read(byte[] b, int off, int len) throws IOException {
     @Override
     public synchronized long skip(long n) throws IOException {
         if (!this.hasDataBuffered()) {
-            return this.wrapped.skip(n);
+            return this.underlying.skip(n);
         }
 
         long nread = Math.min(n, this.amountBuffered());
@@ -190,7 +187,7 @@ public synchronized long skip(long n) throws IOException {
     @Override
     public synchronized int available() throws IOException {
         if (!this.hasDataBuffered()) {
-            return this.wrapped.available();
+            return this.underlying.available();
         }
 
         return this.amountBuffered();
@@ -209,7 +206,7 @@ public synchronized int available() throws IOException {
     @Override
     public void close() throws IOException {
         this.currentBuffer = null;
-        this.wrapped.close();
+        this.underlying.close();
     }
 
 }