[commons-beanutils] 01/02: Use Objects.requireNonNull() instead of custom check. Minor formatting.

[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-beanutils.git

commit 1a9de26fec0b4b660f79e3103509ea48d4276524
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Wed Dec 25 18:32:43 2019 -0500

    Use Objects.requireNonNull() instead of custom check. Minor formatting.
---
 src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java | 6 ++----
 src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java    | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java 
b/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
index 41e984a..cf9eee0 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
@@ -20,6 +20,7 @@ package org.apache.commons.beanutils2;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Iterator;
+import java.util.Objects;
 
 /**
  * <p>Implementation of {@code DynaClass} for DynaBeans that wrap the
@@ -153,10 +154,7 @@ public class ResultSetDynaClass extends JDBCDynaClass {
      */
     public ResultSetDynaClass(final ResultSet resultSet, final boolean 
lowerCase, final boolean useColumnLabel)
         throws SQLException {
-
-        if (resultSet == null) {
-            throw new NullPointerException();
-        }
+        Objects.requireNonNull(resultSet, "resultSet");
         this.resultSet = resultSet;
         this.lowerCase = lowerCase;
         setUseColumnLabel(useColumnLabel);
diff --git a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java 
b/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
index a01f71d..ad7e333 100644
--- a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
@@ -21,6 +21,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>Implementation of {@link DynaClass} that creates an in-memory collection
@@ -230,10 +231,7 @@ public class RowSetDynaClass extends JDBCDynaClass {
      */
     public RowSetDynaClass(final ResultSet resultSet, final boolean lowerCase, 
final int limit, final boolean useColumnLabel)
                                                             throws 
SQLException {
-
-        if (resultSet == null) {
-            throw new NullPointerException();
-        }
+        Objects.requireNonNull(resultSet, "resultSet");
         this.lowerCase = lowerCase;
         this.limit = limit;
         setUseColumnLabel(useColumnLabel);