[commons-pool] branch master updated: Inline single use local variables.

[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-pool.git


The following commit(s) were added to refs/heads/master by this push:
     new 5d22148  Inline single use local variables.
5d22148 is described below

commit 5d22148500c5a7db1b170cd4e5efc8ed9beea6ed
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Mon Jun 28 16:04:17 2021 -0400

    Inline single use local variables.
---
 .../org/apache/commons/pool2/proxy/CglibProxySource.java    |  7 ++-----
 .../java/org/apache/commons/pool2/proxy/JdkProxySource.java | 13 ++++---------
 .../apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java  |  9 +++------
 .../org/apache/commons/pool2/proxy/ProxiedObjectPool.java   |  9 +++------
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java 
b/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
index d825e8b..56613d9 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
@@ -41,6 +41,7 @@ public class CglibProxySource<T> implements ProxySource<T> {
         this.superclass = superclass;
     }
 
+    @SuppressWarnings("unchecked") // Case to T on return
     @Override
     public T createProxy(final T pooledObject, final UsageTracking<T> 
usageTracking) {
         final Enhancer enhancer = new Enhancer();
@@ -50,11 +51,7 @@ public class CglibProxySource<T> implements ProxySource<T> {
                 new CglibProxyHandler<>(pooledObject, usageTracking);
         enhancer.setCallback(proxyInterceptor);
 
-        @SuppressWarnings("unchecked")
-        final
-        T proxy = (T) enhancer.create();
-
-        return proxy;
+        return (T) enhancer.create();
     }
 
 
diff --git a/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java 
b/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
index f56620f..3915cce 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
@@ -48,23 +48,18 @@ public class JdkProxySource<T> implements ProxySource<T> {
     }
 
 
+    @SuppressWarnings("unchecked") // Cast to T on return.
     @Override
     public T createProxy(final T pooledObject, final UsageTracking<T> 
usageTracking) {
-        @SuppressWarnings("unchecked")
-        final
-        T proxy = (T) Proxy.newProxyInstance(classLoader, interfaces,
+        return (T) Proxy.newProxyInstance(classLoader, interfaces,
                 new JdkProxyHandler<>(pooledObject, usageTracking));
-        return proxy;
     }
 
 
+    @SuppressWarnings("unchecked")
     @Override
     public T resolveProxy(final T proxy) {
-        @SuppressWarnings("unchecked")
-        final
-        JdkProxyHandler<T> jdkProxyHandler =
-                (JdkProxyHandler<T>) Proxy.getInvocationHandler(proxy);
-        return jdkProxyHandler.disableProxy();
+        return ((JdkProxyHandler<T>) 
Proxy.getInvocationHandler(proxy)).disableProxy();
     }
 
 
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 e87ee74..a2e98e9 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
@@ -65,8 +65,7 @@ public class ProxiedKeyedObjectPool<K, V> implements 
KeyedObjectPool<K, V> {
         if (pool instanceof UsageTracking) {
             usageTracking = (UsageTracking<V>) pool;
         }
-        final V pooledObject = pool.borrowObject(key);
-        return proxySource.createProxy(pooledObject, usageTracking);
+        return proxySource.createProxy(pool.borrowObject(key), usageTracking);
     }
 
     @Override
@@ -106,14 +105,12 @@ public class ProxiedKeyedObjectPool<K, V> implements 
KeyedObjectPool<K, V> {
 
     @Override
     public void invalidateObject(final K key, final V proxy) throws Exception {
-        final V pooledObject = proxySource.resolveProxy(proxy);
-        pool.invalidateObject(key, pooledObject);
+        pool.invalidateObject(key, proxySource.resolveProxy(proxy));
     }
 
     @Override
     public void returnObject(final K key, final V proxy) throws Exception {
-        final V pooledObject = proxySource.resolveProxy(proxy);
-        pool.returnObject(key, pooledObject);
+        pool.returnObject(key, proxySource.resolveProxy(proxy));
     }
 
 
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 60785b3..e725d22 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
@@ -63,8 +63,7 @@ public class ProxiedObjectPool<T> implements ObjectPool<T> {
         if (pool instanceof UsageTracking) {
             usageTracking = (UsageTracking<T>) pool;
         }
-        final T pooledObject = pool.borrowObject();
-        return proxySource.createProxy(pooledObject, usageTracking);
+        return proxySource.createProxy(pool.borrowObject(), usageTracking);
     }
 
 
@@ -94,15 +93,13 @@ public class ProxiedObjectPool<T> implements ObjectPool<T> {
 
     @Override
     public void invalidateObject(final T proxy) throws Exception {
-        final T pooledObject = proxySource.resolveProxy(proxy);
-        pool.invalidateObject(pooledObject);
+        pool.invalidateObject(proxySource.resolveProxy(proxy));
     }
 
 
     @Override
     public void returnObject(final T proxy) throws Exception {
-        final T pooledObject = proxySource.resolveProxy(proxy);
-        pool.returnObject(pooledObject);
+        pool.returnObject(proxySource.resolveProxy(proxy));
     }
 
     /**