Repository: commons-dbcp Updated Branches: refs/heads/master 80287ea5d -> bc71c883e
Fix typos in private ivar name, Javadocs, and param name: camel case 'username' as 'userName'. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/bc71c883 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/bc71c883 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/bc71c883 Branch: refs/heads/master Commit: bc71c883eec9865f626a77e668f610f1624be43a Parents: 80287ea Author: Gary Gregory <[email protected]> Authored: Sun Jun 10 10:56:58 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Sun Jun 10 10:56:58 2018 -0600 ---------------------------------------------------------------------- .../commons/dbcp2/TestBasicDataSource.java | 6 ++--- .../dbcp2/TestBasicDataSourceFactory.java | 4 +-- .../commons/dbcp2/TestPoolingDataSource.java | 6 ++--- .../apache/commons/dbcp2/TestPoolingDriver.java | 6 ++--- .../org/apache/commons/dbcp2/TesterDriver.java | 2 +- .../datasources/TestCPDSConnectionFactory.java | 26 ++++++++++---------- .../TestKeyedCPDSConnectionFactory.java | 12 ++++----- .../managed/TestBasicManagedDataSource.java | 2 +- .../dbcp2/managed/TestManagedConnection.java | 2 +- .../dbcp2/managed/TestManagedDataSource.java | 2 +- .../dbcp2/managed/TestTransactionContext.java | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java index 6d04495..5caa71e 100644 --- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java +++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java @@ -73,7 +73,7 @@ public class TestBasicDataSource extends TestConnectionPool { ds.setDefaultReadOnly(Boolean.FALSE); ds.setDefaultTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); ds.setDefaultCatalog(CATALOG); - ds.setUsername("username"); + ds.setUsername("userName"); ds.setPassword("password"); ds.setValidationQuery("SELECT DUMMY FROM DUAL"); ds.setConnectionInitSqls(Arrays.asList(new String[] { "SELECT 1", "SELECT 2"})); @@ -579,7 +579,7 @@ public class TestBasicDataSource extends TestConnectionPool { ds.setDefaultReadOnly(Boolean.FALSE); ds.setDefaultTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); ds.setDefaultCatalog(CATALOG); - ds.setUsername("username"); + ds.setUsername("userName"); // Set timeBetweenEvictionRuns > 0, so evictor is created ds.setTimeBetweenEvictionRunsMillis(100); // Make password incorrect, so createDataSource will throw @@ -622,7 +622,7 @@ public class TestBasicDataSource extends TestConnectionPool { ds.setDriverClassName("org.apache.commons.dbcp2.TesterConnRequestCountDriver"); ds.setUrl("jdbc:apache:commons:testerConnRequestCountDriver"); ds.setValidationQuery("SELECT DUMMY FROM DUAL"); - ds.setUsername("username"); + ds.setUsername("userName"); // Make password incorrect, so createDataSource will throw ds.setPassword("wrong"); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java index 6969917..97c32fd 100644 --- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java +++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java @@ -122,7 +122,7 @@ public class TestBasicDataSourceFactory { properties.setProperty("defaultCatalog", "test"); properties.setProperty("testOnBorrow", "true"); properties.setProperty("testOnReturn", "false"); - properties.setProperty("username", "username"); + properties.setProperty("username", "userName"); properties.setProperty("password", "password"); properties.setProperty("validationQuery", "SELECT DUMMY FROM DUAL"); properties.setProperty("validationQueryTimeout", "100"); @@ -162,7 +162,7 @@ public class TestBasicDataSourceFactory { assertEquals("test", ds.getDefaultCatalog()); assertTrue(ds.getTestOnBorrow()); assertFalse(ds.getTestOnReturn()); - assertEquals("username", ds.getUsername()); + assertEquals("userName", ds.getUsername()); assertEquals("password", ds.getPassword()); assertEquals("SELECT DUMMY FROM DUAL", ds.getValidationQuery()); assertEquals(100, ds.getValidationQueryTimeout()); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java index 25a9806..f58c243 100644 --- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java +++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java @@ -48,7 +48,7 @@ public class TestPoolingDataSource extends TestConnectionPool { @Before public void setUp() throws Exception { final Properties props = new Properties(); - props.setProperty("user", "username"); + props.setProperty("user", "userName"); props.setProperty("password", "password"); final PoolableConnectionFactory factory = new PoolableConnectionFactory( @@ -154,7 +154,7 @@ public class TestPoolingDataSource extends TestConnectionPool { @Test public void testFixFactoryConfig() throws Exception { final Properties props = new Properties(); - props.setProperty("user", "username"); + props.setProperty("user", "userName"); props.setProperty("password", "password"); final PoolableConnectionFactory f = new PoolableConnectionFactory( @@ -176,7 +176,7 @@ public class TestPoolingDataSource extends TestConnectionPool { public void testClose() throws Exception { final Properties props = new Properties(); - props.setProperty("user", "username"); + props.setProperty("user", "userName"); props.setProperty("password", "password"); final PoolableConnectionFactory f = new PoolableConnectionFactory( http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java index 7df74a8..7bfe936 100644 --- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java +++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java @@ -94,7 +94,7 @@ public class TestPoolingDriver extends TestConnectionPool { @Test public void test1() { - final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:some:connect:string","username","password"); + final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:some:connect:string","userName","password"); final PoolableConnectionFactory pcf = new PoolableConnectionFactory(connectionFactory, null); pcf.setDefaultReadOnly(Boolean.FALSE); @@ -108,7 +108,7 @@ public class TestPoolingDriver extends TestConnectionPool { @Test public void test2() { - final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:some:connect:string","username","password"); + final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:some:connect:string","userName","password"); final PoolableConnectionFactory pcf = new PoolableConnectionFactory(connectionFactory, null); pcf.setDefaultReadOnly(Boolean.FALSE); @@ -148,7 +148,7 @@ public class TestPoolingDriver extends TestConnectionPool { config.setMaxIdle(10); final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory( "jdbc:apache:commons:testdriver", - "username", + "userName", "password"); final PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(connectionFactory, null); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/TesterDriver.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TesterDriver.java b/src/test/java/org/apache/commons/dbcp2/TesterDriver.java index 5c4f62b..b3439b5 100644 --- a/src/test/java/org/apache/commons/dbcp2/TesterDriver.java +++ b/src/test/java/org/apache/commons/dbcp2/TesterDriver.java @@ -53,7 +53,7 @@ public class TesterDriver implements Driver { validUserPasswords.put("foo", "bar"); validUserPasswords.put("u1", "p1"); validUserPasswords.put("u2", "p2"); - validUserPasswords.put("username", "password"); + validUserPasswords.put("userName", "password"); } /** http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java index e9ed5bc..3f9c157 100644 --- a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java +++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java @@ -43,7 +43,7 @@ public class TestCPDSConnectionFactory { final DriverAdapterCPDS delegate = (DriverAdapterCPDS) cpds.getDelegate(); delegate.setDriver("org.apache.commons.dbcp2.TesterDriver"); delegate.setUrl("jdbc:apache:commons:testdriver"); - delegate.setUser("username"); + delegate.setUser("userName"); delegate.setPassword("password"); } @@ -58,19 +58,19 @@ public class TestCPDSConnectionFactory { public void testSharedPoolDSDestroyOnReturn() throws Exception { final PerUserPoolDataSource ds = new PerUserPoolDataSource(); ds.setConnectionPoolDataSource(cpds); - ds.setPerUserMaxTotal("username", Integer.valueOf(10)); - ds.setPerUserMaxWaitMillis("username", Long.valueOf(50)); - ds.setPerUserMaxIdle("username", Integer.valueOf(2)); - final Connection conn1 = ds.getConnection("username", "password"); - final Connection conn2 = ds.getConnection("username", "password"); - final Connection conn3 = ds.getConnection("username", "password"); - assertEquals(3, ds.getNumActive("username")); + ds.setPerUserMaxTotal("userName", Integer.valueOf(10)); + ds.setPerUserMaxWaitMillis("userName", Long.valueOf(50)); + ds.setPerUserMaxIdle("userName", Integer.valueOf(2)); + final Connection conn1 = ds.getConnection("userName", "password"); + final Connection conn2 = ds.getConnection("userName", "password"); + final Connection conn3 = ds.getConnection("userName", "password"); + assertEquals(3, ds.getNumActive("userName")); conn1.close(); - assertEquals(1, ds.getNumIdle("username")); + assertEquals(1, ds.getNumIdle("userName")); conn2.close(); - assertEquals(2, ds.getNumIdle("username")); + assertEquals(2, ds.getNumIdle("userName")); conn3.close(); // Return to pool will trigger destroy -> close sequence - assertEquals(2, ds.getNumIdle("username")); + assertEquals(2, ds.getNumIdle("userName")); ds.close(); } @@ -84,7 +84,7 @@ public class TestCPDSConnectionFactory { public void testConnectionErrorCleanup() throws Exception { // Setup factory final CPDSConnectionFactory factory = new CPDSConnectionFactory( - cpds, null, -1, false, "username", "password"); + cpds, null, -1, false, "userName", "password"); final GenericObjectPool<PooledConnectionAndInfo> pool = new GenericObjectPool<>(factory); factory.setPool(pool); @@ -149,7 +149,7 @@ public class TestCPDSConnectionFactory { @Test public void testNullValidationQuery() throws Exception { final CPDSConnectionFactory factory = - new CPDSConnectionFactory(cpds, null, -1, false, "username", "password"); + new CPDSConnectionFactory(cpds, null, -1, false, "userName", "password"); final GenericObjectPool<PooledConnectionAndInfo> pool = new GenericObjectPool<>(factory); factory.setPool(pool); pool.setTestOnBorrow(true); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java index efb7145..7026e8e 100644 --- a/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java +++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java @@ -44,7 +44,7 @@ public class TestKeyedCPDSConnectionFactory { final DriverAdapterCPDS delegate = (DriverAdapterCPDS) cpds.getDelegate(); delegate.setDriver("org.apache.commons.dbcp2.TesterDriver"); delegate.setUrl("jdbc:apache:commons:testdriver"); - delegate.setUser("username"); + delegate.setUser("userName"); delegate.setPassword("password"); } @@ -62,9 +62,9 @@ public class TestKeyedCPDSConnectionFactory { ds.setMaxTotal(10); ds.setDefaultMaxWaitMillis(50); ds.setDefaultMaxIdle(2); - final Connection conn1 = ds.getConnection("username", "password"); - final Connection conn2 = ds.getConnection("username", "password"); - final Connection conn3 = ds.getConnection("username", "password"); + final Connection conn1 = ds.getConnection("userName", "password"); + final Connection conn2 = ds.getConnection("userName", "password"); + final Connection conn3 = ds.getConnection("userName", "password"); assertEquals(3, ds.getNumActive()); conn1.close(); assertEquals(1, ds.getNumIdle()); @@ -84,7 +84,7 @@ public class TestKeyedCPDSConnectionFactory { @Test public void testConnectionErrorCleanup() throws Exception { // Setup factory - final UserPassKey key = new UserPassKey("username", "password"); + final UserPassKey key = new UserPassKey("userName", "password"); final KeyedCPDSConnectionFactory factory = new KeyedCPDSConnectionFactory(cpds, null, -1, false); final KeyedObjectPool<UserPassKey, PooledConnectionAndInfo> pool = new GenericKeyedObjectPool<>(factory); @@ -156,7 +156,7 @@ public class TestKeyedCPDSConnectionFactory { */ @Test public void testNullValidationQuery() throws Exception { - final UserPassKey key = new UserPassKey("username", "password"); + final UserPassKey key = new UserPassKey("userName", "password"); final KeyedCPDSConnectionFactory factory = new KeyedCPDSConnectionFactory(cpds, null, -1, false); final GenericKeyedObjectPool<UserPassKey, PooledConnectionAndInfo> pool = new GenericKeyedObjectPool<>(factory); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java index c2e8df3..7ece885 100644 --- a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java +++ b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java @@ -50,7 +50,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource { basicManagedDataSource.setTransactionManager(new TransactionManagerImpl()); basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp2.TesterDriver"); basicManagedDataSource.setUrl("jdbc:apache:commons:testdriver"); - basicManagedDataSource.setUsername("username"); + basicManagedDataSource.setUsername("userName"); basicManagedDataSource.setPassword("password"); basicManagedDataSource.setMaxIdle(1); // Create two connections http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java index 1021c0e..eb5d427 100644 --- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java +++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java @@ -65,7 +65,7 @@ public class TestManagedConnection { // create a driver connection factory final Properties properties = new Properties(); - properties.setProperty("user", "username"); + properties.setProperty("user", "userName"); properties.setProperty("password", "password"); final ConnectionFactory connectionFactory = new DriverConnectionFactory(new TesterDriver(), "jdbc:apache:commons:testdriver", properties); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java ---------------------------------------------------------------------- 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 0699c27..bb18078 100644 --- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java +++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java @@ -66,7 +66,7 @@ public class TestManagedDataSource extends TestConnectionPool { // create a driver connection factory final Properties properties = new Properties(); - properties.setProperty("user", "username"); + properties.setProperty("user", "userName"); properties.setProperty("password", "password"); final ConnectionFactory connectionFactory = new DriverConnectionFactory(new TesterDriver(), "jdbc:apache:commons:testdriver", properties); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/bc71c883/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java b/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java index 76c62ca..19c18e1 100644 --- a/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java +++ b/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java @@ -38,7 +38,7 @@ public class TestTransactionContext { basicManagedDataSource.setTransactionManager(new TransactionManagerImpl()); basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp2.TesterDriver"); basicManagedDataSource.setUrl("jdbc:apache:commons:testdriver"); - basicManagedDataSource.setUsername("username"); + basicManagedDataSource.setUsername("userName"); basicManagedDataSource.setPassword("password"); basicManagedDataSource.setMaxIdle(1); final ManagedConnection<?> conn = (ManagedConnection<?>) basicManagedDataSource.getConnection();
