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/05/27 12:21:39 UTC
[commons-pool] branch master updated: Use Objects.equals() (#81)
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 651410b Use Objects.equals() (#81)
651410b is described below
commit 651410ba72aa68de04e2de4cfadd79aed954fef0
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu May 27 14:21:29 2021 +0200
Use Objects.equals() (#81)
Use Anonymous type
Use method reference instead Lambda
Replace Loop with Collection.removeIf()
---
src/test/java/org/apache/commons/pool2/MethodCall.java | 7 ++++---
src/test/java/org/apache/commons/pool2/TestObjectPool.java | 8 +-------
.../org/apache/commons/pool2/impl/TestGenericObjectPool.java | 9 +--------
.../commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java | 4 ++--
.../apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java | 4 ++--
5 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/src/test/java/org/apache/commons/pool2/MethodCall.java b/src/test/java/org/apache/commons/pool2/MethodCall.java
index 9e8a3fb..477ea5e 100644
--- a/src/test/java/org/apache/commons/pool2/MethodCall.java
+++ b/src/test/java/org/apache/commons/pool2/MethodCall.java
@@ -20,6 +20,7 @@ package org.apache.commons.pool2;
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 class MethodCall {
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
index 04fe917..c626d49 100644
--- a/src/test/java/org/apache/commons/pool2/TestObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestObjectPool.java
@@ -41,13 +41,7 @@ public abstract class TestObjectPool {
}
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
index 0ab031c..621970b 100644
--- 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 class TestGenericObjectPool extends TestBaseObjectPool {
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
index 668d584..8513e5d 100644
--- 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 abstract class BaseTestProxiedKeyedObjectPool {
assertNotNull(obj);
assertThrows(IllegalStateException.class,
- () -> obj.getData() );
+ obj::getData);
}
@@ -147,7 +147,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
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
index b6b22c8..ab0544d 100644
--- 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 abstract class BaseTestProxiedObjectPool {
assertNotNull(obj);
assertThrows(IllegalStateException.class,
- () -> obj.getData());
+ obj::getData);
}
@@ -141,7 +141,7 @@ public abstract class BaseTestProxiedObjectPool {
assertNotNull(obj);
assertThrows(IllegalStateException.class,
- () -> obj.getData());
+ obj::getData);
}