svn commit: r1096371 - in /commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance: PerformanceTest.java SleepingObjectFactory.java

[si...@apache.org]

Author: simonetripodi
Date: Sun Apr 24 20:09:45 2011
New Revision: 1096371

URL: http://svn.apache.org/viewvc?rev=1096371&view=rev
Log:
restored generics to performance test classes

Modified:
    commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java?rev=1096371&r1=1096370&r2=1096371&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java Sun Apr 24 20:09:45 2011
@@ -29,7 +29,7 @@ public class PerformanceTest {
     private int logLevel = 0;
     private int nrIterations = 5;
 
-    private GenericObjectPool pool;
+    private GenericObjectPool<Integer> pool;
     private boolean start = false;
     private volatile int waiting = 0;
     private volatile int complete = 0;
@@ -62,7 +62,7 @@ public class PerformanceTest {
                     System.out.println(name + "   waiting: " + waiting + "   complete: " + complete);
                 }
                 long bbegin = System.currentTimeMillis();
-                Object o = pool.borrowObject();
+                Integer o = pool.borrowObject();
                 long bend = System.currentTimeMillis();
                 waiting--;
                 do {
@@ -111,7 +111,7 @@ public class PerformanceTest {
         
         SleepingObjectFactory factory = new SleepingObjectFactory();
         if (logLevel >= 4) { factory.setDebug(true); } 
-        pool = new GenericObjectPool(factory);
+        pool = new GenericObjectPool<Integer>(factory);
         pool.setMaxActive(maxActive);
         pool.setMaxIdle(maxIdle);
         pool.setTestOnBorrow(true);

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java?rev=1096371&r1=1096370&r2=1096371&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java Sun Apr 24 20:09:45 2011
@@ -25,35 +25,35 @@ import org.apache.commons.pool2.Poolable
  * @author Dirk Verbeeck
  * @version $Revision$ $Date$ 
  */
-public class SleepingObjectFactory implements PoolableObjectFactory {
+public class SleepingObjectFactory implements PoolableObjectFactory<Integer> {
 
     private int counter = 0;
     private boolean debug = false;
 
-    public Object makeObject() throws Exception {
-        Object obj = new Integer(counter++);
+    public Integer makeObject() throws Exception {
+        Integer obj = new Integer(counter++);
         debug("makeObject", obj);
         sleep(500);
         return obj;
     }
 
-    public void destroyObject(Object obj) throws Exception {
+    public void destroyObject(Integer obj) throws Exception {
         debug("destroyObject", obj);
         sleep(250);
     }
 
-    public boolean validateObject(Object obj) {
+    public boolean validateObject(Integer obj) {
         debug("validateObject", obj);
         sleep(30);
         return true;
     }
 
-    public void activateObject(Object obj) throws Exception {
+    public void activateObject(Integer obj) throws Exception {
         debug("activateObject", obj);
         sleep(10);
     }
 
-    public void passivateObject(Object obj) throws Exception {
+    public void passivateObject(Integer obj) throws Exception {
         debug("passivateObject", obj);
         sleep(10);
     }