[Hyperic-hq-discuss] hq r4136 - in branches/HQ_3_0/src/org/hyperic/hq: bizapp/server/session ui/action/resource/hub

[<cl...@hy...>]

Author: clee
Date: 2007-04-13 22:35:18 -0700 (Fri, 13 Apr 2007)
New Revision: 4136
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=4136

Modified:
   branches/HQ_3_0/src/org/hyperic/hq/bizapp/server/session/MeasurementBossEJBImpl.java
   branches/HQ_3_0/src/org/hyperic/hq/ui/action/resource/hub/ResourceHubPortalAction.java
Log:
[HHQ-815]
Stop spending time looking up things redundantly or not used [merge from HEAD]


Modified: branches/HQ_3_0/src/org/hyperic/hq/bizapp/server/session/MeasurementBossEJBImpl.java
===================================================================
--- branches/HQ_3_0/src/org/hyperic/hq/bizapp/server/session/MeasurementBossEJBImpl.java	2007-04-14 05:31:50 UTC (rev 4135)
+++ branches/HQ_3_0/src/org/hyperic/hq/bizapp/server/session/MeasurementBossEJBImpl.java	2007-04-14 05:35:18 UTC (rev 4136)
@@ -2943,6 +2943,7 @@
         throws AppdefEntityNotFoundException, PermissionException {
         PageList summaries = new PageList();
         for (Iterator it = resources.iterator(); it.hasNext(); ) {
+            StopWatch watch = new StopWatch();
             AppdefResourceValue resource = (AppdefResourceValue) it.next();
             ResourceDisplaySummary summary = new ResourceDisplaySummary();
         
@@ -2976,8 +2977,7 @@
                     summary.setMonitorable(Boolean.TRUE);
                     break;
                 case AppdefEntityConstants.APPDEF_TYPE_GROUP:
-                    AppdefGroupValue agv =
-                        GroupUtil.getGroup(subject, resource.getEntityId());
+                    AppdefGroupValue agv = (AppdefGroupValue) resource;
                     if (!agv.isGroupCompat()) {
                         // geez, why are we here at all?  well, a user _could_
                         // add a group to their dashboard's resourceHealth
@@ -3012,6 +3012,7 @@
             }            
             setResourceDisplaySummary(summary, resource, parent);
             summaries.add(summary);
+            log.debug("getResourcesCurrentHealth: " + watch);
         }        
         summaries.setTotalSize(resources.getTotalSize());
         return summaries;
@@ -3207,18 +3208,16 @@
         throws AppdefEntityNotFoundException, PermissionException,
                SessionNotFoundException, SessionTimeoutException {
         AuthzSubjectValue subject = manager.getSubject(sessionId);
-        PageList resources;
 
         Log timingLog = LogFactory.getLog("DASHBOARD-TIMING");
         StopWatch timer = new StopWatch();
 
-        AppdefBossLocal boss;
-        try {
-            boss = AppdefBossUtil.getLocalHome().create();
-        } catch (Exception e) {
-            throw new SystemException(e);
+        PageList resources = new PageList();
+        for (int i = 0; i < entIds.length; i++) {
+            AppdefEntityValue entVal =
+                new AppdefEntityValue(entIds[i], subject);
+            resources.add(entVal.getLiteResourceValue());
         }
-        resources = boss.findByIds(sessionId,entIds);
         timingLog.trace("findResourceCurrentHealth(2) - timing [" +
                         timer.toString()+"]");
 

Modified: branches/HQ_3_0/src/org/hyperic/hq/ui/action/resource/hub/ResourceHubPortalAction.java
===================================================================
--- branches/HQ_3_0/src/org/hyperic/hq/ui/action/resource/hub/ResourceHubPortalAction.java	2007-04-14 05:31:50 UTC (rev 4135)
+++ branches/HQ_3_0/src/org/hyperic/hq/ui/action/resource/hub/ResourceHubPortalAction.java	2007-04-14 05:35:18 UTC (rev 4136)
@@ -54,7 +54,6 @@
 import org.hyperic.hq.authz.server.session.ResourceGroup;
 import org.hyperic.hq.bizapp.shared.AppdefBoss;
 import org.hyperic.hq.bizapp.shared.AuthzBoss;
-import org.hyperic.hq.bizapp.shared.ControlBoss;
 import org.hyperic.hq.bizapp.shared.MeasurementBoss;
 import org.hyperic.hq.measurement.MeasurementConstants;
 import org.hyperic.hq.ui.Constants;
@@ -341,9 +340,6 @@
         
         watch.markTimeBegin("batchCheckControlPermissions");
         if (ids.size() > 0) {
-            AppdefEntityID[] idArr =
-                (AppdefEntityID[]) ids.toArray(new AppdefEntityID[0]);
-
             if (prefView.equals(ResourceHubForm.LIST_VIEW) &&
                 !isGroupSelected && resourceType != DEFAULT_RESOURCE_TYPE) {
                 // Get the indicator templates
@@ -354,9 +350,18 @@
                 cats.add(MeasurementConstants.CAT_THROUGHPUT);
                 cats.add(MeasurementConstants.CAT_PERFORMANCE);
 
-                Collection templates =
-                    mboss.getDesignatedTemplates(sessionId, idArr, cats);
+                Collection templates = null;
                 
+                for (Iterator it = ids.iterator(); it.hasNext(); ) {
+                    templates =
+                        mboss.getDesignatedTemplates(sessionId,
+                                                     (AppdefEntityID) it.next(),
+                                                     cats);
+                    
+                    if (templates.size() > 0)
+                        break;
+                }
+                
                 if (templates.size() > 0)
                     request.setAttribute("Indicators", templates);
             }