Add org.apache.commons.pool2.PooledObject.getObject(PooledObject)

Author: garydgregory

src/main/java/org/apache/commons/pool3/PooledObject.java

@@ -34,25 +34,37 @@
 public interface PooledObject<T> extends Comparable<PooledObject<T>> {
 
     /**
-     * Tests whether the given PooledObject is null <em>or</em> contains a null.
+     * Gets the wrapped object or null.
      *
-     * @param pooledObject the PooledObject to test.
-     * @return whether the given PooledObject is null <em>or</em> contains a null.
+     * @param <T> the type of object in the pool.
+     * @param pooledObject the PooledObject to unwrap, may be null.
+     * @return the wrapped object or null.
+     * @since 2.13.0
+     */
+    static <T> T getObject(final PooledObject<T> pooledObject) {
+        return pooledObject != null ? pooledObject.getObject() : null;
+    }
+
+    /**
+     * Tests whether the given PooledObject is null <em>or</em> wraps a null.
+     *
+     * @param pooledObject the PooledObject to test, may be null.
+     * @return whether the given PooledObject is null <em>or</em> wraps a null.
      * @since 2.12.0
      */
     static boolean isNull(final PooledObject<?> pooledObject) {
-        return pooledObject == null || pooledObject.getObject() == null;
+        return getObject(pooledObject) == null;
     }
 
     /**
      * Tests whether the given PooledObject isn't null <em>and</em> doesn't wraps a null.
      *
-     * @param pooledObject the PooledObject to test.
+     * @param pooledObject the PooledObject to test, may be null.
      * @return whether the given PooledObject isn't null <em>and</em> doesn't wraps a null.
      * @since 2.13.0
      */
     static boolean nonNull(final PooledObject<?> pooledObject) {
-        return pooledObject != null && pooledObject.getObject() != null;
+        return getObject(pooledObject) != null;
     }
 
     /**

src/test/java/org/apache/commons/pool3/PooledObjectTest.java

@@ -18,6 +18,8 @@
 package org.apache.commons.pool3;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.pool3.impl.DefaultPooledObject;
@@ -28,6 +30,13 @@
  */
 public class PooledObjectTest {
 
+    @Test
+    void testGetObject() {
+        assertNull(PooledObject.getObject(null));
+        assertNull(PooledObject.getObject(new DefaultPooledObject<>(null)));
+        assertNotNull(PooledObject.getObject(new DefaultPooledObject<>("a")));
+    }
+
     @Test
     void testIsNull() {
         assertTrue(PooledObject.isNull(null));