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-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new b149565 No need to nest in else.
b149565 is described below
commit b1495650f558f397b630f7f36e9c6e853079e8fc
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Mar 5 15:09:10 2021 -0500
No need to nest in else.
---
.../java/org/apache/commons/dbcp2/AbandonedTrace.java | 3 ++-
.../apache/commons/dbcp2/DelegatingConnection.java | 12 ++++++------
.../commons/dbcp2/DelegatingDatabaseMetaData.java | 17 ++++++++---------
.../org/apache/commons/dbcp2/DelegatingResultSet.java | 12 ++++++------
.../org/apache/commons/dbcp2/DelegatingStatement.java | 17 ++++++++---------
.../java/org/apache/commons/dbcp2/PoolingDriver.java | 19 +++++++++----------
.../dbcp2/datasources/InstanceKeyDataSource.java | 5 ++---
.../org/apache/commons/dbcp2/TestConnectionPool.java | 5 ++---
.../org/apache/commons/dbcp2/TestPStmtPooling.java | 5 ++---
.../apache/commons/dbcp2/TesterPreparedStatement.java | 6 +++---
10 files changed, 48 insertions(+), 53 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
index c53428b..370c228 100644
--- a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
+++ b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
@@ -153,7 +153,8 @@ public class AbandonedTrace implements TrackedUse {
if (trace != null && trace.equals(traceInList)) {
iter.remove();
break;
- } else if (traceInList == null) {
+ }
+ if (traceInList == null) {
// Clean-up since we are here anyway
iter.remove();
}
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index 547b1e2..70852ee 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -798,22 +798,22 @@ public class DelegatingConnection<C extends Connection>
extends AbandonedTrace i
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return true;
- } else if (iface.isAssignableFrom(connection.getClass())) {
+ }
+ if (iface.isAssignableFrom(connection.getClass())) {
return true;
- } else {
- return connection.isWrapperFor(iface);
}
+ return connection.isWrapperFor(iface);
}
@Override
public <T> T unwrap(final Class<T> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return iface.cast(this);
- } else if (iface.isAssignableFrom(connection.getClass())) {
+ }
+ if (iface.isAssignableFrom(connection.getClass())) {
return iface.cast(connection);
- } else {
- return connection.unwrap(iface);
}
+ return connection.unwrap(iface);
}
@Override
diff --git
a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
index 90a1d63..e6a7092 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
@@ -984,11 +984,10 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
}
protected void handleException(final SQLException e) throws SQLException {
- if (connection != null) {
- connection.handleException(e);
- } else {
+ if (connection == null) {
throw e;
}
+ connection.handleException(e);
}
@Override
@@ -1025,11 +1024,11 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return true;
- } else if (iface.isAssignableFrom(databaseMetaData.getClass())) {
+ }
+ if (iface.isAssignableFrom(databaseMetaData.getClass())) {
return true;
- } else {
- return databaseMetaData.isWrapperFor(iface);
}
+ return databaseMetaData.isWrapperFor(iface);
}
@Override
@@ -1903,11 +1902,11 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
public <T> T unwrap(final Class<T> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return iface.cast(this);
- } else if (iface.isAssignableFrom(databaseMetaData.getClass())) {
+ }
+ if (iface.isAssignableFrom(databaseMetaData.getClass())) {
return iface.cast(databaseMetaData);
- } else {
- return databaseMetaData.unwrap(iface);
}
+ return databaseMetaData.unwrap(iface);
}
@Override
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
index 4e6e9f3..ba40db8 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
@@ -1119,11 +1119,11 @@ public final class DelegatingResultSet extends
AbandonedTrace implements ResultS
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return true;
- } else if (iface.isAssignableFrom(resultSet.getClass())) {
+ }
+ if (iface.isAssignableFrom(resultSet.getClass())) {
return true;
- } else {
- return resultSet.isWrapperFor(iface);
}
+ return resultSet.isWrapperFor(iface);
}
@Override
@@ -1250,11 +1250,11 @@ public final class DelegatingResultSet extends
AbandonedTrace implements ResultS
public <T> T unwrap(final Class<T> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return iface.cast(this);
- } else if (iface.isAssignableFrom(resultSet.getClass())) {
+ }
+ if (iface.isAssignableFrom(resultSet.getClass())) {
return iface.cast(resultSet);
- } else {
- return resultSet.unwrap(iface);
}
+ return resultSet.unwrap(iface);
}
@Override
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
index b9f574d..4810bcd 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
@@ -626,11 +626,10 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
}
protected void handleException(final SQLException e) throws SQLException {
- if (connection != null) {
- connection.handleException(e);
- } else {
+ if (connection == null) {
throw e;
}
+ connection.handleException(e);
}
/*
@@ -671,11 +670,11 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return true;
- } else if (iface.isAssignableFrom(statement.getClass())) {
+ }
+ if (iface.isAssignableFrom(statement.getClass())) {
return true;
- } else {
- return statement.isWrapperFor(iface);
}
+ return statement.isWrapperFor(iface);
}
/**
@@ -817,10 +816,10 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
public <T> T unwrap(final Class<T> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return iface.cast(this);
- } else if (iface.isAssignableFrom(statement.getClass())) {
+ }
+ if (iface.isAssignableFrom(statement.getClass())) {
return iface.cast(statement);
- } else {
- return statement.unwrap(iface);
}
+ return statement.unwrap(iface);
}
}
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
index 316c868..ae0c0da 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
@@ -180,18 +180,17 @@ public class PoolingDriver implements Driver {
* the connection
*/
public void invalidateConnection(final Connection conn) throws
SQLException {
- if (conn instanceof PoolGuardConnectionWrapper) { // normal case
- final PoolGuardConnectionWrapper pgconn =
(PoolGuardConnectionWrapper) conn;
- @SuppressWarnings("unchecked")
- final ObjectPool<Connection> pool = (ObjectPool<Connection>)
pgconn.pool;
- try {
- pool.invalidateObject(pgconn.getDelegateInternal());
- } catch (final Exception e) {
- // Ignore.
- }
- } else {
+ if (!(conn instanceof PoolGuardConnectionWrapper)) {
throw new SQLException("Invalid connection class");
}
+ final PoolGuardConnectionWrapper pgconn = (PoolGuardConnectionWrapper)
conn;
+ @SuppressWarnings("unchecked")
+ final ObjectPool<Connection> pool = (ObjectPool<Connection>)
pgconn.pool;
+ try {
+ pool.invalidateObject(pgconn.getDelegateInternal());
+ } catch (final Exception e) {
+ // Ignore.
+ }
}
@Override
diff --git
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
index a2a1b91..213438a 100644
---
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -1012,12 +1012,11 @@ public abstract class InstanceKeyDataSource implements
DataSource, Referenceable
ctx = new InitialContext(jndiEnvironment);
}
final Object ds = ctx.lookup(dataSourceName);
- if (ds instanceof ConnectionPoolDataSource) {
- cpds = (ConnectionPoolDataSource) ds;
- } else {
+ if (!(ds instanceof ConnectionPoolDataSource)) {
throw new SQLException("Illegal configuration: " + "DataSource
" + dataSourceName + " ("
+ ds.getClass().getName() + ")" + " doesn't implement
javax.sql.ConnectionPoolDataSource");
}
+ cpds = (ConnectionPoolDataSource) ds;
}
// try to get a connection with the supplied userName/password
diff --git a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
index c16c34d..4fb7811 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
@@ -410,14 +410,13 @@ public abstract class TestConnectionPool {
final Connection[] u = new Connection[getMaxTotal()];
for (int i = 0; i < c.length; i++) {
c[i] = newConnection();
- if (c[i] instanceof DelegatingConnection) {
- u[i] = ((DelegatingConnection<?>) c[i]).getInnermostDelegate();
- } else {
+ if (!(c[i] instanceof DelegatingConnection)) {
for (int j = 0; j <= i; j++) {
c[j].close();
}
return; // skip this test
}
+ u[i] = ((DelegatingConnection<?>) c[i]).getInnermostDelegate();
}
// Close connections one at a time and get new ones, making sure
// the new ones come from the pool
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
index 5d7e56f..947898d 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
@@ -90,11 +90,10 @@ public class TestPStmtPooling {
if (s instanceof PoolablePreparedStatement) {
return (PoolablePreparedStatement<?>) s;
}
- if (s instanceof DelegatingPreparedStatement) {
- s = ((DelegatingPreparedStatement) s).getDelegate();
- } else {
+ if (!(s instanceof DelegatingPreparedStatement)) {
return null;
}
+ s = ((DelegatingPreparedStatement) s).getDelegate();
}
return null;
}
diff --git
a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
index facec22..a8a1bb5 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
@@ -188,12 +188,12 @@ public class TesterPreparedStatement extends
TesterStatement implements Prepared
checkOpen();
if("null".equals(_sql)) {
return null;
- } else if (_queryTimeout > 0 && _queryTimeout < 5) {
+ }
+ if (_queryTimeout > 0 && _queryTimeout < 5) {
// Simulate timeout if queryTimout is set to less than 5 seconds
throw new SQLException("query timeout");
- } else {
- return new TesterResultSet(this, _resultSetType,
_resultSetConcurrency);
}
+ return new TesterResultSet(this, _resultSetType,
_resultSetConcurrency);
}
@Override
