[Hyperic-hq-discuss] hq r14540 - in trunk/src/org/hyperic/hq/measurement: . server/session

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-23 10:18:57 -0700 (Fri, 23 Apr 2010)
New Revision: 14540
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14540

Modified:
   trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java
   trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
Log:
[HHQ-3918] add missing api from MeasurementManager, slight code modification in Diagnostic

Modified: trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java	2010-04-23 00:05:27 UTC (rev 14539)
+++ trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java	2010-04-23 17:18:57 UTC (rev 14540)
@@ -114,12 +114,12 @@
         final Map avails = aMan.getLastAvail(resources, measCache);
         final List children = new ArrayList();
         final Map childrenToPlatform = getChildren(platforms, measCache, avails, children);
-        final List measurements = new ArrayList(mMan.getEnabledMeasurements(children).values());
+        final Collection measurements = mMan.getEnabledMeasurements(children).values();
         final Map values = getLastMetricValues(measurements);
         buf.append(getStatus(measurements, values, avails, childrenToPlatform));
     }
 
-    private StringBuilder getStatus(List measurementLists, Map values, Map avails,
+    private StringBuilder getStatus(Collection measurementLists, Map values, Map avails,
                                     Map childrenToPlatform) {
         final Map platHierarchyNotReporting = new HashMap();
         for (final Iterator it=measurementLists.iterator(); it.hasNext(); ) {
@@ -207,10 +207,10 @@
     /**
      * @return {@link Map} of {@link Integer} of measurementIds to {@link MetricValue}
      */
-    private Map getLastMetricValues(List measurements) {
+    private Map getLastMetricValues(Collection measLists) {
         final MetricDataCache cache = MetricDataCache.getInstance();
         final List mids = new ArrayList();
-        for (final Iterator it=measurements.iterator(); it.hasNext(); ) {
+        for (final Iterator it=measLists.iterator(); it.hasNext(); ) {
             final List measList = (List) it.next();
             for (final Iterator mit=measList.iterator(); mit.hasNext(); ) {
                 final Measurement m = (Measurement) mit.next();

Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java	2010-04-23 00:05:27 UTC (rev 14539)
+++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java	2010-04-23 17:18:57 UTC (rev 14540)
@@ -650,6 +650,16 @@
     }
 
     /**
+     * @param aeids {@link List} of {@link Resource}s
+     * @return {@link Map} of {@link Integer} representing resourceId to
+     * {@link List} of {@link Measurement}s
+     * @ejb:interface-method
+     */
+    public Map getEnabledMeasurements(List resources) {
+        return getMeasurementDAO().findEnabledByResources(resources);
+    }
+
+    /**
      * @param aeids {@link List} of {@link AppdefEntityID}s
      * @return {@link Map} of {@link Integer} representing resourceId to
      * {@link List} of {@link Measurement}s