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/07/08 20:06:05 UTC
commons-dbcp git commit: Remove unnecessary casts.
Repository: commons-dbcp
Updated Branches:
refs/heads/master 0c3e4e0d3 -> eda95607e
Remove unnecessary casts.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/eda95607
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/eda95607
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/eda95607
Branch: refs/heads/master
Commit: eda95607e97ee903c627460456986be9024fb384
Parents: 0c3e4e0
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Jul 8 14:06:02 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Jul 8 14:06:02 2018 -0600
----------------------------------------------------------------------
.../commons/dbcp2/TestDelegatingResultSet.java | 2 +-
.../datasources/TestPerUserPoolDataSource.java | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/eda95607/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
index fe3e29d..9898cc5 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
@@ -49,7 +49,7 @@ public class TestDelegatingResultSet {
testConn = new TesterConnection("foo", "bar");
conn = new DelegatingConnection<>(testConn);
rs = mock(ResultSet.class);
- delegate = (DelegatingResultSet) DelegatingResultSet.wrapResultSet((Connection) conn, rs);
+ delegate = (DelegatingResultSet) DelegatingResultSet.wrapResultSet(conn, rs);
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/eda95607/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
index f8c4a91..ecf17ac 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
@@ -772,7 +772,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
final Map<String, Integer> values = new HashMap<>();
values.put("key", 1);
ds.setPerUserDefaultTransactionIsolation(values);
- assertEquals((Integer) 1, (Integer) ds.getPerUserDefaultTransactionIsolation("key"));
+ assertEquals((Integer) 1, ds.getPerUserDefaultTransactionIsolation("key"));
}
@Test
@@ -781,13 +781,13 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
Map<String, Integer> values = new HashMap<>();
values.put("key", 0);
ds.setPerUserDefaultTransactionIsolation(values);
- assertEquals((Integer) 0, (Integer) ds.getPerUserDefaultTransactionIsolation("key"));
+ assertEquals((Integer) 0, ds.getPerUserDefaultTransactionIsolation("key"));
values = new HashMap<>();
values.put("anonymous", 0);
ds.setPerUserDefaultTransactionIsolation(values);
// TODO this is not consistent with the other methods
- assertEquals(null, (Integer) ds.getPerUserDefaultTransactionIsolation("key"));
- assertEquals((Integer) 0, (Integer) ds.getPerUserDefaultTransactionIsolation("anonymous"));
+ assertEquals(null, ds.getPerUserDefaultTransactionIsolation("key"));
+ assertEquals((Integer) 0, ds.getPerUserDefaultTransactionIsolation("anonymous"));
}
@Test
@@ -797,24 +797,24 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
values.put("key", 0);
ds.setPerUserDefaultTransactionIsolation(values);
// TODO this is not consistent with the other methods
- assertEquals(null, (Integer) ds.getPerUserDefaultTransactionIsolation("missingkey"));
+ assertEquals(null, ds.getPerUserDefaultTransactionIsolation("missingkey"));
}
@Test
public void testPerUserDefaultTransactionIsolationWithUserMapNotInitialized() {
final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
ds.setPerUserDefaultTransactionIsolation(user, 0);
- assertEquals((Integer) 0, (Integer) ds.getPerUserDefaultTransactionIsolation(user));
+ assertEquals((Integer) 0, ds.getPerUserDefaultTransactionIsolation(user));
}
@Test
public void testPerUserDefaultTransactionIsolationWithUserMapInitialized() {
final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
ds.setPerUserDefaultTransactionIsolation(user, 0);
- assertEquals((Integer) 0, (Integer) ds.getPerUserDefaultTransactionIsolation(user));
+ assertEquals((Integer) 0, ds.getPerUserDefaultTransactionIsolation(user));
ds.setPerUserDefaultTransactionIsolation("anotheruser", 0);
- assertEquals((Integer) 0, (Integer) ds.getPerUserDefaultTransactionIsolation(user));
- assertEquals((Integer) 0, (Integer) ds.getPerUserDefaultTransactionIsolation("anotheruser"));
+ assertEquals((Integer) 0, ds.getPerUserDefaultTransactionIsolation(user));
+ assertEquals((Integer) 0, ds.getPerUserDefaultTransactionIsolation("anotheruser"));
}
@Test
@@ -822,7 +822,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
ds.setPerUserDefaultTransactionIsolation("whatismyuseragain?", 0);
// TODO this is not consistent with the other methods
- assertEquals(null, (Integer) ds.getPerUserDefaultTransactionIsolation("missingkey"));
+ assertEquals(null, ds.getPerUserDefaultTransactionIsolation("missingkey"));
}
// -- per user eviction policy class name