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 2020/11/21 00:06:24 UTC
[commons-dbcp] branch master updated: No need to initialize to
default value.
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 c020acc No need to initialize to default value.
c020acc is described below
commit c020acc85578720c3caa4c5363e4d695c6f6b50d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 20 19:06:20 2020 -0500
No need to initialize to default value.
---
.../org/apache/commons/dbcp2/BasicDataSourceFactory.java | 4 +---
.../dbcp2/datasources/KeyedCPDSConnectionFactory.java | 4 +---
.../java/org/apache/commons/dbcp2/TestPStmtPooling.java | 3 +--
.../commons/dbcp2/TestPStmtPoolingBasicDataSource.java | 3 +--
.../dbcp2/datasources/TestSharedPoolDataSource.java | 15 ++++++---------
.../commons/dbcp2/managed/TestManagedDataSource.java | 7 ++-----
6 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
index d7bb1bd..f811bef 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
@@ -299,9 +299,7 @@ public class BasicDataSourceFactory implements ObjectFactory {
*/
public static BasicDataSource createDataSource(final Properties properties) throws Exception {
final BasicDataSource dataSource = new BasicDataSource();
- String value = null;
-
- value = properties.getProperty(PROP_DEFAULT_AUTO_COMMIT);
+ String value = properties.getProperty(PROP_DEFAULT_AUTO_COMMIT);
if (value != null) {
dataSource.setDefaultAutoCommit(Boolean.valueOf(value));
}
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
index f802b8a..750c4f7 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
@@ -113,8 +113,6 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory<UserPassKey
*/
@Override
public synchronized PooledObject<PooledConnectionAndInfo> makeObject(final UserPassKey upkey) throws Exception {
- PooledConnectionAndInfo pci = null;
-
PooledConnection pc = null;
final String userName = upkey.getUsername();
final String password = upkey.getPassword();
@@ -131,7 +129,7 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory<UserPassKey
// should we add this object as a listener or the pool.
// consider the validateObject method in decision
pc.addConnectionEventListener(this);
- pci = new PooledConnectionAndInfo(pc, userName, upkey.getPasswordCharArray());
+ PooledConnectionAndInfo pci = new PooledConnectionAndInfo(pc, userName, upkey.getPasswordCharArray());
pcMap.put(pc, pci);
return new DefaultPooledObject<>(pci);
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
index 6c965e5..5d7e56f 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
@@ -64,9 +64,8 @@ public class TestPStmtPooling {
@Test
public void testMultipleClose() throws Exception {
final DataSource ds = createPoolingDataSource();
- PreparedStatement stmt1 = null;
final Connection conn = ds.getConnection();
- stmt1 = conn.prepareStatement("select 1 from dual");
+ final PreparedStatement stmt1 = conn.prepareStatement("select 1 from dual");
final PoolablePreparedStatement<?> pps1 = getPoolablePreparedStatement(stmt1);
conn.close();
assertTrue(stmt1.isClosed()); // Closing conn should close stmt
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
index 7d84056..a153df2 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
@@ -61,7 +61,6 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
assertTrue(stmt1 != stmt2);
// go over the maxOpen limit
- PreparedStatement stmt3 = null;
try (PreparedStatement ps = conn.prepareStatement("select 'c' from dual")) {
fail("expected SQLException");
}
@@ -71,7 +70,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
stmt2.close();
// test cleanup the 'b' statement
- stmt3 = conn.prepareStatement("select 'c' from dual");
+ PreparedStatement stmt3 = conn.prepareStatement("select 'c' from dual");
assertNotNull(stmt3);
assertTrue(stmt3 != stmt1);
assertTrue(stmt3 != stmt2);
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
index ea791cf..2c98f87 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
@@ -512,7 +512,6 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
private void doTestPoolCallableStatements(final PrepareCallCallback callBack)
throws Exception {
final DriverAdapterCPDS myPcds = new DriverAdapterCPDS();
- DataSource myDs = null;
myPcds.setDriver("org.apache.commons.dbcp2.TesterDriver");
myPcds.setUrl("jdbc:apache:commons:testdriver");
myPcds.setUser("foo");
@@ -527,19 +526,17 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
spDs.setDefaultTransactionIsolation(
Connection.TRANSACTION_READ_COMMITTED);
- myDs = spDs;
+ DataSource myDs = spDs;
Connection conn = ds.getConnection();
callBack.setConnection(conn);
- CallableStatement stmt = null;
- ResultSet rset = null;
assertNotNull(conn);
- stmt = callBack.getCallableStatement();
+ CallableStatement stmt = callBack.getCallableStatement();
assertNotNull(stmt);
final long l1HashCode = ((DelegatingStatement) stmt).getDelegate().hashCode();
- rset = stmt.executeQuery();
+ ResultSet rset = stmt.executeQuery();
assertNotNull(rset);
assertTrue(rset.next());
rset.close();
@@ -590,7 +587,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
private void doTestPoolPreparedStatements(final PrepareStatementCallback callBack)
throws Exception {
final DriverAdapterCPDS mypcds = new DriverAdapterCPDS();
- DataSource myds = null;
+ DataSource myds;
mypcds.setDriver("org.apache.commons.dbcp2.TesterDriver");
mypcds.setUrl("jdbc:apache:commons:testdriver");
mypcds.setUser("foo");
@@ -609,8 +606,8 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
Connection conn = ds.getConnection();
callBack.setConnection(conn);
- PreparedStatement stmt = null;
- ResultSet rset = null;
+ PreparedStatement stmt;
+ ResultSet rset;
assertNotNull(conn);
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
index f82bc4e..96797e6 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
@@ -246,11 +246,8 @@ public class TestManagedDataSource extends TestConnectionPool {
public void testNestedConnections() throws Exception {
transactionManager.begin();
- Connection c1 = null;
- Connection c2 = null;
-
- c1 = newConnection();
- c2 = newConnection();
+ Connection c1 = newConnection();
+ Connection c2 = newConnection();
transactionManager.commit();