Minor refactorings.

garydgregory · garydgregory · commit d269f164b3e2 · 2021-07-12T08:38:55.000-04:00
diff --git a/src/main/java/org/apache/commons/io/input/UncheckedBufferedReader.java b/src/main/java/org/apache/commons/io/input/UncheckedBufferedReader.java
@@ -73,7 +73,7 @@ public void close() throws UncheckedIOException {
         try {
             super.close();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -85,7 +85,7 @@ public void mark(final int readAheadLimit) throws UncheckedIOException {
         try {
             super.mark(readAheadLimit);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -97,7 +97,7 @@ public int read() throws UncheckedIOException {
         try {
             return super.read();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -109,7 +109,7 @@ public int read(final char[] cbuf) throws UncheckedIOException {
         try {
             return super.read(cbuf);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -121,7 +121,7 @@ public int read(final char[] cbuf, final int off, final int len) throws Unchecke
         try {
             return super.read(cbuf, off, len);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -133,7 +133,7 @@ public int read(final CharBuffer target) throws UncheckedIOException {
         try {
             return super.read(target);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -145,7 +145,7 @@ public String readLine() throws UncheckedIOException {
         try {
             return super.readLine();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -157,7 +157,7 @@ public boolean ready() throws UncheckedIOException {
         try {
             return super.ready();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -169,7 +169,7 @@ public void reset() throws UncheckedIOException {
         try {
             super.reset();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -181,8 +181,12 @@ public long skip(final long n) throws UncheckedIOException {
         try {
             return super.skip(n);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
+    private UncheckedIOException uncheck(final IOException e) {
+        return new UncheckedIOException(e);
+    }
+
 }
diff --git a/src/main/java/org/apache/commons/io/input/UncheckedFilterReader.java b/src/main/java/org/apache/commons/io/input/UncheckedFilterReader.java
@@ -62,7 +62,7 @@ public void close() throws UncheckedIOException {
         try {
             super.close();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -74,7 +74,7 @@ public void mark(final int readAheadLimit) throws UncheckedIOException {
         try {
             super.mark(readAheadLimit);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -86,7 +86,7 @@ public int read() throws UncheckedIOException {
         try {
             return super.read();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -98,7 +98,7 @@ public int read(final char[] cbuf) throws UncheckedIOException {
         try {
             return super.read(cbuf);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -110,7 +110,7 @@ public int read(final char[] cbuf, final int off, final int len) throws Unchecke
         try {
             return super.read(cbuf, off, len);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -122,7 +122,7 @@ public int read(final CharBuffer target) throws UncheckedIOException {
         try {
             return super.read(target);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -134,7 +134,7 @@ public boolean ready() throws UncheckedIOException {
         try {
             return super.ready();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -146,7 +146,7 @@ public void reset() throws UncheckedIOException {
         try {
             super.reset();
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
@@ -158,8 +158,12 @@ public long skip(final long n) throws UncheckedIOException {
         try {
             return super.skip(n);
         } catch (final IOException e) {
-            throw new UncheckedIOException(e);
+            throw uncheck(e);
         }
     }
 
+    private UncheckedIOException uncheck(final IOException e) {
+        return new UncheckedIOException(e);
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public void close() throws UncheckedIOException {`
`73`	`73`	`try {`
`74`	`74`	`super.close();`
`75`	`75`	`} catch (final IOException e) {`
`76`		`- throw new UncheckedIOException(e);`
	`76`	`+ throw uncheck(e);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`@@ -85,7 +85,7 @@ public void mark(final int readAheadLimit) throws UncheckedIOException {`
`85`	`85`	`try {`
`86`	`86`	`super.mark(readAheadLimit);`
`87`	`87`	`} catch (final IOException e) {`
`88`		`- throw new UncheckedIOException(e);`
	`88`	`+ throw uncheck(e);`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`@@ -97,7 +97,7 @@ public int read() throws UncheckedIOException {`
`97`	`97`	`try {`
`98`	`98`	`return super.read();`
`99`	`99`	`} catch (final IOException e) {`
`100`		`- throw new UncheckedIOException(e);`
	`100`	`+ throw uncheck(e);`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`@@ -109,7 +109,7 @@ public int read(final char[] cbuf) throws UncheckedIOException {`
`109`	`109`	`try {`
`110`	`110`	`return super.read(cbuf);`
`111`	`111`	`} catch (final IOException e) {`
`112`		`- throw new UncheckedIOException(e);`
	`112`	`+ throw uncheck(e);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`@@ -121,7 +121,7 @@ public int read(final char[] cbuf, final int off, final int len) throws Unchecke`
`121`	`121`	`try {`
`122`	`122`	`return super.read(cbuf, off, len);`
`123`	`123`	`} catch (final IOException e) {`
`124`		`- throw new UncheckedIOException(e);`
	`124`	`+ throw uncheck(e);`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`@@ -133,7 +133,7 @@ public int read(final CharBuffer target) throws UncheckedIOException {`
`133`	`133`	`try {`
`134`	`134`	`return super.read(target);`
`135`	`135`	`} catch (final IOException e) {`
`136`		`- throw new UncheckedIOException(e);`
	`136`	`+ throw uncheck(e);`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`@@ -145,7 +145,7 @@ public String readLine() throws UncheckedIOException {`
`145`	`145`	`try {`
`146`	`146`	`return super.readLine();`
`147`	`147`	`} catch (final IOException e) {`
`148`		`- throw new UncheckedIOException(e);`
	`148`	`+ throw uncheck(e);`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`@@ -157,7 +157,7 @@ public boolean ready() throws UncheckedIOException {`
`157`	`157`	`try {`
`158`	`158`	`return super.ready();`
`159`	`159`	`} catch (final IOException e) {`
`160`		`- throw new UncheckedIOException(e);`
	`160`	`+ throw uncheck(e);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`@@ -169,7 +169,7 @@ public void reset() throws UncheckedIOException {`
`169`	`169`	`try {`
`170`	`170`	`super.reset();`
`171`	`171`	`} catch (final IOException e) {`
`172`		`- throw new UncheckedIOException(e);`
	`172`	`+ throw uncheck(e);`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`@@ -181,8 +181,12 @@ public long skip(final long n) throws UncheckedIOException {`
`181`	`181`	`try {`
`182`	`182`	`return super.skip(n);`
`183`	`183`	`} catch (final IOException e) {`
`184`		`- throw new UncheckedIOException(e);`
	`184`	`+ throw uncheck(e);`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
	`188`	`+ private UncheckedIOException uncheck(final IOException e) {`
	`189`	`+ return new UncheckedIOException(e);`
	`190`	`+ }`
	`191`	`+`
`188`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void close() throws UncheckedIOException {`
`62`	`62`	`try {`
`63`	`63`	`super.close();`
`64`	`64`	`} catch (final IOException e) {`
`65`		`- throw new UncheckedIOException(e);`
	`65`	`+ throw uncheck(e);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`@@ -74,7 +74,7 @@ public void mark(final int readAheadLimit) throws UncheckedIOException {`
`74`	`74`	`try {`
`75`	`75`	`super.mark(readAheadLimit);`
`76`	`76`	`} catch (final IOException e) {`
`77`		`- throw new UncheckedIOException(e);`
	`77`	`+ throw uncheck(e);`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`@@ -86,7 +86,7 @@ public int read() throws UncheckedIOException {`
`86`	`86`	`try {`
`87`	`87`	`return super.read();`
`88`	`88`	`} catch (final IOException e) {`
`89`		`- throw new UncheckedIOException(e);`
	`89`	`+ throw uncheck(e);`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`@@ -98,7 +98,7 @@ public int read(final char[] cbuf) throws UncheckedIOException {`
`98`	`98`	`try {`
`99`	`99`	`return super.read(cbuf);`
`100`	`100`	`} catch (final IOException e) {`
`101`		`- throw new UncheckedIOException(e);`
	`101`	`+ throw uncheck(e);`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`@@ -110,7 +110,7 @@ public int read(final char[] cbuf, final int off, final int len) throws Unchecke`
`110`	`110`	`try {`
`111`	`111`	`return super.read(cbuf, off, len);`
`112`	`112`	`} catch (final IOException e) {`
`113`		`- throw new UncheckedIOException(e);`
	`113`	`+ throw uncheck(e);`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`@@ -122,7 +122,7 @@ public int read(final CharBuffer target) throws UncheckedIOException {`
`122`	`122`	`try {`
`123`	`123`	`return super.read(target);`
`124`	`124`	`} catch (final IOException e) {`
`125`		`- throw new UncheckedIOException(e);`
	`125`	`+ throw uncheck(e);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
`@@ -134,7 +134,7 @@ public boolean ready() throws UncheckedIOException {`
`134`	`134`	`try {`
`135`	`135`	`return super.ready();`
`136`	`136`	`} catch (final IOException e) {`
`137`		`- throw new UncheckedIOException(e);`
	`137`	`+ throw uncheck(e);`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`@@ -146,7 +146,7 @@ public void reset() throws UncheckedIOException {`
`146`	`146`	`try {`
`147`	`147`	`super.reset();`
`148`	`148`	`} catch (final IOException e) {`
`149`		`- throw new UncheckedIOException(e);`
	`149`	`+ throw uncheck(e);`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`@@ -158,8 +158,12 @@ public long skip(final long n) throws UncheckedIOException {`
`158`	`158`	`try {`
`159`	`159`	`return super.skip(n);`
`160`	`160`	`} catch (final IOException e) {`
`161`		`- throw new UncheckedIOException(e);`
	`161`	`+ throw uncheck(e);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
	`165`	`+ private UncheckedIOException uncheck(final IOException e) {`
	`166`	`+ return new UncheckedIOException(e);`
	`167`	`+ }`
	`168`	`+`
`165`	`169`	`}`