Use Objects.equals()

Use Anonymous type Use method reference instead Lambda Replace Loop with Collection.removeIf()
apache · May 27, 2021 · fa1012f · fa1012f
1 parent 1077d2b
commit fa1012f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/src/test/java/org/apache/commons/pool2/MethodCall.java b/src/test/java/org/apache/commons/pool2/MethodCall.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Collections;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * Holds method names, parameters, and return values for tracing method calls.
@@ -64,13 +65,13 @@ public boolean equals(final Object o) {
 
         final MethodCall that = (MethodCall)o;
 
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (!Objects.equals(name, that.name)) {
             return false;
         }
-        if (params != null ? !params.equals(that.params) : that.params != null) {
+        if (!Objects.equals(params, that.params)) {
             return false;
         }
-        return returned != null ? returned.equals(that.returned) : that.returned == null;
+        return Objects.equals(returned, that.returned);
     }
 
     public String getName() {

diff --git a/src/test/java/org/apache/commons/pool2/TestObjectPool.java b/src/test/java/org/apache/commons/pool2/TestObjectPool.java
@@ -41,13 +41,7 @@ private static void clear(final MethodCallPoolableObjectFactory factory, final L
     }
 
     static void removeDestroyObjectCall(final List<MethodCall> calls) {
-        final Iterator<MethodCall> iter = calls.iterator();
-        while (iter.hasNext()) {
-            final MethodCall call = iter.next();
-            if ("destroyObject".equals(call.getName())) {
-                iter.remove();
-            }
-        }
+        calls.removeIf(call -> "destroyObject".equals(call.getName()));
     }
 
     private static void reset(final ObjectPool<Object> pool, final MethodCallPoolableObjectFactory factory, final List<MethodCall> expectedMethods) throws Exception {

diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -2562,14 +2562,7 @@ public void testReturnObject() throws Exception {
         assertEquals(1, genericObjectPool.getNumActive());
         assertEquals(0, genericObjectPool.getNumIdle());
 
-        final Thread t = new Thread() {
-
-            @Override
-            public void run() {
-                genericObjectPool.close();
-            }
-
-        };
+        final Thread t = new Thread(() -> genericObjectPool.close());
         t.start();
 
         genericObjectPool.returnObject(active);

diff --git a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
@@ -129,7 +129,7 @@ public void testAccessAfterInvalidate() throws Exception {
         assertNotNull(obj);
 
         assertThrows(IllegalStateException.class,
-                () -> obj.getData() );
+                obj::getData);
 
     }
 
@@ -147,7 +147,7 @@ public void testAccessAfterReturn() throws Exception {
 
         assertNotNull(obj);
         assertThrows(IllegalStateException.class,
-                () -> obj.getData());
+                obj::getData);
     }
 
     @Test

diff --git a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
@@ -122,7 +122,7 @@ public void testAccessAfterInvalidate() throws Exception {
         assertNotNull(obj);
 
         assertThrows(IllegalStateException.class,
-                () -> obj.getData());
+                obj::getData);
 
     }
 
@@ -141,7 +141,7 @@ public void testAccessAfterReturn() throws Exception {
         assertNotNull(obj);
 
         assertThrows(IllegalStateException.class,
-                () -> obj.getData());
+                obj::getData);
     }