[commons-io] 15/21: Reuse our own code

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git

commit b5fecb3d3c9afb5a04ac8253cdab73222151c1bf
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Sun Jul 24 12:04:51 2022 -0400

    Reuse our own code
---
 .../io/output/UncheckedFilterOutputStream.java     | 36 +++++-----------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/io/output/UncheckedFilterOutputStream.java 
b/src/main/java/org/apache/commons/io/output/UncheckedFilterOutputStream.java
index 2cbe0b8c..31c92756 100644
--- 
a/src/main/java/org/apache/commons/io/output/UncheckedFilterOutputStream.java
+++ 
b/src/main/java/org/apache/commons/io/output/UncheckedFilterOutputStream.java
@@ -22,6 +22,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
 
+import org.apache.commons.io.UncheckedIO;
+
 /**
  * A {@link FilterOutputStream} that throws {@link UncheckedIOException} 
instead of {@link UncheckedIOException}.
  *
@@ -57,11 +59,7 @@ public class UncheckedFilterOutputStream extends 
FilterOutputStream {
      */
     @Override
     public void close() throws UncheckedIOException {
-        try {
-            super.close();
-        } catch (final IOException e) {
-            uncheck(e);
-        }
+        UncheckedIO.run(super::close);
     }
 
     /**
@@ -69,15 +67,7 @@ public class UncheckedFilterOutputStream extends 
FilterOutputStream {
      */
     @Override
     public void flush() throws UncheckedIOException {
-        try {
-            super.flush();
-        } catch (final IOException e) {
-            uncheck(e);
-        }
-    }
-
-    private void uncheck(final IOException e) {
-        throw new UncheckedIOException(e);
+        UncheckedIO.run(super::flush);
     }
 
     /**
@@ -85,11 +75,7 @@ public class UncheckedFilterOutputStream extends 
FilterOutputStream {
      */
     @Override
     public void write(final byte[] b) throws UncheckedIOException {
-        try {
-            super.write(b);
-        } catch (final IOException e) {
-            uncheck(e);
-        }
+        UncheckedIO.accept(super::write, b);
     }
 
     /**
@@ -97,11 +83,7 @@ public class UncheckedFilterOutputStream extends 
FilterOutputStream {
      */
     @Override
     public void write(final byte[] b, final int off, final int len) throws 
UncheckedIOException {
-        try {
-            super.write(b, off, len);
-        } catch (final IOException e) {
-            uncheck(e);
-        }
+        UncheckedIO.accept(super::write, b, off, len);
     }
 
     /**
@@ -109,11 +91,7 @@ public class UncheckedFilterOutputStream extends 
FilterOutputStream {
      */
     @Override
     public void write(final int b) throws UncheckedIOException {
-        try {
-            super.write(b);
-        } catch (final IOException e) {
-            uncheck(e);
-        }
+        UncheckedIO.accept(super::write, b);
     }
 
 }