This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 10e096da384128745574488625c6202912f0b00a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 3 12:44:51 2023 +0100
Fix deprecation warnings in DBCP after Pool update to 2.12.0
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 14 +++++++-------
.../tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 6 +++---
.../dbcp/dbcp2/datasources/InstanceKeyDataSource.java | 2 +-
.../dbcp/dbcp2/datasources/PerUserPoolDataSource.java | 6 +++---
.../dbcp/dbcp2/datasources/SharedPoolDataSource.java | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index a9cf96761c..fcd65d5f0d 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -256,7 +256,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* The number of milliseconds to sleep between runs of the idle object
evictor thread. When non-positive, no idle
* object evictor thread will be run.
*/
- private Duration durationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS;
+ private Duration durationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_DURATION_BETWEEN_EVICTION_RUNS;
/**
* The number of objects to examine during each run of the idle object
evictor thread (if any).
@@ -492,8 +492,8 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
gop.setTestOnBorrow(testOnBorrow);
gop.setTestOnReturn(testOnReturn);
gop.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
- gop.setMinEvictableIdle(minEvictableIdleDuration);
- gop.setSoftMinEvictableIdle(softMinEvictableIdleDuration);
+ gop.setMinEvictableIdleDuration(minEvictableIdleDuration);
+ gop.setSoftMinEvictableIdleDuration(softMinEvictableIdleDuration);
gop.setTestWhileIdle(testWhileIdle);
gop.setLifo(lifo);
gop.setSwallowedExceptionListener(new SwallowedExceptionLogger(log,
logExpiredConnections));
@@ -2255,7 +2255,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*/
public synchronized void setMinEvictableIdle(final Duration
minEvictableIdleDuration) {
this.minEvictableIdleDuration = minEvictableIdleDuration;
- setConnectionPool(GenericObjectPool::setMinEvictableIdle,
minEvictableIdleDuration);
+ setConnectionPool(GenericObjectPool::setMinEvictableIdleDuration,
minEvictableIdleDuration);
}
/**
@@ -2396,7 +2396,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*/
public synchronized void setSoftMinEvictableIdle(final Duration
softMinEvictableIdleTimeMillis) {
this.softMinEvictableIdleDuration = softMinEvictableIdleTimeMillis;
- setConnectionPool(GenericObjectPool::setSoftMinEvictableIdle,
softMinEvictableIdleTimeMillis);
+ setConnectionPool(GenericObjectPool::setSoftMinEvictableIdleDuration,
softMinEvictableIdleTimeMillis);
}
/**
@@ -2467,7 +2467,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*/
public synchronized void setDurationBetweenEvictionRuns(final Duration
timeBetweenEvictionRunsMillis) {
this.durationBetweenEvictionRuns = timeBetweenEvictionRunsMillis;
- setConnectionPool(GenericObjectPool::setTimeBetweenEvictionRuns,
timeBetweenEvictionRunsMillis);
+ setConnectionPool(GenericObjectPool::setDurationBetweenEvictionRuns,
timeBetweenEvictionRunsMillis);
}
/**
@@ -2585,7 +2585,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*/
protected void startPoolMaintenance() {
if (connectionPool != null &&
durationBetweenEvictionRuns.compareTo(Duration.ZERO) > 0) {
-
connectionPool.setTimeBetweenEvictionRuns(durationBetweenEvictionRuns);
+
connectionPool.setDurationBetweenEvictionRuns(durationBetweenEvictionRuns);
}
}
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index c875fc247f..3d93a50932 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -112,7 +112,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
// PreparedStatement pool properties
private boolean poolPreparedStatements;
private int maxIdle = 10;
- private Duration durationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS;
+ private Duration durationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_DURATION_BETWEEN_EVICTION_RUNS;
private int numTestsPerEvictionRun = -1;
private Duration minEvictableIdleDuration =
BaseObjectPoolConfig.DEFAULT_MIN_EVICTABLE_IDLE_DURATION;
@@ -418,7 +418,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
// evictor settings are the same as the connection pool
settings.
config.setTimeBetweenEvictionRuns(getDurationBetweenEvictionRuns());
config.setNumTestsPerEvictionRun(getNumTestsPerEvictionRun());
- config.setMinEvictableIdleTime(getMinEvictableIdleDuration());
+
config.setMinEvictableIdleDuration(getMinEvictableIdleDuration());
} else {
// Since there is a limit, create a prepared statement pool
without an eviction thread;
// pool has LRU functionality so when the limit is reached,
15% of the pool is cleared.
@@ -426,7 +426,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
config.setMaxTotal(getMaxPreparedStatements());
config.setTimeBetweenEvictionRuns(Duration.ofMillis(-1));
config.setNumTestsPerEvictionRun(0);
- config.setMinEvictableIdleTime(Duration.ZERO);
+ config.setMinEvictableIdleDuration(Duration.ZERO);
}
stmtPool = new GenericKeyedObjectPool<>(pooledConnection, config);
pooledConnection.setStatementPool(stmtPool);
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
index 4709d118ba..6ea4ed2a9d 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
@@ -126,7 +126,7 @@ public abstract class InstanceKeyDataSource implements
DataSource, Referenceable
private boolean defaultTestOnBorrow =
BaseObjectPoolConfig.DEFAULT_TEST_ON_BORROW;
private boolean defaultTestOnReturn =
BaseObjectPoolConfig.DEFAULT_TEST_ON_RETURN;
private boolean defaultTestWhileIdle =
BaseObjectPoolConfig.DEFAULT_TEST_WHILE_IDLE;
- private Duration defaultDurationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS;
+ private Duration defaultDurationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_DURATION_BETWEEN_EVICTION_RUNS;
// Connection factory properties
private String validationQuery;
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
index 6fe183f903..ef005ca847 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
@@ -723,15 +723,15 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
pool.setMaxIdle(getPerUserMaxIdle(userName));
pool.setMaxTotal(getPerUserMaxTotal(userName));
pool.setMaxWait(Duration.ofMillis(getPerUserMaxWaitMillis(userName)));
- pool.setMinEvictableIdle(getPerUserMinEvictableIdleDuration(userName));
+
pool.setMinEvictableIdleDuration(getPerUserMinEvictableIdleDuration(userName));
pool.setMinIdle(getPerUserMinIdle(userName));
pool.setNumTestsPerEvictionRun(getPerUserNumTestsPerEvictionRun(userName));
-
pool.setSoftMinEvictableIdle(getPerUserSoftMinEvictableIdleDuration(userName));
+
pool.setSoftMinEvictableIdleDuration(getPerUserSoftMinEvictableIdleDuration(userName));
pool.setTestOnCreate(getPerUserTestOnCreate(userName));
pool.setTestOnBorrow(getPerUserTestOnBorrow(userName));
pool.setTestOnReturn(getPerUserTestOnReturn(userName));
pool.setTestWhileIdle(getPerUserTestWhileIdle(userName));
-
pool.setTimeBetweenEvictionRuns(getPerUserDurationBetweenEvictionRuns(userName));
+
pool.setDurationBetweenEvictionRuns(getPerUserDurationBetweenEvictionRuns(userName));
pool.setSwallowedExceptionListener(new SwallowedExceptionLogger(log));
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
index 029868a377..7aaaa29cfb 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
@@ -177,10 +177,10 @@ public class SharedPoolDataSource extends
InstanceKeyDataSource {
config.setMaxTotal(getMaxTotal());
config.setMaxTotalPerKey(getDefaultMaxTotal());
config.setMaxWait(getDefaultMaxWait());
- config.setMinEvictableIdleTime(getDefaultMinEvictableIdleDuration());
+
config.setMinEvictableIdleDuration(getDefaultMinEvictableIdleDuration());
config.setMinIdlePerKey(getDefaultMinIdle());
config.setNumTestsPerEvictionRun(getDefaultNumTestsPerEvictionRun());
-
config.setSoftMinEvictableIdleTime(getDefaultSoftMinEvictableIdleDuration());
+
config.setSoftMinEvictableIdleDuration(getDefaultSoftMinEvictableIdleDuration());
config.setTestOnCreate(getDefaultTestOnCreate());
config.setTestOnBorrow(getDefaultTestOnBorrow());
config.setTestOnReturn(getDefaultTestOnReturn());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
