[commons-dbcp] branch master updated: Migrate away from deprecated Apache Commons Pool APIs.

[ggregory]

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 5a90397  Migrate away from deprecated Apache Commons Pool APIs.
5a90397 is described below

commit 5a90397e5a7b940b62f33f30a0ed619d3ddbff41
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Aug 19 08:36:28 2021 -0400

    Migrate away from deprecated Apache Commons Pool APIs.
---
 .../org/apache/commons/dbcp2/TestBasicDataSourceFactory.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java 
b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
index 498178d..2ef99db 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.management.ManagementFactory;
 import java.sql.Connection;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Properties;
@@ -44,18 +45,18 @@ public class TestBasicDataSourceFactory {
         assertEquals(10, cp.getMaxTotal());
         assertEquals(8, cp.getMaxIdle());
         assertEquals(0, cp.getMinIdle());
-        assertEquals(500, cp.getMaxWaitMillis());
+        assertEquals(Duration.ofMillis(500), cp.getMaxWaitDuration());
         assertEquals(5, cp.getNumIdle());
         assertTrue(cp.getTestOnBorrow());
         assertFalse(cp.getTestOnReturn());
-        assertEquals(1000, cp.getTimeBetweenEvictionRunsMillis());
-        assertEquals(2000, cp.getMinEvictableIdleTimeMillis());
-        assertEquals(3000, cp.getSoftMinEvictableIdleTimeMillis());
+        assertEquals(Duration.ofSeconds(1), 
cp.getDurationBetweenEvictionRuns());
+        assertEquals(Duration.ofSeconds(2), cp.getMinEvictableIdleDuration());
+        assertEquals(Duration.ofSeconds(3), 
cp.getSoftMinEvictableIdleDuration());
         assertEquals(2, cp.getNumTestsPerEvictionRun());
         assertTrue(cp.getTestWhileIdle());
         assertTrue(cp.getRemoveAbandonedOnBorrow());
         assertTrue(cp.getRemoveAbandonedOnMaintenance());
-        assertEquals(3000, cp.getRemoveAbandonedTimeout());
+        assertEquals(Duration.ofSeconds(3000), 
cp.getRemoveAbandonedTimeoutDuration());
         assertTrue(cp.getLogAbandoned());
         assertTrue(cp.getLifo());
     }