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 2025/11/29 15:24:29 UTC
(commons-pool) branch POOL_2_X updated (a205ed90 -> 0af8f39f)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
from a205ed90 Reduce visibility of some package private class' methods
new 310f7ca8 Type to the interface where we can
new b8decf85 Reduce visibility of some package private class' methods
new 0af8f39f Reduce visibility of some private class' methods
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/pool2/impl/GenericKeyedObjectPool.java | 25 +++++++++++-----------
.../pool2/impl/InterruptibleReentrantLock.java | 6 +++---
.../pool2/impl/SoftReferenceObjectPool.java | 4 ++--
3 files changed, 18 insertions(+), 17 deletions(-)
(commons-pool) 02/03: Reduce visibility of some package private class' methods
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit b8decf85831b0ece3401bdf39c233440f8ff9b5b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 29 15:15:00 2025 +0000
Reduce visibility of some package private class' methods
---
.../java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
index f99bd3f3..4d9ac043 100644
--- a/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Optional;
+import java.util.concurrent.BlockingDeque;
import org.apache.commons.pool2.BaseObjectPool;
import org.apache.commons.pool2.ObjectPool;
@@ -62,8 +63,7 @@ public class SoftReferenceObjectPool<T> extends BaseObjectPool<T> {
private long createCount; // @GuardedBy("this")
/** Idle references - waiting to be borrowed */
- private final LinkedBlockingDeque<PooledSoftReference<T>> idleReferences =
- new LinkedBlockingDeque<>();
+ private final BlockingDeque<PooledSoftReference<T>> idleReferences = new LinkedBlockingDeque<>();
/** All references - checked out or waiting to be borrowed. */
private final ArrayList<PooledSoftReference<T>> allReferences =
(commons-pool) 01/03: Type to the interface where we can
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit 310f7ca80f14e7a3fa240fbe5add2e87c7c72f08
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 29 15:08:42 2025 +0000
Type to the interface where we can
---
.../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
index 82cfda09..5abe74d0 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -28,6 +28,7 @@ import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.TreeMap;
+import java.util.concurrent.BlockingDeque;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -310,7 +311,7 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T>
private void addIdleObject(final K key, final PooledObject<T> p) throws Exception {
if (PooledObject.nonNull(p)) {
factory.passivateObject(key, p);
- final LinkedBlockingDeque<PooledObject<T>> idleObjects = poolMap.get(key).getIdleObjects();
+ final BlockingDeque<PooledObject<T>> idleObjects = poolMap.get(key).getIdleObjects();
if (getLifo()) {
idleObjects.addFirst(p);
} else {
@@ -697,7 +698,7 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T>
final ObjectDeque<T> objectDeque = register(key);
int freedCapacity = 0;
try {
- final LinkedBlockingDeque<PooledObject<T>> idleObjects = objectDeque.getIdleObjects();
+ final BlockingDeque<PooledObject<T>> idleObjects = objectDeque.getIdleObjects();
PooledObject<T> p = idleObjects.poll();
while (p != null) {
try {
@@ -1629,7 +1630,7 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T>
}
final int maxIdle = getMaxIdlePerKey();
- final LinkedBlockingDeque<PooledObject<T>> idleObjects = objectDeque.getIdleObjects();
+ final BlockingDeque<PooledObject<T>> idleObjects = objectDeque.getIdleObjects();
if (isClosed() || maxIdle > -1 && maxIdle <= idleObjects.size()) {
try {
@@ -1674,7 +1675,7 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T>
private void reuseCapacity() {
final int maxTotalPerKeySave = getMaxTotalPerKey();
int maxQueueLength = 0;
- LinkedBlockingDeque<PooledObject<T>> mostLoadedPool = null;
+ BlockingDeque<PooledObject<T>> mostLoadedPool = null;
K mostLoadedKey = null;
// Find the most loaded pool that could take a new instance
(commons-pool) 03/03: Reduce visibility of some private class' methods
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit 0af8f39f585a599298d17ffa1920560df854d5ff
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 29 15:24:23 2025 +0000
Reduce visibility of some private class' methods
Javadoc
---
.../commons/pool2/impl/GenericKeyedObjectPool.java | 16 ++++++++--------
.../commons/pool2/impl/InterruptibleReentrantLock.java | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
index 5abe74d0..494ca291 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -135,9 +135,9 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T>
/**
* Gets all the objects for the current key.
*
- * @return All the objects
+ * @return All the objects.
*/
- public Map<IdentityWrapper<S>, PooledObject<S>> getAllObjects() {
+ Map<IdentityWrapper<S>, PooledObject<S>> getAllObjects() {
return allObjects;
}
@@ -145,27 +145,27 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T>
* Gets the number of instances created - number destroyed.
* Should always be less than or equal to maxTotalPerKey.
*
- * @return The net instance addition count for this deque
+ * @return The net instance addition count for this deque.
*/
- public AtomicInteger getCreateCount() {
+ AtomicInteger getCreateCount() {
return createCount;
}
/**
* Gets the idle objects for the current key.
*
- * @return The idle objects
+ * @return The idle objects.
*/
- public LinkedBlockingDeque<PooledObject<S>> getIdleObjects() {
+ LinkedBlockingDeque<PooledObject<S>> getIdleObjects() {
return idleObjects;
}
/**
* Gets the number of threads with an interest registered in this key.
*
- * @return The number of threads with a registered interest in this key
+ * @return The number of threads with a registered interest in this key.
*/
- public AtomicLong getNumInterested() {
+ AtomicLong getNumInterested() {
return numInterested;
}
diff --git a/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java b/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java
index 525877b5..52824da9 100644
--- a/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java
+++ b/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java
@@ -37,18 +37,18 @@ final class InterruptibleReentrantLock extends ReentrantLock {
* Constructs a new InterruptibleReentrantLock with the given fairness policy.
*
* @param fairness true means threads should acquire contended locks as if
- * waiting in a FIFO queue
+ * waiting in a FIFO queue.
*/
InterruptibleReentrantLock(final boolean fairness) {
super(fairness);
}
/**
- * Interrupts the threads that are waiting on a specific condition
+ * Interrupts the threads that are waiting on a specific condition.
*
* @param condition the condition on which the threads are waiting.
*/
- public void interruptWaiters(final Condition condition) {
+ void interruptWaiters(final Condition condition) {
getWaitingThreads(condition).forEach(Thread::interrupt);
}
}