Flip null test

Author: garydgregory

src/main/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java

@@ -79,7 +79,7 @@ public DataSourceConnectionFactory(final DataSource dataSource, final String use
 
     @Override
     public Connection createConnection() throws SQLException {
-        if (null == userName && null == userPassword) {
+        if (userName == null && userPassword == null) {
             return dataSource.getConnection();
         }
         return dataSource.getConnection(userName, Utils.toString(userPassword));

src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java

@@ -64,7 +64,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
      * @return a new delegate.
      */
     public static ResultSet wrapResultSet(final Connection connection, final ResultSet resultSet) {
-        if (null == resultSet) {
+        if (resultSet == null) {
             return null;
         }
         return new DelegatingResultSet(connection, resultSet);
@@ -80,7 +80,7 @@ public static ResultSet wrapResultSet(final Connection connection, final ResultS
      * @return a new delegate.
      */
     public static ResultSet wrapResultSet(final Statement statement, final ResultSet resultSet) {
-        if (null == resultSet) {
+        if (resultSet == null) {
             return null;
         }
         return new DelegatingResultSet(statement, resultSet);

src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java

@@ -113,7 +113,7 @@ public DriverManagerConnectionFactory(final String connectionUri, final String u
 
     @Override
     public Connection createConnection() throws SQLException {
-        if (null == properties) {
+        if (properties == null) {
             if (userName == null && userPassword == null) {
                 return DriverManager.getConnection(connectionUri);
             }

src/main/java/org/apache/commons/dbcp2/PoolingConnection.java

@@ -360,7 +360,7 @@ public KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> getStatementPool()
     @SuppressWarnings("resource")
     @Override
     public PooledObject<DelegatingPreparedStatement> makeObject(final PStmtKey key) throws SQLException {
-        if (null == key) {
+        if (key == null) {
             throw new IllegalArgumentException("Prepared statement key is null or invalid.");
         }
         if (key.getStmtType() == StatementType.PREPARED_STATEMENT) {
@@ -480,7 +480,7 @@ public CallableStatement prepareCall(final String sql, final int resultSetType,
      *             Wraps an underlying exception.
      */
     private PreparedStatement prepareStatement(final PStmtKey key) throws SQLException {
-        if (null == stmtPool) {
+        if (stmtPool == null) {
             throw new SQLException("Statement pool is null - closed or invalid PoolingConnection.");
         }
         try {

src/main/java/org/apache/commons/dbcp2/PoolingDriver.java

@@ -185,7 +185,7 @@ public Connection connect(final String url, final Properties info) throws SQLExc
      */
     public synchronized ObjectPool<? extends Connection> getConnectionPool(final String name) throws SQLException {
         final ObjectPool<? extends Connection> pool = pools.get(name);
-        if (null == pool) {
+        if (pool == null) {
             throw new SQLException("Pool not registered: " + name);
         }
         return pool;

src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java

@@ -422,7 +422,7 @@ public synchronized boolean isAccessToUnderlyingConnectionAllowed() {
     @SuppressWarnings("resource")
     @Override
     public PooledObject<DelegatingPreparedStatement> makeObject(final PStmtKey key) throws SQLException {
-        if (null == key) {
+        if (key == null) {
             throw new IllegalArgumentException("Prepared statement key is null or invalid.");
         }
         if (key.getStmtType() == StatementType.PREPARED_STATEMENT) {

src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java

@@ -251,7 +251,7 @@ public Connection getConnection(final String userName, final String userPassword
         }
 
         // Password on PooledConnectionAndInfo does not match
-        if (!(null == userPassword ? null == info.getPassword() : userPassword.equals(info.getPassword()))) {
+        if (!(userPassword == null ? info.getPassword() == null : userPassword.equals(info.getPassword()))) {
             try { // See if password has changed by attempting connection
                 testCPDS(userName, userPassword);
             } catch (final SQLException ex) {