Author: markt
Date: Mon Apr 30 21:48:10 2012
New Revision: 1332418
URL: http://svn.apache.org/viewvc?rev=1332418&view=rev
Log:
Remove the debugInfo() methods. Much more detailed information is available now
via the monitoring methods.
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1332418&r1=1332417&r2=1332418&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Mon Apr 30 21:48:10 2012
@@ -1373,25 +1373,6 @@ public class GenericKeyedObjectPool<K,T>
}
/**
- * Returns pool info including {@link #getNumActive()}, {@link
#getNumIdle()}
- * and currently defined keys.
- *
- * @return string containing debug information
- */
- String debugInfo() {
- StringBuilder buf = new StringBuilder();
- buf.append("Active: ").append(getNumActive()).append("\n");
- buf.append("Idle: ").append(getNumIdle()).append("\n");
- for (Entry<K,ObjectDeque<T>> entry : poolMap.entrySet()) {
- buf.append(entry.getKey());
- buf.append(": ");
- buf.append(entry.getValue());
- buf.append("\n");
- }
- return buf.toString();
- }
-
- /**
* Returns the number of tests to be performed in an Evictor run,
* based on the current values of <code>_numTestsPerEvictionRun</code>
* and <code>_totalIdle</code>.
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1332418&r1=1332417&r2=1332418&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Mon Apr 30 21:48:10 2012
@@ -872,24 +872,6 @@ public class GenericObjectPool<T> extend
}
/**
- * Returns pool info including {@link #getNumActive()},
- * {@link #getNumIdle()} and a list of objects idle in the pool with their
- * idle times.
- *
- * @return string containing debug information
- */
- String debugInfo() {
- StringBuilder buf = new StringBuilder();
- buf.append("Active: ").append(getNumActive()).append("\n");
- buf.append("Idle: ").append(getNumIdle()).append("\n");
- buf.append("Idle Objects:\n");
- for (PooledObject<T> pair : idleObjects) {
- buf.append("\t").append(pair.toString());
- }
- return buf.toString();
- }
-
- /**
* Returns the number of tests to be performed in an Evictor run, based on
* the current value of <code>numTestsPerEvictionRun</code> and the number
* of idle instances in the pool.
Modified:
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java?rev=1332418&r1=1332417&r2=1332418&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
Mon Apr 30 21:48:10 2012
@@ -90,7 +90,7 @@ public class TestGenericObjectPool exten
pool.close();
pool = null;
factory = null;
-
+
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
Set<ObjectName> result = mbs.queryNames(new ObjectName(
"org.apache.commoms.pool2:type=GenericObjectPool,*"), null);
@@ -268,7 +268,7 @@ public class TestGenericObjectPool exten
setUp();
checkEvictionOrderPart2(lifo);
}
-
+
private void checkEvictionOrderPart1(boolean lifo) throws Exception {
pool.setNumTestsPerEvictionRun(2);
pool.setMinEvictableIdleTimeMillis(100);
@@ -384,7 +384,7 @@ public class TestGenericObjectPool exten
}
}
pool.close();
-
+
// Randomly generate a pools with random numTests
// and make sure evictor cycles through elements appropriately
int[] smallPrimes = {2, 3, 5, 7};
@@ -745,16 +745,6 @@ public class TestGenericObjectPool exten
}
@Test(timeout=60000)
- public void testDebugInfo() throws Exception {
- pool.setMaxIdle(3);
- assertNotNull(pool.debugInfo());
- Object obj = pool.borrowObject();
- assertNotNull(pool.debugInfo());
- pool.returnObject(obj);
- assertNotNull(pool.debugInfo());
- }
-
- @Test(timeout=60000)
public void testStartAndStopEvictor() throws Exception {
// set up pool without evictor
pool.setMaxIdle(6);
@@ -1380,7 +1370,7 @@ public class TestGenericObjectPool exten
}
protected GenericObjectPool<Object> pool = null;
-
+
private SimpleFactory factory = null;
private void assertConfiguration(GenericObjectPoolConfig expected,
GenericObjectPool<?> actual) throws Exception {
@@ -1791,7 +1781,7 @@ public class TestGenericObjectPool exten
pool.returnObject(instance);
assertEquals(factory.getMakeCounter(), pool.getNumIdle());
}
-
+
/**
* Ensure the pool is registered.
*/
@@ -1802,7 +1792,7 @@ public class TestGenericObjectPool exten
Set<ObjectName> result = mbs.queryNames(oname, null);
Assert.assertEquals(1, result.size());
}
-
+
@Test(timeout=60000)
public void testJmxNotification() throws Exception {
factory.setThrowExceptionOnPassivate(true);
@@ -1810,25 +1800,25 @@ public class TestGenericObjectPool exten
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
JmxNotificationListener listener = new JmxNotificationListener();
mbs.addNotificationListener(oname, listener, null, null);
-
+
Object obj = pool.borrowObject();
pool.returnObject(obj);
-
+
List<String> messages = listener.getMessages();
Assert.assertEquals(1, messages.size());
Assert.assertNotNull(messages.get(0));
Assert.assertTrue(messages.get(0).length() > 0);
}
-
+
private static class JmxNotificationListener
implements NotificationListener {
private List<String> messages = new ArrayList<String>();
-
+
public List<String> getMessages() {
return messages;
}
-
+
@Override
public void handleNotification(Notification notification,
Object handback) {
