Rename new class

Author: Gary Gregory

src/main/java/org/apache/commons/io/FileUtils.java

@@ -1641,7 +1641,7 @@ public static boolean isFileNewer(final File file, final ChronoLocalDateTime<?>
     public static boolean isFileNewer(final File file, final ChronoZonedDateTime<?> chronoZonedDateTime) {
         Objects.requireNonNull(file, "file");
         Objects.requireNonNull(chronoZonedDateTime, "chronoZonedDateTime");
-        return UncheckedIO.get(() -> PathUtils.isNewer(file.toPath(), chronoZonedDateTime));
+        return Uncheck.get(() -> PathUtils.isNewer(file.toPath(), chronoZonedDateTime));
     }
 
     /**
@@ -1670,7 +1670,7 @@ public static boolean isFileNewer(final File file, final Date date) {
      */
     public static boolean isFileNewer(final File file, final File reference) {
         requireExists(reference, "reference");
-        return UncheckedIO.get(() -> PathUtils.isNewer(file.toPath(), reference.toPath()));
+        return Uncheck.get(() -> PathUtils.isNewer(file.toPath(), reference.toPath()));
     }
 
     /**
@@ -1699,7 +1699,7 @@ public static boolean isFileNewer(final File file, final FileTime fileTime) thro
      */
     public static boolean isFileNewer(final File file, final Instant instant) {
         Objects.requireNonNull(instant, "instant");
-        return UncheckedIO.get(() -> PathUtils.isNewer(file.toPath(), instant));
+        return Uncheck.get(() -> PathUtils.isNewer(file.toPath(), instant));
     }
 
     /**
@@ -1713,7 +1713,7 @@ public static boolean isFileNewer(final File file, final Instant instant) {
      */
     public static boolean isFileNewer(final File file, final long timeMillis) {
         Objects.requireNonNull(file, "file");
-        return UncheckedIO.get(() -> PathUtils.isNewer(file.toPath(), timeMillis));
+        return Uncheck.get(() -> PathUtils.isNewer(file.toPath(), timeMillis));
     }
 
     /**
@@ -1874,7 +1874,7 @@ public static boolean isFileOlder(final File file, final Date date) {
      */
     public static boolean isFileOlder(final File file, final File reference) {
         requireExists(reference, "reference");
-        return UncheckedIO.get(() -> PathUtils.isOlder(file.toPath(), reference.toPath()));
+        return Uncheck.get(() -> PathUtils.isOlder(file.toPath(), reference.toPath()));
     }
 
     /**
@@ -1903,7 +1903,7 @@ public static boolean isFileOlder(final File file, final FileTime fileTime) thro
      */
     public static boolean isFileOlder(final File file, final Instant instant) {
         Objects.requireNonNull(instant, "instant");
-        return UncheckedIO.get(() -> PathUtils.isOlder(file.toPath(), instant));
+        return Uncheck.get(() -> PathUtils.isOlder(file.toPath(), instant));
     }
 
     /**
@@ -1917,7 +1917,7 @@ public static boolean isFileOlder(final File file, final Instant instant) {
      */
     public static boolean isFileOlder(final File file, final long timeMillis) {
         Objects.requireNonNull(file, "file");
-        return UncheckedIO.get(() -> PathUtils.isOlder(file.toPath(), timeMillis));
+        return Uncheck.get(() -> PathUtils.isOlder(file.toPath(), timeMillis));
     }
 
     /**
@@ -2006,7 +2006,7 @@ public static Iterator<File> iterateFiles(final File directory, final IOFileFilt
      * @since 1.2
      */
     public static Iterator<File> iterateFiles(final File directory, final String[] extensions, final boolean recursive) {
-        return UncheckedIO.apply(d -> StreamIterator.iterator(streamFiles(d, recursive, extensions)), directory);
+        return Uncheck.apply(d -> StreamIterator.iterator(streamFiles(d, recursive, extensions)), directory);
     }
 
     /**
@@ -2102,7 +2102,7 @@ public static long lastModifiedUnchecked(final File file) {
         // https://bugs.openjdk.java.net/browse/JDK-8177809
         // File.lastModified() is losing milliseconds (always ends in 000)
         // This bug is in OpenJDK 8 and 9, and fixed in 10.
-        return UncheckedIO.apply(FileUtils::lastModified, file);
+        return Uncheck.apply(FileUtils::lastModified, file);
     }
 
     /**
@@ -2232,7 +2232,7 @@ private static File[] listFiles(final File directory, final FileFilter fileFilte
      * @see org.apache.commons.io.filefilter.NameFileFilter
      */
     public static Collection<File> listFiles(final File directory, final IOFileFilter fileFilter, final IOFileFilter dirFilter) {
-        final AccumulatorPathVisitor visitor = UncheckedIO
+        final AccumulatorPathVisitor visitor = Uncheck
             .apply(d -> listAccumulate(d, FileFileFilter.INSTANCE.and(fileFilter), dirFilter, FileVisitOption.FOLLOW_LINKS), directory);
         return visitor.getFileList().stream().map(Path::toFile).collect(Collectors.toList());
     }
@@ -2248,7 +2248,7 @@ public static Collection<File> listFiles(final File directory, final IOFileFilte
      * @return a collection of java.io.File with the matching files
      */
     public static Collection<File> listFiles(final File directory, final String[] extensions, final boolean recursive) {
-        return UncheckedIO.apply(d -> toList(streamFiles(d, recursive, extensions)), directory);
+        return Uncheck.apply(d -> toList(streamFiles(d, recursive, extensions)), directory);
     }
 
     /**
@@ -2271,7 +2271,7 @@ public static Collection<File> listFiles(final File directory, final String[] ex
      * @since 2.2
      */
     public static Collection<File> listFilesAndDirs(final File directory, final IOFileFilter fileFilter, final IOFileFilter dirFilter) {
-        final AccumulatorPathVisitor visitor = UncheckedIO.apply(d -> listAccumulate(d, fileFilter, dirFilter, FileVisitOption.FOLLOW_LINKS),
+        final AccumulatorPathVisitor visitor = Uncheck.apply(d -> listAccumulate(d, fileFilter, dirFilter, FileVisitOption.FOLLOW_LINKS),
             directory);
         final List<Path> list = visitor.getFileList();
         list.addAll(visitor.getDirList());
@@ -2923,7 +2923,7 @@ private static void setLastModified(final File file, final long timeMillis) thro
      */
     public static long sizeOf(final File file) {
         requireExists(file, "file");
-        return UncheckedIO.get(() -> PathUtils.sizeOf(file.toPath()));
+        return Uncheck.get(() -> PathUtils.sizeOf(file.toPath()));
     }
 
     /**
@@ -2946,7 +2946,7 @@ public static long sizeOf(final File file) {
      */
     public static BigInteger sizeOfAsBigInteger(final File file) {
         requireExists(file, "file");
-        return UncheckedIO.get(() -> PathUtils.sizeOfAsBigInteger(file.toPath()));
+        return Uncheck.get(() -> PathUtils.sizeOfAsBigInteger(file.toPath()));
     }
 
     /**
@@ -2965,7 +2965,7 @@ public static BigInteger sizeOfAsBigInteger(final File file) {
      */
     public static long sizeOfDirectory(final File directory) {
         requireDirectoryExists(directory, "directory");
-        return UncheckedIO.get(() -> PathUtils.sizeOfDirectory(directory.toPath()));
+        return Uncheck.get(() -> PathUtils.sizeOfDirectory(directory.toPath()));
     }
 
     /**
@@ -2979,7 +2979,7 @@ public static long sizeOfDirectory(final File directory) {
      */
     public static BigInteger sizeOfDirectoryAsBigInteger(final File directory) {
         requireDirectoryExists(directory, "directory");
-        return UncheckedIO.get(() -> PathUtils.sizeOfDirectoryAsBigInteger(directory.toPath()));
+        return Uncheck.get(() -> PathUtils.sizeOfDirectoryAsBigInteger(directory.toPath()));
     }
 
     /**

…a/org/apache/commons/io/UncheckedIO.java …/java/org/apache/commons/io/Uncheck.javasrc/main/java/org/apache/commons/io/UncheckedIO.java renamed to src/main/java/org/apache/commons/io/Uncheck.java src/main/java/org/apache/commons/io/UncheckedIO.java renamed to src/main/java/org/apache/commons/io/Uncheck.java

@@ -32,11 +32,11 @@
 import org.apache.commons.io.function.IOTriFunction;
 
 /**
- * Helps use lambdas that throw {@link IOException} rethrow as {@link UncheckedIOException}.
+ * Unchecks calls by throwing {@link UncheckedIOException} instead of {@link IOException}.
  *
  * @since 2.12.0
  */
-public class UncheckedIO {
+public class Uncheck {
 
     /**
      * Accepts an IO consumer with the given arguments.
@@ -95,14 +95,13 @@ public static <T, U, V> void accept(final IOTriConsumer<T, U, V> consumer, final
     /**
      * Applies an IO function with the given arguments.
      *
-     * @param function the function.
      * @param <T> the first function argument type.
      * @param <U> the second function argument type.
      * @param <R> the return type.
-     *
-     * @param t the first function argument
-     * @param u the second function argument
-     * @return the function result
+     * @param function the function.
+     * @param t the first function argument.
+     * @param u the second function argument.
+     * @return the function result.
      * @throws UncheckedIOException if an I/O error occurs.
      */
     public static <T, U, R> R apply(final IOBiFunction<T, U, R> function, final T t, final U u) {
@@ -119,9 +118,8 @@ public static <T, U, R> R apply(final IOBiFunction<T, U, R> function, final T t,
      * @param function the function.
      * @param <T> the first function argument type.
      * @param <R> the return type.
-     *
-     * @param t the first function argument
-     * @return the function result
+     * @param t the first function argument.
+     * @return the function result.
      * @throws UncheckedIOException if an I/O error occurs.
      */
     public static <T, R> R apply(final IOFunction<T, R> function, final T t) {
@@ -141,12 +139,11 @@ public static <T, R> R apply(final IOFunction<T, R> function, final T t) {
      * @param <V> the third function argument type.
      * @param <W> the fourth function argument type.
      * @param <R> the return type.
-     *
-     * @param t the first function argument
-     * @param u the second function argument
-     * @param v the third function argument
-     * @param w the fourth function argument
-     * @return the function result
+     * @param t the first function argument.
+     * @param u the second function argument.
+     * @param v the third function argument.
+     * @param w the fourth function argument.
+     * @return the function result.
      * @throws UncheckedIOException if an I/O error occurs.
      */
     public static <T, U, V, W, R> R apply(final IOQuadFunction<T, U, V, W, R> function, final T t, final U u, final V v, final W w) {
@@ -160,16 +157,15 @@ public static <T, U, V, W, R> R apply(final IOQuadFunction<T, U, V, W, R> functi
     /**
      * Applies an IO tri-function with the given arguments.
      *
-     * @param function the function.
      * @param <T> the first function argument type.
      * @param <U> the second function argument type.
      * @param <V> the third function argument type.
      * @param <R> the return type.
-     *
-     * @param t the first function argument
-     * @param u the second function argument
-     * @param v the third function argument
-     * @return the function result
+     * @param function the function.
+     * @param t the first function argument.
+     * @param u the second function argument.
+     * @param v the third function argument.
+     * @return the function result.
      * @throws UncheckedIOException if an I/O error occurs.
      */
     public static <T, U, V, R> R apply(final IOTriFunction<T, U, V, R> function, final T t, final U u, final V v) {
@@ -211,12 +207,12 @@ public static void run(final IORunnable runnable) {
     }
 
     /**
-     * Tests an IO predicate
+     * Tests an IO predicate.
      *
-     * @param <T> the type of the input to the predicate
-     * @param predicate the predicate
-     * @param t the input to the predicate
-     * @return {@code true} if the input argument matches the predicate, otherwise {@code false}
+     * @param <T> the type of the input to the predicate.
+     * @param predicate the predicate.
+     * @param t the input to the predicate.
+     * @return {@code true} if the input argument matches the predicate, otherwise {@code false}.
      */
     public static <T> boolean test(final IOPredicate<T> predicate, final T t) {
         try {
@@ -242,7 +238,7 @@ private static UncheckedIOException wrap(final IOException e) {
     /**
      * No instances needed.
      */
-    private UncheckedIO() {
+    private Uncheck() {
         // no instances needed.
     }
 }