You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/06/10 18:23:52 UTC
commons-dbcp git commit: Replace null checks and throws of
NullPointerException with Java's java.util.Objects.requireNonNull(T, String).
Repository: commons-dbcp
Updated Branches:
refs/heads/master efedfb04f -> 982141d68
Replace null checks and throws of NullPointerException with Java's
java.util.Objects.requireNonNull(T, String).
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/982141d6
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/982141d6
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/982141d6
Branch: refs/heads/master
Commit: 982141d68997d48524ac4f0b9616f06ff5cfbebb
Parents: efedfb0
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Jun 10 12:23:47 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Jun 10 12:23:47 2018 -0600
----------------------------------------------------------------------
.../apache/commons/dbcp2/BasicDataSource.java | 6 ++---
.../dbcp2/PoolableConnectionFactory.java | 6 ++---
.../apache/commons/dbcp2/PoolingDataSource.java | 9 +++-----
.../managed/DataSourceXAConnectionFactory.java | 10 +++------
.../dbcp2/managed/LocalXAConnectionFactory.java | 23 ++++++--------------
.../dbcp2/managed/ManagedDataSource.java | 5 ++---
.../dbcp2/managed/TransactionContext.java | 9 +++-----
.../dbcp2/managed/TransactionRegistry.java | 13 ++++-------
8 files changed, 26 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/982141d6/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index d40eda7..563cd7a 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -32,6 +32,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.logging.Logger;
@@ -1917,10 +1918,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
* the connection properties used to create new connections
*/
public void setConnectionProperties(final String connectionProperties) {
- if (connectionProperties == null) {
- throw new NullPointerException("connectionProperties is null");
- }
-
+ Objects.requireNonNull(connectionProperties, "connectionProperties is null");
final String[] entries = connectionProperties.split(";");
final Properties properties = new Properties();
for (final String entry : entries) {
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/982141d6/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index f69fd64..9c527ec 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -21,6 +21,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collection;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;
import javax.management.ObjectName;
@@ -323,10 +324,7 @@ public class PoolableConnectionFactory
if(null != sqls) {
try (Statement stmt = conn.createStatement()) {
for (final String sql : sqls) {
- if (sql == null) {
- throw new NullPointerException(
- "null connectionInitSqls element");
- }
+ Objects.requireNonNull(sql, "null connectionInitSqls element");
stmt.execute(sql);
}
}
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/982141d6/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
index fde6729..06434fb 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
@@ -21,6 +21,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.util.NoSuchElementException;
+import java.util.Objects;
import java.util.logging.Logger;
import javax.sql.DataSource;
@@ -50,16 +51,12 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto
private boolean accessToUnderlyingConnectionAllowed;
public PoolingDataSource(final ObjectPool<C> pool) {
- if (null == pool) {
- throw new NullPointerException("Pool must not be null.");
- }
+ Objects.requireNonNull(pool, "Pool must not be null.");
this.pool = pool;
// Verify that _pool's factory refers back to it. If not, log a warning and try to fix.
if (this.pool instanceof GenericObjectPool<?>) {
final PoolableConnectionFactory pcf = (PoolableConnectionFactory) ((GenericObjectPool<?>) this.pool).getFactory();
- if (pcf == null) {
- throw new NullPointerException("PoolableConnectionFactory must not be null.");
- }
+ Objects.requireNonNull(pcf, "PoolableConnectionFactory must not be null.");
if (pcf.getPool() != this.pool) {
log.warn(Utils.getMessage("poolingDataSource.factoryConfig"));
@SuppressWarnings("unchecked") // PCF must have a pool of PCs
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/982141d6/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
index 47d6de3..83f340f 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
@@ -29,6 +29,7 @@ import org.apache.commons.dbcp2.Utils;
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.Objects;
/**
* An implementation of XAConnectionFactory which uses a real XADataSource to obtain connections and XAResources.
@@ -64,13 +65,8 @@ public class DataSourceXAConnectionFactory implements XAConnectionFactory {
*/
public DataSourceXAConnectionFactory(final TransactionManager transactionManager, final XADataSource xaDataSource,
final String userName, final char[] userPassword) {
- if (transactionManager == null) {
- throw new NullPointerException("transactionManager is null");
- }
- if (xaDataSource == null) {
- throw new NullPointerException("xaDataSource is null");
- }
-
+ Objects.requireNonNull(transactionManager, "transactionManager is null");
+ Objects.requireNonNull(xaDataSource, "xaDataSource is null");
this.transactionRegistry = new TransactionRegistry(transactionManager);
this.xaDataSource = xaDataSource;
this.userName = userName;
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/982141d6/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
index 2d7e31f..b69bca5 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
@@ -25,6 +25,7 @@ import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.Objects;
/**
* An implementation of XAConnectionFactory which manages non-XA connections in XA transactions. A non-XA connection
@@ -46,13 +47,8 @@ public class LocalXAConnectionFactory implements XAConnectionFactory {
* @param connectionFactory the connection factory from which connections will be retrieved
*/
public LocalXAConnectionFactory(final TransactionManager transactionManager, final ConnectionFactory connectionFactory) {
- if (transactionManager == null) {
- throw new NullPointerException("transactionManager is null");
- }
- if (connectionFactory == null) {
- throw new NullPointerException("connectionFactory is null");
- }
-
+ Objects.requireNonNull(transactionManager, "transactionManager is null");
+ Objects.requireNonNull(connectionFactory, "connectionFactory is null");
this.transactionRegistry = new TransactionRegistry(transactionManager);
this.connectionFactory = connectionFactory;
}
@@ -161,9 +157,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory {
*/
@Override
public synchronized void end(final Xid xid, final int flag) throws XAException {
- if (xid == null) {
- throw new NullPointerException("xid is null");
- }
+ Objects.requireNonNull(xid, "xid is null");
if (!this.currentXid.equals(xid)) {
throw new XAException("Invalid Xid: expected " + this.currentXid + ", but was " + xid);
}
@@ -212,9 +206,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory {
*/
@Override
public synchronized void commit(final Xid xid, final boolean flag) throws XAException {
- if (xid == null) {
- throw new NullPointerException("xid is null");
- }
+ Objects.requireNonNull(xid, "xid is null");
if (this.currentXid == null) {
throw new XAException("There is no current transaction");
}
@@ -239,6 +231,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory {
try {
connection.setAutoCommit(originalAutoCommit);
} catch (final SQLException e) {
+ // ignore
}
this.currentXid = null;
}
@@ -252,9 +245,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory {
*/
@Override
public synchronized void rollback(final Xid xid) throws XAException {
- if (xid == null) {
- throw new NullPointerException("xid is null");
- }
+ Objects.requireNonNull(xid, "xid is null");
if (!this.currentXid.equals(xid)) {
throw new XAException("Invalid Xid: expected " + this.currentXid + ", but was " + xid);
}
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/982141d6/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java b/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
index 261343a..02d89bc 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
@@ -22,6 +22,7 @@ import org.apache.commons.dbcp2.PoolingDataSource;
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.Objects;
/**
* The ManagedDataSource is a PoolingDataSource that creates ManagedConnections.
@@ -62,9 +63,7 @@ public class ManagedDataSource<C extends Connection> extends PoolingDataSource<C
if(this.transactionRegistry != null) {
throw new IllegalStateException("TransactionRegistry already set");
}
- if(transactionRegistry == null) {
- throw new NullPointerException("TransactionRegistry is null");
- }
+ Objects.requireNonNull(transactionRegistry, "transactionRegistry is null");
this.transactionRegistry = transactionRegistry;
}
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/982141d6/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
index 91d6a5c..279e107 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
@@ -25,6 +25,7 @@ import javax.transaction.Transaction;
import javax.transaction.xa.XAResource;
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.Objects;
import java.lang.ref.WeakReference;
/**
@@ -52,12 +53,8 @@ public class TransactionContext {
* @param transaction the transaction
*/
public TransactionContext(final TransactionRegistry transactionRegistry, final Transaction transaction) {
- if (transactionRegistry == null) {
- throw new NullPointerException("transactionRegistry is null");
- }
- if (transaction == null) {
- throw new NullPointerException("transaction is null");
- }
+ Objects.requireNonNull(transactionRegistry, "transactionRegistry is null");
+ Objects.requireNonNull(transaction, "transaction is null");
this.transactionRegistry = transactionRegistry;
this.transactionRef = new WeakReference<>(transaction);
this.transactionComplete = false;
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/982141d6/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java b/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
index 62dc171..cb3b88c 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
@@ -20,6 +20,7 @@ package org.apache.commons.dbcp2.managed;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Map;
+import java.util.Objects;
import java.util.WeakHashMap;
import javax.transaction.SystemException;
@@ -62,12 +63,8 @@ public class TransactionRegistry {
* @param xaResource the XAResource which managed the connection within a transaction
*/
public synchronized void registerConnection(final Connection connection, final XAResource xaResource) {
- if (connection == null) {
- throw new NullPointerException("connection is null");
- }
- if (xaResource == null) {
- throw new NullPointerException("xaResource is null");
- }
+ Objects.requireNonNull(connection, "connection is null");
+ Objects.requireNonNull(xaResource, "xaResource is null");
xaResources.put(connection, xaResource);
}
@@ -78,9 +75,7 @@ public class TransactionRegistry {
* @throws SQLException if the connection does not have a registered XAResource
*/
public synchronized XAResource getXAResource(final Connection connection) throws SQLException {
- if (connection == null) {
- throw new NullPointerException("connection is null");
- }
+ Objects.requireNonNull(connection, "connection is null");
final Connection key = getConnectionKey(connection);
final XAResource xaResource = xaResources.get(key);
if (xaResource == null) {