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/09/20 22:50:02 UTC

[commons-dbcp] branch master updated: Use uppercase for long literal suffix.

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 ba727a7  Use uppercase for long literal suffix.
ba727a7 is described below

commit ba727a7c13a667160a0b8a5ca9d08e121a801911
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Sep 20 18:49:58 2020 -0400

    Use uppercase for long literal suffix.
---
 .../dbcp2/TestDelegatingCallableStatement.java     |  40 +++----
 .../dbcp2/TestDelegatingPreparedStatement.java     |  40 +++----
 .../commons/dbcp2/TestDelegatingResultSet.java     |  72 ++++++-------
 .../commons/dbcp2/TestDelegatingStatement.java     |   4 +-
 .../datasources/TestPerUserPoolDataSource.java     | 120 ++++++++++-----------
 5 files changed, 138 insertions(+), 138 deletions(-)

diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
index f422d6b..d9c824b 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
@@ -745,10 +745,10 @@ public class TestDelegatingCallableStatement {
     @Test
     public void testSetAsciiStreamStringInputStreamLong() throws Exception {
         try {
-            delegate.setAsciiStream("foo", (java.io.InputStream) null, 1l);
+            delegate.setAsciiStream("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setAsciiStream("foo", (java.io.InputStream) null, 1l);
+        verify(obj, times(1)).setAsciiStream("foo", (java.io.InputStream) null, 1L);
     }
 
     @Test
@@ -781,19 +781,19 @@ public class TestDelegatingCallableStatement {
     @Test
     public void testSetBinaryStreamStringInputStreamLong() throws Exception {
         try {
-            delegate.setBinaryStream("foo", (java.io.InputStream) null, 1l);
+            delegate.setBinaryStream("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setBinaryStream("foo", (java.io.InputStream) null, 1l);
+        verify(obj, times(1)).setBinaryStream("foo", (java.io.InputStream) null, 1L);
     }
 
     @Test
     public void testSetBlobStringInputStreamLong() throws Exception {
         try {
-            delegate.setBlob("foo", (java.io.InputStream) null, 1l);
+            delegate.setBlob("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setBlob("foo", (java.io.InputStream) null, 1l);
+        verify(obj, times(1)).setBlob("foo", (java.io.InputStream) null, 1L);
     }
 
     @Test
@@ -862,10 +862,10 @@ public class TestDelegatingCallableStatement {
     @Test
     public void testSetCharacterStreamStringReaderLong() throws Exception {
         try {
-            delegate.setCharacterStream("foo", (java.io.StringReader) null, 1l);
+            delegate.setCharacterStream("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setCharacterStream("foo", (java.io.StringReader) null, 1l);
+        verify(obj, times(1)).setCharacterStream("foo", (java.io.StringReader) null, 1L);
     }
 
     @Test
@@ -880,10 +880,10 @@ public class TestDelegatingCallableStatement {
     @Test
     public void testSetClobStringReaderLong() throws Exception {
         try {
-            delegate.setClob("foo", (java.io.StringReader) null, 1l);
+            delegate.setClob("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setClob("foo", (java.io.StringReader) null, 1l);
+        verify(obj, times(1)).setClob("foo", (java.io.StringReader) null, 1L);
     }
 
     @Test
@@ -898,19 +898,19 @@ public class TestDelegatingCallableStatement {
     @Test
     public void testSetDateStringSqlDateCalendar() throws Exception {
         try {
-            delegate.setDate("foo", new java.sql.Date(1529827548745l), (java.util.Calendar) null);
+            delegate.setDate("foo", new java.sql.Date(1529827548745L), (java.util.Calendar) null);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setDate("foo", new java.sql.Date(1529827548745l), (java.util.Calendar) null);
+        verify(obj, times(1)).setDate("foo", new java.sql.Date(1529827548745L), (java.util.Calendar) null);
     }
 
     @Test
     public void testSetDateStringSqlDate() throws Exception {
         try {
-            delegate.setDate("foo", new java.sql.Date(1529827548745l));
+            delegate.setDate("foo", new java.sql.Date(1529827548745L));
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setDate("foo", new java.sql.Date(1529827548745l));
+        verify(obj, times(1)).setDate("foo", new java.sql.Date(1529827548745L));
     }
 
     @Test
@@ -943,19 +943,19 @@ public class TestDelegatingCallableStatement {
     @Test
     public void testSetLongStringLong() throws Exception {
         try {
-            delegate.setLong("foo", 1l);
+            delegate.setLong("foo", 1L);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setLong("foo", 1l);
+        verify(obj, times(1)).setLong("foo", 1L);
     }
 
     @Test
     public void testSetNCharacterStreamStringReaderLong() throws Exception {
         try {
-            delegate.setNCharacterStream("foo", (java.io.StringReader) null, 1l);
+            delegate.setNCharacterStream("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setNCharacterStream("foo", (java.io.StringReader) null, 1l);
+        verify(obj, times(1)).setNCharacterStream("foo", (java.io.StringReader) null, 1L);
     }
 
     @Test
@@ -970,10 +970,10 @@ public class TestDelegatingCallableStatement {
     @Test
     public void testSetNClobStringReaderLong() throws Exception {
         try {
-            delegate.setNClob("foo", (java.io.StringReader) null, 1l);
+            delegate.setNClob("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(obj, times(1)).setNClob("foo", (java.io.StringReader) null, 1l);
+        verify(obj, times(1)).setNClob("foo", (java.io.StringReader) null, 1L);
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
index 6ba39dc..5f842c2 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
@@ -142,9 +142,9 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetAsciiStreamIntegerInputStreamLong() throws Exception {
         try {
-            delegate.setAsciiStream(1,(java.io.InputStream) null,1l);
+            delegate.setAsciiStream(1,(java.io.InputStream) null,1L);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setAsciiStream(1,(java.io.InputStream) null,1l);
+        verify(obj, times(1)).setAsciiStream(1,(java.io.InputStream) null,1L);
     }
 
     @Test
@@ -174,9 +174,9 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetBinaryStreamIntegerInputStreamLong() throws Exception {
         try {
-            delegate.setBinaryStream(1,(java.io.InputStream) null,1l);
+            delegate.setBinaryStream(1,(java.io.InputStream) null,1L);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setBinaryStream(1,(java.io.InputStream) null,1l);
+        verify(obj, times(1)).setBinaryStream(1,(java.io.InputStream) null,1L);
     }
 
     @Test
@@ -214,9 +214,9 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetBlobIntegerInputStreamLong() throws Exception {
         try {
-            delegate.setBlob(1,(java.io.InputStream) null,1l);
+            delegate.setBlob(1,(java.io.InputStream) null,1L);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setBlob(1,(java.io.InputStream) null,1l);
+        verify(obj, times(1)).setBlob(1,(java.io.InputStream) null,1L);
     }
 
     @Test
@@ -262,9 +262,9 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetCharacterStreamIntegerReaderLong() throws Exception {
         try {
-            delegate.setCharacterStream(1,(java.io.StringReader) null,1l);
+            delegate.setCharacterStream(1,(java.io.StringReader) null,1L);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setCharacterStream(1,(java.io.StringReader) null,1l);
+        verify(obj, times(1)).setCharacterStream(1,(java.io.StringReader) null,1L);
     }
 
     @Test
@@ -278,9 +278,9 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetClobIntegerReaderLong() throws Exception {
         try {
-            delegate.setClob(1,(java.io.StringReader) null,1l);
+            delegate.setClob(1,(java.io.StringReader) null,1L);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setClob(1,(java.io.StringReader) null,1l);
+        verify(obj, times(1)).setClob(1,(java.io.StringReader) null,1L);
     }
 
     @Test
@@ -294,17 +294,17 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetDateIntegerSqlDateCalendar() throws Exception {
         try {
-            delegate.setDate(1,new java.sql.Date(1529827548745l),(java.util.Calendar) null);
+            delegate.setDate(1,new java.sql.Date(1529827548745L),(java.util.Calendar) null);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setDate(1,new java.sql.Date(1529827548745l),(java.util.Calendar) null);
+        verify(obj, times(1)).setDate(1,new java.sql.Date(1529827548745L),(java.util.Calendar) null);
     }
 
     @Test
     public void testSetDateIntegerSqlDate() throws Exception {
         try {
-            delegate.setDate(1,new java.sql.Date(1529827548745l));
+            delegate.setDate(1,new java.sql.Date(1529827548745L));
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setDate(1,new java.sql.Date(1529827548745l));
+        verify(obj, times(1)).setDate(1,new java.sql.Date(1529827548745L));
     }
 
     @Test
@@ -334,9 +334,9 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetLongIntegerLong() throws Exception {
         try {
-            delegate.setLong(1,1l);
+            delegate.setLong(1,1L);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setLong(1,1l);
+        verify(obj, times(1)).setLong(1,1L);
     }
 
     @Test
@@ -350,9 +350,9 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetNCharacterStreamIntegerReaderLong() throws Exception {
         try {
-            delegate.setNCharacterStream(1,(java.io.StringReader) null,1l);
+            delegate.setNCharacterStream(1,(java.io.StringReader) null,1L);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setNCharacterStream(1,(java.io.StringReader) null,1l);
+        verify(obj, times(1)).setNCharacterStream(1,(java.io.StringReader) null,1L);
     }
 
     @Test
@@ -374,9 +374,9 @@ public class TestDelegatingPreparedStatement {
     @Test
     public void testSetNClobIntegerReaderLong() throws Exception {
         try {
-            delegate.setNClob(1,(java.io.StringReader) null,1l);
+            delegate.setNClob(1,(java.io.StringReader) null,1L);
         } catch (final SQLException e) {}
-        verify(obj, times(1)).setNClob(1,(java.io.StringReader) null,1l);
+        verify(obj, times(1)).setNClob(1,(java.io.StringReader) null,1L);
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
index f0ce5c0..f907080 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
@@ -1047,10 +1047,10 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateAsciiStreamStringInputStreamLong() throws Exception {
         try {
-            delegate.updateAsciiStream("foo", (java.io.InputStream) null, 1l);
+            delegate.updateAsciiStream("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateAsciiStream("foo", (java.io.InputStream) null, 1l);
+        verify(rs, times(1)).updateAsciiStream("foo", (java.io.InputStream) null, 1L);
     }
 
     @Test
@@ -1074,10 +1074,10 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateAsciiStreamIntegerInputStreamLong() throws Exception {
         try {
-            delegate.updateAsciiStream(1, (java.io.InputStream) null, 1l);
+            delegate.updateAsciiStream(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateAsciiStream(1, (java.io.InputStream) null, 1l);
+        verify(rs, times(1)).updateAsciiStream(1, (java.io.InputStream) null, 1L);
     }
 
     @Test
@@ -1128,19 +1128,19 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateBinaryStreamIntegerInputStreamLong() throws Exception {
         try {
-            delegate.updateBinaryStream(1, (java.io.InputStream) null, 1l);
+            delegate.updateBinaryStream(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateBinaryStream(1, (java.io.InputStream) null, 1l);
+        verify(rs, times(1)).updateBinaryStream(1, (java.io.InputStream) null, 1L);
     }
 
     @Test
     public void testUpdateBinaryStreamStringInputStreamLong() throws Exception {
         try {
-            delegate.updateBinaryStream("foo", (java.io.InputStream) null, 1l);
+            delegate.updateBinaryStream("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateBinaryStream("foo", (java.io.InputStream) null, 1l);
+        verify(rs, times(1)).updateBinaryStream("foo", (java.io.InputStream) null, 1L);
     }
 
     @Test
@@ -1191,10 +1191,10 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateBlobStringInputStreamLong() throws Exception {
         try {
-            delegate.updateBlob("foo", (java.io.InputStream) null, 1l);
+            delegate.updateBlob("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateBlob("foo", (java.io.InputStream) null, 1l);
+        verify(rs, times(1)).updateBlob("foo", (java.io.InputStream) null, 1L);
     }
 
     @Test
@@ -1209,10 +1209,10 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateBlobIntegerInputStreamLong() throws Exception {
         try {
-            delegate.updateBlob(1, (java.io.InputStream) null, 1l);
+            delegate.updateBlob(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateBlob(1, (java.io.InputStream) null, 1l);
+        verify(rs, times(1)).updateBlob(1, (java.io.InputStream) null, 1L);
     }
 
     @Test
@@ -1281,19 +1281,19 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateCharacterStreamIntegerReaderLong() throws Exception {
         try {
-            delegate.updateCharacterStream(1, (java.io.StringReader) null, 1l);
+            delegate.updateCharacterStream(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateCharacterStream(1, (java.io.StringReader) null, 1l);
+        verify(rs, times(1)).updateCharacterStream(1, (java.io.StringReader) null, 1L);
     }
 
     @Test
     public void testUpdateCharacterStreamStringReaderLong() throws Exception {
         try {
-            delegate.updateCharacterStream("foo", (java.io.StringReader) null, 1l);
+            delegate.updateCharacterStream("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateCharacterStream("foo", (java.io.StringReader) null, 1l);
+        verify(rs, times(1)).updateCharacterStream("foo", (java.io.StringReader) null, 1L);
     }
 
     @Test
@@ -1326,10 +1326,10 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateClobStringReaderLong() throws Exception {
         try {
-            delegate.updateClob("foo", (java.io.StringReader) null, 1l);
+            delegate.updateClob("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateClob("foo", (java.io.StringReader) null, 1l);
+        verify(rs, times(1)).updateClob("foo", (java.io.StringReader) null, 1L);
     }
 
     @Test
@@ -1371,28 +1371,28 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateClobIntegerReaderLong() throws Exception {
         try {
-            delegate.updateClob(1, (java.io.StringReader) null, 1l);
+            delegate.updateClob(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateClob(1, (java.io.StringReader) null, 1l);
+        verify(rs, times(1)).updateClob(1, (java.io.StringReader) null, 1L);
     }
 
     @Test
     public void testUpdateDateIntegerSqlDate() throws Exception {
         try {
-            delegate.updateDate(1, new java.sql.Date(1529827548745l));
+            delegate.updateDate(1, new java.sql.Date(1529827548745L));
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateDate(1, new java.sql.Date(1529827548745l));
+        verify(rs, times(1)).updateDate(1, new java.sql.Date(1529827548745L));
     }
 
     @Test
     public void testUpdateDateStringSqlDate() throws Exception {
         try {
-            delegate.updateDate("foo", new java.sql.Date(1529827548745l));
+            delegate.updateDate("foo", new java.sql.Date(1529827548745L));
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateDate("foo", new java.sql.Date(1529827548745l));
+        verify(rs, times(1)).updateDate("foo", new java.sql.Date(1529827548745L));
     }
 
     @Test
@@ -1452,19 +1452,19 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateLongStringLong() throws Exception {
         try {
-            delegate.updateLong("foo", 1l);
+            delegate.updateLong("foo", 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateLong("foo", 1l);
+        verify(rs, times(1)).updateLong("foo", 1L);
     }
 
     @Test
     public void testUpdateLongIntegerLong() throws Exception {
         try {
-            delegate.updateLong(1, 1l);
+            delegate.updateLong(1, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateLong(1, 1l);
+        verify(rs, times(1)).updateLong(1, 1L);
     }
 
     @Test
@@ -1488,19 +1488,19 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateNCharacterStreamStringReaderLong() throws Exception {
         try {
-            delegate.updateNCharacterStream("foo", (java.io.StringReader) null, 1l);
+            delegate.updateNCharacterStream("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateNCharacterStream("foo", (java.io.StringReader) null, 1l);
+        verify(rs, times(1)).updateNCharacterStream("foo", (java.io.StringReader) null, 1L);
     }
 
     @Test
     public void testUpdateNCharacterStreamIntegerReaderLong() throws Exception {
         try {
-            delegate.updateNCharacterStream(1, (java.io.StringReader) null, 1l);
+            delegate.updateNCharacterStream(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateNCharacterStream(1, (java.io.StringReader) null, 1l);
+        verify(rs, times(1)).updateNCharacterStream(1, (java.io.StringReader) null, 1L);
     }
 
     @Test
@@ -1515,10 +1515,10 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateNClobIntegerReaderLong() throws Exception {
         try {
-            delegate.updateNClob(1, (java.io.StringReader) null, 1l);
+            delegate.updateNClob(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateNClob(1, (java.io.StringReader) null, 1l);
+        verify(rs, times(1)).updateNClob(1, (java.io.StringReader) null, 1L);
     }
 
     @Test
@@ -1542,10 +1542,10 @@ public class TestDelegatingResultSet {
     @Test
     public void testUpdateNClobStringReaderLong() throws Exception {
         try {
-            delegate.updateNClob("foo", (java.io.StringReader) null, 1l);
+            delegate.updateNClob("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
         }
-        verify(rs, times(1)).updateNClob("foo", (java.io.StringReader) null, 1l);
+        verify(rs, times(1)).updateNClob("foo", (java.io.StringReader) null, 1L);
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
index e44505b..512848d 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
@@ -557,10 +557,10 @@ public class TestDelegatingStatement {
     @Test
     public void testSetLargeMaxRowsLong() throws Exception {
         try {
-            delegatingStatement.setLargeMaxRows(1l);
+            delegatingStatement.setLargeMaxRows(1L);
         } catch (final SQLException e) {
         }
-        verify(mockedStatement, times(1)).setLargeMaxRows(1l);
+        verify(mockedStatement, times(1)).setLargeMaxRows(1L);
     }
 
     @Test
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 27ad9c7..4d18293 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
@@ -1064,30 +1064,30 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     public void testPerUserMaxWaitMillisMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Long> values = new HashMap<>();
-        values.put("key", 1l);
+        values.put("key", 1L);
         ds.setPerUserMaxWaitMillis(values);
-        assertEquals(1l, ds.getPerUserMaxWaitMillis("key"));
+        assertEquals(1L, ds.getPerUserMaxWaitMillis("key"));
     }
 
     @Test
     public void testPerUserMaxWaitMillisMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Long> values = new HashMap<>();
-        values.put("key", 0l);
+        values.put("key", 0L);
         ds.setPerUserMaxWaitMillis(values);
-        assertEquals(0l, ds.getPerUserMaxWaitMillis("key"));
+        assertEquals(0L, ds.getPerUserMaxWaitMillis("key"));
         values = new HashMap<>();
-        values.put("anonymous", 0l);
+        values.put("anonymous", 0L);
         ds.setPerUserMaxWaitMillis(values);
         assertEquals(ds.getDefaultMaxWaitMillis(), ds.getPerUserMaxWaitMillis("key"));
-        assertEquals(0l, ds.getPerUserMaxWaitMillis("anonymous"));
+        assertEquals(0L, ds.getPerUserMaxWaitMillis("anonymous"));
     }
 
     @Test
     public void testPerUserMaxWaitMillisMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Long> values = new HashMap<>();
-        values.put("key", 0l);
+        values.put("key", 0L);
         ds.setPerUserMaxWaitMillis(values);
         assertEquals(ds.getDefaultMaxWaitMillis(), ds.getPerUserMaxWaitMillis("missingkey"));
     }
@@ -1095,24 +1095,24 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     @Test
     public void testPerUserMaxWaitMillisWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserMaxWaitMillis(user, 0l);
-        assertEquals(0l, ds.getPerUserMaxWaitMillis(user));
+        ds.setPerUserMaxWaitMillis(user, 0L);
+        assertEquals(0L, ds.getPerUserMaxWaitMillis(user));
     }
 
     @Test
     public void testPerUserMaxWaitMillisWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserMaxWaitMillis(user, 0l);
-        assertEquals(0l, ds.getPerUserMaxWaitMillis(user));
-        ds.setPerUserMaxWaitMillis("anotheruser", 0l);
-        assertEquals(0l, ds.getPerUserMaxWaitMillis(user));
-        assertEquals(0l, ds.getPerUserMaxWaitMillis("anotheruser"));
+        ds.setPerUserMaxWaitMillis(user, 0L);
+        assertEquals(0L, ds.getPerUserMaxWaitMillis(user));
+        ds.setPerUserMaxWaitMillis("anotheruser", 0L);
+        assertEquals(0L, ds.getPerUserMaxWaitMillis(user));
+        assertEquals(0L, ds.getPerUserMaxWaitMillis("anotheruser"));
     }
 
     @Test
     public void testPerUserMaxWaitMillisWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserMaxWaitMillis("whatismyuseragain?", 0l);
+        ds.setPerUserMaxWaitMillis("whatismyuseragain?", 0L);
         assertEquals(ds.getDefaultMaxWaitMillis(), ds.getPerUserMaxWaitMillis("missingkey"));
     }
 
@@ -1122,30 +1122,30 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     public void testPerUserMinEvictableIdleTimeMillisMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Long> values = new HashMap<>();
-        values.put("key", 1l);
+        values.put("key", 1L);
         ds.setPerUserMinEvictableIdleTimeMillis(values);
-        assertEquals(1l, ds.getPerUserMinEvictableIdleTimeMillis("key"));
+        assertEquals(1L, ds.getPerUserMinEvictableIdleTimeMillis("key"));
     }
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Long> values = new HashMap<>();
-        values.put("key", 0l);
+        values.put("key", 0L);
         ds.setPerUserMinEvictableIdleTimeMillis(values);
-        assertEquals(0l, ds.getPerUserMinEvictableIdleTimeMillis("key"));
+        assertEquals(0L, ds.getPerUserMinEvictableIdleTimeMillis("key"));
         values = new HashMap<>();
-        values.put("anonymous", 0l);
+        values.put("anonymous", 0L);
         ds.setPerUserMinEvictableIdleTimeMillis(values);
         assertEquals(ds.getDefaultMinEvictableIdleTimeMillis(), ds.getPerUserMinEvictableIdleTimeMillis("key"));
-        assertEquals(0l, ds.getPerUserMinEvictableIdleTimeMillis("anonymous"));
+        assertEquals(0L, ds.getPerUserMinEvictableIdleTimeMillis("anonymous"));
     }
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Long> values = new HashMap<>();
-        values.put("key", 0l);
+        values.put("key", 0L);
         ds.setPerUserMinEvictableIdleTimeMillis(values);
         assertEquals(ds.getDefaultMinEvictableIdleTimeMillis(), ds.getPerUserMinEvictableIdleTimeMillis("missingkey"));
     }
@@ -1153,24 +1153,24 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     @Test
     public void testPerUserMinEvictableIdleTimeMillisWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserMinEvictableIdleTimeMillis(user, 0l);
-        assertEquals(0l, ds.getPerUserMinEvictableIdleTimeMillis(user));
+        ds.setPerUserMinEvictableIdleTimeMillis(user, 0L);
+        assertEquals(0L, ds.getPerUserMinEvictableIdleTimeMillis(user));
     }
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserMinEvictableIdleTimeMillis(user, 0l);
-        assertEquals(0l, ds.getPerUserMinEvictableIdleTimeMillis(user));
-        ds.setPerUserMinEvictableIdleTimeMillis("anotheruser", 0l);
-        assertEquals(0l, ds.getPerUserMinEvictableIdleTimeMillis(user));
-        assertEquals(0l, ds.getPerUserMinEvictableIdleTimeMillis("anotheruser"));
+        ds.setPerUserMinEvictableIdleTimeMillis(user, 0L);
+        assertEquals(0L, ds.getPerUserMinEvictableIdleTimeMillis(user));
+        ds.setPerUserMinEvictableIdleTimeMillis("anotheruser", 0L);
+        assertEquals(0L, ds.getPerUserMinEvictableIdleTimeMillis(user));
+        assertEquals(0L, ds.getPerUserMinEvictableIdleTimeMillis("anotheruser"));
     }
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserMinEvictableIdleTimeMillis("whatismyuseragain?", 0l);
+        ds.setPerUserMinEvictableIdleTimeMillis("whatismyuseragain?", 0L);
         assertEquals(ds.getDefaultMinEvictableIdleTimeMillis(), ds.getPerUserMinEvictableIdleTimeMillis("missingkey"));
     }
 
@@ -1296,30 +1296,30 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     public void testPerUserSoftMinEvictableIdleTimeMillisMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Long> values = new HashMap<>();
-        values.put("key", 1l);
+        values.put("key", 1L);
         ds.setPerUserSoftMinEvictableIdleTimeMillis(values);
-        assertEquals(1l, ds.getPerUserSoftMinEvictableIdleTimeMillis("key"));
+        assertEquals(1L, ds.getPerUserSoftMinEvictableIdleTimeMillis("key"));
     }
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Long> values = new HashMap<>();
-        values.put("key", 0l);
+        values.put("key", 0L);
         ds.setPerUserSoftMinEvictableIdleTimeMillis(values);
-        assertEquals(0l, ds.getPerUserSoftMinEvictableIdleTimeMillis("key"));
+        assertEquals(0L, ds.getPerUserSoftMinEvictableIdleTimeMillis("key"));
         values = new HashMap<>();
-        values.put("anonymous", 0l);
+        values.put("anonymous", 0L);
         ds.setPerUserSoftMinEvictableIdleTimeMillis(values);
         assertEquals(ds.getDefaultSoftMinEvictableIdleTimeMillis(), ds.getPerUserSoftMinEvictableIdleTimeMillis("key"));
-        assertEquals(0l, ds.getPerUserSoftMinEvictableIdleTimeMillis("anonymous"));
+        assertEquals(0L, ds.getPerUserSoftMinEvictableIdleTimeMillis("anonymous"));
     }
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Long> values = new HashMap<>();
-        values.put("key", 0l);
+        values.put("key", 0L);
         ds.setPerUserSoftMinEvictableIdleTimeMillis(values);
         assertEquals(ds.getDefaultSoftMinEvictableIdleTimeMillis(), ds.getPerUserSoftMinEvictableIdleTimeMillis("missingkey"));
     }
@@ -1327,24 +1327,24 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserSoftMinEvictableIdleTimeMillis(user, 0l);
-        assertEquals(0l, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
+        ds.setPerUserSoftMinEvictableIdleTimeMillis(user, 0L);
+        assertEquals(0L, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
     }
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserSoftMinEvictableIdleTimeMillis(user, 0l);
-        assertEquals(0l, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
-        ds.setPerUserSoftMinEvictableIdleTimeMillis("anotheruser", 0l);
-        assertEquals(0l, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
-        assertEquals(0l, ds.getPerUserSoftMinEvictableIdleTimeMillis("anotheruser"));
+        ds.setPerUserSoftMinEvictableIdleTimeMillis(user, 0L);
+        assertEquals(0L, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
+        ds.setPerUserSoftMinEvictableIdleTimeMillis("anotheruser", 0L);
+        assertEquals(0L, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
+        assertEquals(0L, ds.getPerUserSoftMinEvictableIdleTimeMillis("anotheruser"));
     }
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserSoftMinEvictableIdleTimeMillis("whatismyuseragain?", 0l);
+        ds.setPerUserSoftMinEvictableIdleTimeMillis("whatismyuseragain?", 0L);
         assertEquals(ds.getDefaultSoftMinEvictableIdleTimeMillis(), ds.getPerUserSoftMinEvictableIdleTimeMillis("missingkey"));
     }
 
@@ -1586,30 +1586,30 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     public void testPerUserTimeBetweenEvictionRunsMillisMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Long> values = new HashMap<>();
-        values.put("key", 1l);
+        values.put("key", 1L);
         ds.setPerUserTimeBetweenEvictionRunsMillis(values);
-        assertEquals(1l, ds.getPerUserTimeBetweenEvictionRunsMillis("key"));
+        assertEquals(1L, ds.getPerUserTimeBetweenEvictionRunsMillis("key"));
     }
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Long> values = new HashMap<>();
-        values.put("key", 0l);
+        values.put("key", 0L);
         ds.setPerUserTimeBetweenEvictionRunsMillis(values);
-        assertEquals(0l, ds.getPerUserTimeBetweenEvictionRunsMillis("key"));
+        assertEquals(0L, ds.getPerUserTimeBetweenEvictionRunsMillis("key"));
         values = new HashMap<>();
-        values.put("anonymous", 0l);
+        values.put("anonymous", 0L);
         ds.setPerUserTimeBetweenEvictionRunsMillis(values);
         assertEquals(ds.getDefaultTimeBetweenEvictionRunsMillis(), ds.getPerUserTimeBetweenEvictionRunsMillis("key"));
-        assertEquals(0l, ds.getPerUserTimeBetweenEvictionRunsMillis("anonymous"));
+        assertEquals(0L, ds.getPerUserTimeBetweenEvictionRunsMillis("anonymous"));
     }
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Long> values = new HashMap<>();
-        values.put("key", 0l);
+        values.put("key", 0L);
         ds.setPerUserTimeBetweenEvictionRunsMillis(values);
         assertEquals(ds.getDefaultTimeBetweenEvictionRunsMillis(), ds.getPerUserTimeBetweenEvictionRunsMillis("missingkey"));
     }
@@ -1617,24 +1617,24 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserTimeBetweenEvictionRunsMillis(user, 0l);
-        assertEquals(0l, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
+        ds.setPerUserTimeBetweenEvictionRunsMillis(user, 0L);
+        assertEquals(0L, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
     }
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserTimeBetweenEvictionRunsMillis(user, 0l);
-        assertEquals(0l, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
-        ds.setPerUserTimeBetweenEvictionRunsMillis("anotheruser", 0l);
-        assertEquals(0l, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
-        assertEquals(0l, ds.getPerUserTimeBetweenEvictionRunsMillis("anotheruser"));
+        ds.setPerUserTimeBetweenEvictionRunsMillis(user, 0L);
+        assertEquals(0L, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
+        ds.setPerUserTimeBetweenEvictionRunsMillis("anotheruser", 0L);
+        assertEquals(0L, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
+        assertEquals(0L, ds.getPerUserTimeBetweenEvictionRunsMillis("anotheruser"));
     }
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        ds.setPerUserTimeBetweenEvictionRunsMillis("whatismyuseragain?", 0l);
+        ds.setPerUserTimeBetweenEvictionRunsMillis("whatismyuseragain?", 0L);
         assertEquals(ds.getDefaultTimeBetweenEvictionRunsMillis(), ds.getPerUserTimeBetweenEvictionRunsMillis("missingkey"));
     }