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 2021/02/15 22:15:34 UTC
[commons-pool] 02/06: Sort members.
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
commit 52ae00d4ec5eda73564e349f52957d8045d8356c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Feb 15 14:11:11 2021 -0500
Sort members.
---
.../commons/pool2/proxy/BaseProxyHandler.java | 48 +++++++++++-----------
.../pool2/proxy/ProxiedKeyedObjectPool.java | 44 ++++++++++----------
.../commons/pool2/proxy/ProxiedObjectPool.java | 38 ++++++++---------
3 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java b/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java
index b7caf4e..26c571a 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java
@@ -49,16 +49,6 @@ class BaseProxyHandler<T> {
/**
- * Obtain the wrapped, pooled object.
- *
- * @return the underlying pooled object
- */
- T getPooledObject() {
- return pooledObject;
- }
-
-
- /**
* Disable the proxy wrapper. Called when the object has been returned to
* the pool. Further use of the wrapper should result in an
* {@link IllegalStateException}.
@@ -73,20 +63,6 @@ class BaseProxyHandler<T> {
/**
- * Check that the proxy is still valid (i.e. that {@link #disableProxy()}
- * has not been called).
- *
- * @throws IllegalStateException if {@link #disableProxy()} has been called
- */
- void validateProxiedObject() {
- if (pooledObject == null) {
- throw new IllegalStateException("This object may no longer be " +
- "used as it has been returned to the Object Pool.");
- }
- }
-
-
- /**
* Invoke the given method on the wrapped object.
*
* @param method The method to invoke
@@ -105,6 +81,16 @@ class BaseProxyHandler<T> {
/**
+ * Obtain the wrapped, pooled object.
+ *
+ * @return the underlying pooled object
+ */
+ T getPooledObject() {
+ return pooledObject;
+ }
+
+
+ /**
* @since 2.4.3
*/
@Override
@@ -118,4 +104,18 @@ class BaseProxyHandler<T> {
builder.append("]");
return builder.toString();
}
+
+
+ /**
+ * Check that the proxy is still valid (i.e. that {@link #disableProxy()}
+ * has not been called).
+ *
+ * @throws IllegalStateException if {@link #disableProxy()} has been called
+ */
+ void validateProxiedObject() {
+ if (pooledObject == null) {
+ throw new IllegalStateException("This object may no longer be " +
+ "used as it has been returned to the Object Pool.");
+ }
+ }
}
diff --git a/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java b/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
index fa6b8f9..a8f5eca 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
@@ -51,6 +51,12 @@ public class ProxiedKeyedObjectPool<K, V> implements KeyedObjectPool<K, V> {
}
+ @Override
+ public void addObject(final K key) throws Exception, IllegalStateException,
+ UnsupportedOperationException {
+ pool.addObject(key);
+ }
+
@SuppressWarnings("unchecked")
@Override
public V borrowObject(final K key) throws Exception, NoSuchElementException,
@@ -65,26 +71,23 @@ public class ProxiedKeyedObjectPool<K, V> implements KeyedObjectPool<K, V> {
}
@Override
- public void returnObject(final K key, final V proxy) throws Exception {
- final V pooledObject = proxySource.resolveProxy(proxy);
- pool.returnObject(key, pooledObject);
+ public void clear() throws Exception, UnsupportedOperationException {
+ pool.clear();
}
@Override
- public void invalidateObject(final K key, final V proxy) throws Exception {
- final V pooledObject = proxySource.resolveProxy(proxy);
- pool.invalidateObject(key, pooledObject);
+ public void clear(final K key) throws Exception, UnsupportedOperationException {
+ pool.clear(key);
}
@Override
- public void addObject(final K key) throws Exception, IllegalStateException,
- UnsupportedOperationException {
- pool.addObject(key);
+ public void close() {
+ pool.close();
}
@Override
- public int getNumIdle(final K key) {
- return pool.getNumIdle(key);
+ public int getNumActive() {
+ return pool.getNumActive();
}
@Override
@@ -98,23 +101,20 @@ public class ProxiedKeyedObjectPool<K, V> implements KeyedObjectPool<K, V> {
}
@Override
- public int getNumActive() {
- return pool.getNumActive();
- }
-
- @Override
- public void clear() throws Exception, UnsupportedOperationException {
- pool.clear();
+ public int getNumIdle(final K key) {
+ return pool.getNumIdle(key);
}
@Override
- public void clear(final K key) throws Exception, UnsupportedOperationException {
- pool.clear(key);
+ public void invalidateObject(final K key, final V proxy) throws Exception {
+ final V pooledObject = proxySource.resolveProxy(proxy);
+ pool.invalidateObject(key, pooledObject);
}
@Override
- public void close() {
- pool.close();
+ public void returnObject(final K key, final V proxy) throws Exception {
+ final V pooledObject = proxySource.resolveProxy(proxy);
+ pool.returnObject(key, pooledObject);
}
diff --git a/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java b/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
index 5496342..b9715da 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
@@ -51,6 +51,13 @@ public class ProxiedObjectPool<T> implements ObjectPool<T> {
// --------------------------------------------------- ObjectPool<T> methods
+ @Override
+ public void addObject() throws Exception, IllegalStateException,
+ UnsupportedOperationException {
+ pool.addObject();
+ }
+
+
@SuppressWarnings("unchecked")
@Override
public T borrowObject() throws Exception, NoSuchElementException,
@@ -66,23 +73,20 @@ public class ProxiedObjectPool<T> implements ObjectPool<T> {
@Override
- public void returnObject(final T proxy) throws Exception {
- final T pooledObject = proxySource.resolveProxy(proxy);
- pool.returnObject(pooledObject);
+ public void clear() throws Exception, UnsupportedOperationException {
+ pool.clear();
}
@Override
- public void invalidateObject(final T proxy) throws Exception {
- final T pooledObject = proxySource.resolveProxy(proxy);
- pool.invalidateObject(pooledObject);
+ public void close() {
+ pool.close();
}
@Override
- public void addObject() throws Exception, IllegalStateException,
- UnsupportedOperationException {
- pool.addObject();
+ public int getNumActive() {
+ return pool.getNumActive();
}
@@ -93,20 +97,16 @@ public class ProxiedObjectPool<T> implements ObjectPool<T> {
@Override
- public int getNumActive() {
- return pool.getNumActive();
- }
-
-
- @Override
- public void clear() throws Exception, UnsupportedOperationException {
- pool.clear();
+ public void invalidateObject(final T proxy) throws Exception {
+ final T pooledObject = proxySource.resolveProxy(proxy);
+ pool.invalidateObject(pooledObject);
}
@Override
- public void close() {
- pool.close();
+ public void returnObject(final T proxy) throws Exception {
+ final T pooledObject = proxySource.resolveProxy(proxy);
+ pool.returnObject(pooledObject);
}