From 125bd8a2fc6a818d3b604276cae187e91d7b3a47 Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 22 Sep 2017 09:16:12 +0200 Subject: [PATCH] Changed package name. The standard package naming convention with CamelCase is consistent across projects. --- src/dorkbox/{objectpool => objectPool}/BlockingPool.java | 6 +++++- src/dorkbox/{objectpool => objectPool}/NonBlockingPool.java | 6 +++++- .../{objectpool => objectPool}/NonBlockingSoftPool.java | 6 +++++- src/dorkbox/{objectpool => objectPool}/ObjectPool.java | 2 +- src/dorkbox/{objectpool => objectPool}/Pool.java | 2 +- src/dorkbox/{objectpool => objectPool}/PoolableObject.java | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) rename src/dorkbox/{objectpool => objectPool}/BlockingPool.java (96%) rename src/dorkbox/{objectpool => objectPool}/NonBlockingPool.java (96%) rename src/dorkbox/{objectpool => objectPool}/NonBlockingSoftPool.java (96%) rename src/dorkbox/{objectpool => objectPool}/ObjectPool.java (99%) rename src/dorkbox/{objectpool => objectPool}/Pool.java (98%) rename src/dorkbox/{objectpool => objectPool}/PoolableObject.java (97%) diff --git a/src/dorkbox/objectpool/BlockingPool.java b/src/dorkbox/objectPool/BlockingPool.java similarity index 96% rename from src/dorkbox/objectpool/BlockingPool.java rename to src/dorkbox/objectPool/BlockingPool.java index ab61f27..d448bb0 100644 --- a/src/dorkbox/objectpool/BlockingPool.java +++ b/src/dorkbox/objectPool/BlockingPool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.objectpool; +package dorkbox.objectPool; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -48,6 +48,7 @@ class BlockingPool extends ObjectPool { *

* This method catches {@link InterruptedException} and discards it silently. */ + @Override public T take() { try { @@ -60,6 +61,7 @@ class BlockingPool extends ObjectPool { /** * Takes an object from the pool, Blocks until an item is available in the pool. */ + @Override public T takeInterruptibly() throws InterruptedException { final T take = this.queue.take(); @@ -70,6 +72,7 @@ class BlockingPool extends ObjectPool { /** * Return object to the pool, waking the threads that have blocked during take() */ + @Override public void put(T object) { poolableObject.onReturn(object); @@ -79,6 +82,7 @@ class BlockingPool extends ObjectPool { /** * @return a new object instance created by the pool. */ + @Override public T newInstance() { return poolableObject.create(); diff --git a/src/dorkbox/objectpool/NonBlockingPool.java b/src/dorkbox/objectPool/NonBlockingPool.java similarity index 96% rename from src/dorkbox/objectpool/NonBlockingPool.java rename to src/dorkbox/objectPool/NonBlockingPool.java index f0e4a58..ad984b4 100644 --- a/src/dorkbox/objectpool/NonBlockingPool.java +++ b/src/dorkbox/objectPool/NonBlockingPool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.objectpool; +package dorkbox.objectPool; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; @@ -41,6 +41,7 @@ class NonBlockingPool extends ObjectPool { /** * Takes an object from the pool, Blocks until an item is available in the pool. */ + @Override public T take() { T take = this.queue.poll(); @@ -57,6 +58,7 @@ class NonBlockingPool extends ObjectPool { *

* This method catches {@link InterruptedException} and discards it silently. */ + @Override public T takeInterruptibly() throws InterruptedException { return take(); @@ -65,6 +67,7 @@ class NonBlockingPool extends ObjectPool { /** * Return object to the pool, waking the threads that have blocked during take() */ + @Override public void put(T object) { poolableObject.onReturn(object); @@ -74,6 +77,7 @@ class NonBlockingPool extends ObjectPool { /** * @return a new object instance created by the pool. */ + @Override public T newInstance() { return poolableObject.create(); diff --git a/src/dorkbox/objectpool/NonBlockingSoftPool.java b/src/dorkbox/objectPool/NonBlockingSoftPool.java similarity index 96% rename from src/dorkbox/objectpool/NonBlockingSoftPool.java rename to src/dorkbox/objectPool/NonBlockingSoftPool.java index d316d6e..dcbe104 100644 --- a/src/dorkbox/objectpool/NonBlockingSoftPool.java +++ b/src/dorkbox/objectPool/NonBlockingSoftPool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.objectpool; +package dorkbox.objectPool; import java.lang.ref.SoftReference; import java.util.Queue; @@ -41,6 +41,7 @@ class NonBlockingSoftPool extends ObjectPool { /** * Takes an object from the pool. */ + @Override public T take() { T obj; @@ -60,6 +61,7 @@ class NonBlockingSoftPool extends ObjectPool { /** * Takes an object from the pool. */ + @Override public T takeInterruptibly() throws InterruptedException { return take(); @@ -68,6 +70,7 @@ class NonBlockingSoftPool extends ObjectPool { /** * Return object to the pool. */ + @Override public void put(T object) { poolableObject.onReturn(object); @@ -77,6 +80,7 @@ class NonBlockingSoftPool extends ObjectPool { /** * @return a new object instance created by the pool. */ + @Override public T newInstance() { return poolableObject.create(); diff --git a/src/dorkbox/objectpool/ObjectPool.java b/src/dorkbox/objectPool/ObjectPool.java similarity index 99% rename from src/dorkbox/objectpool/ObjectPool.java rename to src/dorkbox/objectPool/ObjectPool.java index 0209c27..52513a4 100644 --- a/src/dorkbox/objectpool/ObjectPool.java +++ b/src/dorkbox/objectPool/ObjectPool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.objectpool; +package dorkbox.objectPool; import java.lang.ref.SoftReference; import java.util.Queue; diff --git a/src/dorkbox/objectpool/Pool.java b/src/dorkbox/objectPool/Pool.java similarity index 98% rename from src/dorkbox/objectpool/Pool.java rename to src/dorkbox/objectPool/Pool.java index c81986d..15187a2 100644 --- a/src/dorkbox/objectpool/Pool.java +++ b/src/dorkbox/objectPool/Pool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.objectpool; +package dorkbox.objectPool; /** * @author dorkbox, llc diff --git a/src/dorkbox/objectpool/PoolableObject.java b/src/dorkbox/objectPool/PoolableObject.java similarity index 97% rename from src/dorkbox/objectpool/PoolableObject.java rename to src/dorkbox/objectPool/PoolableObject.java index 26ebf3c..7092dfb 100644 --- a/src/dorkbox/objectpool/PoolableObject.java +++ b/src/dorkbox/objectPool/PoolableObject.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.objectpool; +package dorkbox.objectPool; public abstract class PoolableObject {