Use Objects.requireNonNull() instead of custom check. Minor formatting.
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 @@
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 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.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 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);
