[commons-io] branch master updated: Use Objects.requireNonNull().

[gg...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 817bdf1  Use Objects.requireNonNull().
817bdf1 is described below

commit 817bdf10eeceeda08a8fc30d80b67b94e1baa754
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jan 12 11:38:46 2021 -0500

    Use Objects.requireNonNull().
---
 src/main/java/org/apache/commons/io/FilenameUtils.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java
index bd92853..04a3a93 100644
--- a/src/main/java/org/apache/commons/io/FilenameUtils.java
+++ b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Deque;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -537,11 +538,7 @@ public class FilenameUtils {
      */
     public static boolean directoryContains(final String canonicalParent, final String canonicalChild)
             throws IOException {
-
-        // Fail fast against NullPointerException
-        if (canonicalParent == null) {
-            throw new IllegalArgumentException("Directory must not be null");
-        }
+        Objects.requireNonNull(canonicalParent, "canonicalParent");
 
         if (canonicalChild == null) {
             return false;