[jboss-cvs] JBossAS SVN: r91435 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/statistics.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-07-20 14:33:39 -0400 (Mon, 20 Jul 2009)
New Revision: 91435

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/statistics/InvocationStatistics.java
Log:
[EJBTHREE-1871] Add generics to InvocationStatistics

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/statistics/InvocationStatistics.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/statistics/InvocationStatistics.java	2009-07-20 18:31:46 UTC (rev 91434)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/statistics/InvocationStatistics.java	2009-07-20 18:33:39 UTC (rev 91435)
@@ -21,11 +21,12 @@
 */
 package org.jboss.ejb3.statistics;
 
+import java.io.Serializable;
 import java.lang.reflect.Method;
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 /** A method invocation statistics collection class.
@@ -37,8 +38,8 @@
 {
    private static final long serialVersionUID = -1637309757441812924L;
 
-   /** A HashMap<Method, TimeStatistic> of the method invocations */
-   private Map methodStats;
+   /** The method invocations */
+   private Map<String, TimeStatistic> methodStats;
 
    public long concurrentCalls = 0;
    public long maxConcurrentCalls = 0;
@@ -64,7 +65,7 @@
 
    public InvocationStatistics()
    {
-      methodStats = new ConcurrentHashMap();
+      methodStats = new ConcurrentHashMap<String, TimeStatistic>();
    }
 
    /** Update the TimeStatistic for the given method. This synchronizes on
@@ -108,7 +109,7 @@
    {
       synchronized (methodStats)
       {
-         Iterator iter = methodStats.values().iterator();
+         Iterator<TimeStatistic> iter = methodStats.values().iterator();
          while (iter.hasNext())
          {
             TimeStatistic stat = (TimeStatistic) iter.next();
@@ -123,7 +124,7 @@
     *
     * @return A HashMap<Method, TimeStatistic> of the method invocations
     */
-   public Map getStats()
+   public Map<String,TimeStatistic> getStats()
    {
       return methodStats;
    }
@@ -142,12 +143,12 @@
       tmp.append(concurrentCalls);
       tmp.append("'\n");
 
-      HashMap copy = new HashMap(methodStats);
-      Iterator iter = copy.entrySet().iterator();
+      HashMap<String,TimeStatistic> copy = new HashMap<String,TimeStatistic>(methodStats);
+      Iterator<Entry<String,TimeStatistic>> iter = copy.entrySet().iterator();
       while (iter.hasNext())
       {
-         Map.Entry entry = (Map.Entry) iter.next();
-         TimeStatistic stat = (TimeStatistic) entry.getValue();
+         Entry<String,TimeStatistic> entry = iter.next();
+         final TimeStatistic stat = entry.getValue();
          if (stat != null)
          {
             tmp.append("method name='");
@@ -172,11 +173,11 @@
       tmp.append(concurrentCalls);
       tmp.append("' >\n");
 
-      HashMap copy = new HashMap(methodStats);
-      Iterator iter = copy.entrySet().iterator();
+      HashMap<String,TimeStatistic> copy = new HashMap<String,TimeStatistic>(methodStats);
+      Iterator<Entry<String,TimeStatistic>> iter = copy.entrySet().iterator();
       while (iter.hasNext())
       {
-         Map.Entry entry = (Map.Entry) iter.next();
+         Entry<String,TimeStatistic> entry = iter.next();
          TimeStatistic stat = (TimeStatistic) entry.getValue();
          if (stat != null)
          {