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 2019/10/22 22:30:58 UTC
[commons-pool] branch master updated (3ca09a7 -> 2d20492)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-pool.git.
from 3ca09a7 End file in an EOL.
new 479bd95 Use diamonds.
new 2d20492 - Use for each loop in test. - Remove unused import in test.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/commons/pool2/MethodCallPoolableObjectFactory.java | 2 +-
src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java | 2 +-
src/test/java/org/apache/commons/pool2/TestObjectPool.java | 1 -
.../org/apache/commons/pool2/impl/TestAbandonedObjectPool.java | 7 +++----
.../org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java | 4 ++--
5 files changed, 7 insertions(+), 9 deletions(-)
[commons-pool] 01/02: Use diamonds.
Posted by gg...@apache.org.
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 479bd9574de9a7c87e9bb0719e547852c8deb112
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Oct 22 18:28:31 2019 -0400
Use diamonds.
---
.../org/apache/commons/pool2/MethodCallPoolableObjectFactory.java | 2 +-
src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java | 2 +-
.../org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java b/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
index edbdee0..7e1a39d 100644
--- a/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
+++ b/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
@@ -120,7 +120,7 @@ public class MethodCallPoolableObjectFactory implements PooledObjectFactory<Obje
// Generate new object, don't use cache via Integer.valueOf(...)
final Integer obj = new Integer(originalCount);
call.setReturned(obj);
- return new DefaultPooledObject<Object>(obj);
+ return new DefaultPooledObject<>(obj);
}
@Override
diff --git a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
index f8329e6..0405d64 100644
--- a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
@@ -760,7 +760,7 @@ public abstract class TestKeyedObjectPool {
// checks for a specific object
final Integer obj = new Integer(originalCount);
call.setReturned(obj);
- return new DefaultPooledObject<Object>(obj);
+ return new DefaultPooledObject<>(obj);
}
@Override
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
index 868b4c5..29a0cf0 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -1075,7 +1075,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
final int numThreads = 40;
final int maxTotal = 40;
- final GenericKeyedObjectPoolConfig<String> config = new GenericKeyedObjectPoolConfig<String>();
+ final GenericKeyedObjectPoolConfig<String> config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(maxTotal);
config.setFairness(true);
config.setLifo(false);
@@ -1092,7 +1092,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
// Start and park threads waiting to borrow objects
final TestThread[] threads = new TestThread[numThreads];
for(int i=0;i<numThreads;i++) {
- threads[i] = new TestThread<String>(gkoPool, 1, 0, 2000, false, "0" + String.valueOf(i % maxTotal), "0");
+ threads[i] = new TestThread<>(gkoPool, 1, 0, 2000, false, "0" + String.valueOf(i % maxTotal), "0");
final Thread t = new Thread(threads[i]);
t.start();
// Short delay to ensure threads start in correct order
[commons-pool] 02/02: - Use for each loop in test. - Remove unused
import in test.
Posted by gg...@apache.org.
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 2d2049233940b10c7dd35df70a353d383f601053
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Oct 22 18:30:46 2019 -0400
- Use for each loop in test.
- Remove unused import in test.
---
src/test/java/org/apache/commons/pool2/TestObjectPool.java | 1 -
.../org/apache/commons/pool2/impl/TestAbandonedObjectPool.java | 7 +++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/test/java/org/apache/commons/pool2/TestObjectPool.java b/src/test/java/org/apache/commons/pool2/TestObjectPool.java
index 3808ce0..3f317cb 100644
--- a/src/test/java/org/apache/commons/pool2/TestObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestObjectPool.java
@@ -22,7 +22,6 @@ import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.PooledObjectFactory;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
-import org.apache.commons.pool2.PoolUtils;
import org.junit.Test;
import java.util.List;
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
index 2b90d79..7579d2e 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
@@ -104,8 +104,8 @@ public class TestAbandonedObjectPool {
}
// Abandon all borrowed objects
- for (int i = 0; i < vec.size(); i++) {
- vec.get(i).setAbandoned(true);
+ for (final PooledTestObject element : vec) {
+ element.setAbandoned(true);
}
// Try launching a bunch of borrows concurrently. Abandoned sweep will be triggered for each.
@@ -122,8 +122,7 @@ public class TestAbandonedObjectPool {
}
// Return all objects that have not been destroyed
- for (int i = 0; i < vec.size(); i++) {
- final PooledTestObject pto = vec.get(i);
+ for (final PooledTestObject pto : vec) {
if (pto.isActive()) {
pool.returnObject(pto);
}