Internal clean ups to more easily compare these two very similar classes

Author: garydgregory

src/main/java/org/apache/commons/io/input/UnixLineEndingInputStream.java

@@ -30,15 +30,15 @@
  */
 public class UnixLineEndingInputStream extends InputStream {
 
-    private boolean atSlashLf;
+    private boolean atEos;
 
     private boolean atSlashCr;
 
-    private boolean atEos;
+    private boolean atSlashLf;
 
-    private final InputStream target;
+    private final InputStream in;
 
-    private final boolean ensureLineFeedAtEndOfFile;
+    private final boolean lineFeedAtEndOfFile;
 
     /**
      * Creates an input stream that filters another stream
@@ -47,8 +47,8 @@ public class UnixLineEndingInputStream extends InputStream {
      * @param ensureLineFeedAtEndOfFile true to ensure that the file ends with LF
      */
     public UnixLineEndingInputStream(final InputStream inputStream, final boolean ensureLineFeedAtEndOfFile) {
-        this.target = inputStream;
-        this.ensureLineFeedAtEndOfFile = ensureLineFeedAtEndOfFile;
+        this.in = inputStream;
+        this.lineFeedAtEndOfFile = ensureLineFeedAtEndOfFile;
     }
 
     /**
@@ -58,7 +58,7 @@ public UnixLineEndingInputStream(final InputStream inputStream, final boolean en
     @Override
     public void close() throws IOException {
         super.close();
-        target.close();
+        in.close();
     }
 
     /**
@@ -68,7 +68,7 @@ public void close() throws IOException {
      * @return The next char to output to the stream.
      */
     private int handleEos(final boolean previousWasSlashCr) {
-        if (previousWasSlashCr || !ensureLineFeedAtEndOfFile) {
+        if (previousWasSlashCr || !lineFeedAtEndOfFile) {
             return EOF;
         }
         if (!atSlashLf) {
@@ -116,13 +116,13 @@ public int read() throws IOException {
      * @throws IOException upon error
      */
     private int readWithUpdate() throws IOException {
-        final int target = this.target.read();
+        final int target = this.in.read();
         atEos = target == EOF;
         if (atEos) {
             return target;
         }
-        atSlashLf = target == LF;
         atSlashCr = target == CR;
+        atSlashLf = target == LF;
         return target;
     }
 }

src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java

@@ -30,17 +30,17 @@
  */
 public class WindowsLineEndingInputStream  extends InputStream {
 
-    private boolean atSlashCr;
+    private boolean atEos;
 
-    private boolean atSlashN;
+    private boolean atSlashCr;
 
-    private boolean injectSlashN;
+    private boolean atSlashLf;
 
-    private boolean atEos;
+    private final InputStream in;
 
-    private final InputStream target;
+    private boolean injectSlashLf;
 
-    private final boolean ensureLineFeedAtEndOfFile;
+    private final boolean lineFeedAtEndOfFile;
 
     /**
      * Creates an input stream that filters another stream
@@ -49,35 +49,37 @@ public class WindowsLineEndingInputStream  extends InputStream {
      * @param ensureLineFeedAtEndOfFile true to ensure that the file ends with CRLF
      */
     public WindowsLineEndingInputStream(final InputStream in, final boolean ensureLineFeedAtEndOfFile) {
-        this.target = in;
-        this.ensureLineFeedAtEndOfFile = ensureLineFeedAtEndOfFile;
+        this.in = in;
+        this.lineFeedAtEndOfFile = ensureLineFeedAtEndOfFile;
     }
 
     /**
      * Closes the stream. Also closes the underlying stream.
+     *
      * @throws IOException upon error
      */
     @Override
     public void close() throws IOException {
         super.close();
-        target.close();
+        in.close();
     }
 
     /**
-     * Handles the EOF-handling at the end of the stream
+     * Handles the end of stream condition.
+     *
      * @return The next char to output to the stream
      */
-    private int eofGame() {
-        if (!ensureLineFeedAtEndOfFile) {
+    private int handleEos() {
+        if (!lineFeedAtEndOfFile) {
             return EOF;
         }
-        if (!atSlashN && !atSlashCr) {
+        if (!atSlashLf && !atSlashCr) {
             atSlashCr = true;
             return CR;
         }
-        if (!atSlashN) {
+        if (!atSlashLf) {
             atSlashCr = false;
-            atSlashN = true;
+            atSlashLf = true;
             return LF;
         }
         return EOF;
@@ -97,19 +99,19 @@ public synchronized void mark(final int readlimit) {
     @Override
     public int read() throws IOException {
         if (atEos) {
-            return eofGame();
+            return handleEos();
         }
-        if (injectSlashN) {
-            injectSlashN = false;
+        if (injectSlashLf) {
+            injectSlashLf = false;
             return LF;
         }
         final boolean prevWasSlashR = atSlashCr;
         final int target = readWithUpdate();
         if (atEos) {
-            return eofGame();
+            return handleEos();
         }
         if (target == LF && !prevWasSlashR) {
-            injectSlashN = true;
+            injectSlashLf = true;
             return CR;
         }
         return target;
@@ -121,13 +123,13 @@ public int read() throws IOException {
      * @throws IOException upon error
      */
     private int readWithUpdate() throws IOException {
-        final int target = this.target.read();
+        final int target = this.in.read();
         atEos = target == EOF;
         if (atEos) {
             return target;
         }
         atSlashCr = target == CR;
-        atSlashN = target == LF;
+        atSlashLf = target == LF;
         return target;
     }
 }