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 deb092b  Refactor null-checks.
deb092b is described below

commit deb092b09ef8f1b59c7000a75d20b7c3f6909c32
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Wed Sep 22 10:51:46 2021 -0400

    Refactor null-checks.
---
 .../java/org/apache/commons/io/filefilter/PrefixFileFilter.java   | 8 ++------
 .../java/org/apache/commons/io/filefilter/RegexFileFilter.java    | 4 +---
 .../java/org/apache/commons/io/filefilter/SuffixFileFilter.java   | 8 ++------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java 
b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
index 7f6e858..d900dea 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
@@ -133,9 +133,7 @@ public class PrefixFileFilter extends AbstractFileFilter 
implements Serializable
      * @since 1.4
      */
     public PrefixFileFilter(final String prefix, final IOCase ioCase) {
-        if (prefix == null) {
-            throw new IllegalArgumentException("The prefix must not be null");
-        }
+        requireNonNull(prefix, "prefix");
         this.prefixes = new String[] {prefix};
         this.isCase = IOCase.value(ioCase, IOCase.SENSITIVE);
     }
@@ -150,9 +148,7 @@ public class PrefixFileFilter extends AbstractFileFilter 
implements Serializable
      * @since 1.4
      */
     public PrefixFileFilter(final String[] prefixes, final IOCase ioCase) {
-        if (prefixes == null) {
-            throw new IllegalArgumentException("The array of prefixes must not 
be null");
-        }
+        requireNonNull(prefixes, "prefixes");
         this.prefixes = prefixes.clone();
         this.isCase = IOCase.value(ioCase, IOCase.SENSITIVE);
     }
diff --git 
a/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java 
b/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
index 24806b4..91ffbd6 100644
--- a/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
@@ -117,9 +117,7 @@ public class RegexFileFilter extends AbstractFileFilter 
implements Serializable
      * @since 2.10.0
      */
     public RegexFileFilter(final Pattern pattern, final Function<Path, String> 
pathToString) {
-        if (pattern == null) {
-            throw new IllegalArgumentException("Pattern is missing");
-        }
+        requireNonNull(pattern, "pattern");
         this.pattern = pattern;
         this.pathToString = pathToString;
     }
diff --git 
a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java 
b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
index d00969f..55e4e40 100644
--- a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
@@ -135,9 +135,7 @@ public class SuffixFileFilter extends AbstractFileFilter 
implements Serializable
      * @since 1.4
      */
     public SuffixFileFilter(final String suffix, final IOCase ioCase) {
-        if (suffix == null) {
-            throw new IllegalArgumentException("The suffix must not be null");
-        }
+        requireNonNull(suffix, "suffix");
         this.suffixes = new String[] {suffix};
         this.ioCase = IOCase.value(ioCase, IOCase.SENSITIVE);
     }
@@ -152,9 +150,7 @@ public class SuffixFileFilter extends AbstractFileFilter 
implements Serializable
      * @since 1.4
      */
     public SuffixFileFilter(final String[] suffixes, final IOCase ioCase) {
-        if (suffixes == null) {
-            throw new IllegalArgumentException("The array of suffixes must not 
be null");
-        }
+        requireNonNull(suffixes, "suffixes");
         this.suffixes = suffixes.clone();
         this.ioCase = IOCase.value(ioCase, IOCase.SENSITIVE);
     }

Reply via email to