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-pool.git
The following commit(s) were added to refs/heads/master by this push:
new b08de2b Rename new method.
b08de2b is described below
commit b08de2b9c9469c42924dd77473f6b44a71efa3aa
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Aug 8 11:44:12 2021 -0400
Rename new method.
---
.../java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java | 7 ++++---
src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java | 2 +-
.../org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java | 4 ++--
.../java/org/apache/commons/pool2/impl/TestGenericObjectPool.java | 4 ++--
.../pool2/impl/TestGenericObjectPoolFactoryCreateFailure.java | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
b/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
index 5968f9a..173aafb 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
@@ -854,11 +854,11 @@ public abstract class BaseObjectPoolConfig<T> extends
BaseObject implements Clon
*
* @see GenericObjectPool#getMaxWaitDuration()
* @see GenericKeyedObjectPool#getMaxWaitDuration()
- * @deprecated Use {@link #setMaxWaitDuration(Duration)}.
+ * @deprecated Use {@link #setMaxWait(Duration)}.
*/
@Deprecated
public void setMaxWaitMillis(final long maxWaitMillis) {
- setMaxWaitDuration(Duration.ofMillis(maxWaitMillis));
+ setMaxWait(Duration.ofMillis(maxWaitMillis));
}
/**
@@ -870,8 +870,9 @@ public abstract class BaseObjectPoolConfig<T> extends
BaseObject implements Clon
*
* @see GenericObjectPool#getMaxWaitDuration()
* @see GenericKeyedObjectPool#getMaxWaitDuration()
+ * @since 2.11.0
*/
- public void setMaxWaitDuration(final Duration maxWaitDuration) {
+ public void setMaxWait(final Duration maxWaitDuration) {
this.maxWaitDuration = PoolImplUtils.nonNull(maxWaitDuration,
DEFAULT_MAX_WAIT);
}
diff --git a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
index 157faf5..120c2f0 100644
--- a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
+++ b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
@@ -115,7 +115,7 @@ public final class ObjectPoolIssue326 {
poolConfig.setMaxIdlePerKey(-1);
poolConfig.setLifo(true);
poolConfig.setFairness(true);
- poolConfig.setMaxWaitDuration(Duration.ofSeconds(30));
+ poolConfig.setMaxWait(Duration.ofSeconds(30));
poolConfig.setMinEvictableIdleTime(Duration.ofMillis(-1));
poolConfig.setSoftMinEvictableIdleTime(Duration.ofMillis(-1));
poolConfig.setNumTestsPerEvictionRun(1);
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
index 77cdecf..4c584b8 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -1222,7 +1222,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
config.setMaxIdlePerKey(maxIdle);
config.setMinIdlePerKey(minIdle);
config.setMaxTotal(maxTotal);
- config.setMaxWaitDuration(maxWaitDuration);
+ config.setMaxWait(maxWaitDuration);
config.setMinEvictableIdleTime(Duration.ofMillis(minEvictableIdleTimeMillis));
config.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
config.setTestOnBorrow(testOnBorrow);
@@ -1672,7 +1672,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
config.setMaxTotal(2);
config.setBlockWhenExhausted(true);
config.setMinIdlePerKey(0);
- config.setMaxWaitDuration(Duration.ofMillis(-1));
+ config.setMaxWait(Duration.ofMillis(-1));
config.setNumTestsPerEvictionRun(Integer.MAX_VALUE); // always test
all idle objects
config.setTestOnBorrow(true);
config.setTestOnReturn(false);
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
index 7de9ec6..dcad0ac 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -1323,7 +1323,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
config.setMaxIdle(maxIdle);
config.setMinIdle(minIdle);
config.setMaxTotal(maxTotal);
- config.setMaxWaitDuration(maxWaitDuration);
+ config.setMaxWait(maxWaitDuration);
config.setMinEvictableIdleTimeMillis(minEvictableIdleMillis);
assertEquals(minEvictableIdleMillis,
config.getMinEvictableIdleTime().toMillis());
config.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
@@ -2651,7 +2651,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
assertConfiguration(expected,genericObjectPool);
expected.setMaxTotal(2);
expected.setMaxIdle(3);
- expected.setMaxWaitDuration(Duration.ofMillis(5));
+ expected.setMaxWait(Duration.ofMillis(5));
expected.setMinEvictableIdleTime(Duration.ofMillis(7L));
expected.setNumTestsPerEvictionRun(9);
expected.setTestOnCreate(true);
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolFactoryCreateFailure.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolFactoryCreateFailure.java
index dcf02dd..0435252 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolFactoryCreateFailure.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolFactoryCreateFailure.java
@@ -119,7 +119,7 @@ public class TestGenericObjectPoolFactoryCreateFailure {
config.setMinEvictableIdleTime(NEG_ONE_DURATION);
config.setSoftMinEvictableIdleTime(NEG_ONE_DURATION);
- config.setMaxWaitDuration(NEG_ONE_DURATION);
+ config.setMaxWait(NEG_ONE_DURATION);
try (GenericObjectPool<Object> pool = new GenericObjectPool<>(factory,
config)) {
final AtomicBoolean failed = new AtomicBoolean();
