From: <cl...@hy...> - 2007-10-04 04:33:59
|
Author: clee Date: 2007-10-03 21:33:53 -0700 (Wed, 03 Oct 2007) New Revision: 6087 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6087 Modified: trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java trunk/src/org/hyperic/hq/bizapp/server/session/BizappSessionEJB.java trunk/src/org/hyperic/hq/bizapp/server/session/ConfigValidatorImpl.java trunk/src/org/hyperic/hq/bizapp/server/session/EventsBossEJBImpl.java trunk/src/org/hyperic/hq/bizapp/server/session/MeasurementBossEJBImpl.java trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java Log: Shorten getDerivedMeasurementManager() to getMetricManager() for better formatting Modified: trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java 2007-10-04 04:33:03 UTC (rev 6086) +++ trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java 2007-10-04 04:33:53 UTC (rev 6087) @@ -1625,7 +1625,7 @@ // now remove the measurements // First remove all the Derived Measurements - getDerivedMeasurementManager() + getMetricManager() .removeMeasurements(subject, plat.getEntityId(), toDeleteIds); // Then remove the Raw Measurements @@ -1896,8 +1896,7 @@ { try { AuthzSubjectValue caller = manager.getSubject(sessionId); - return getApplicationManager() - .getServiceDepsForApp(caller, appId); + return getApplicationManager().getServiceDepsForApp(caller, appId); } catch (PermissionException e) { this.rollback(); throw e; Modified: trunk/src/org/hyperic/hq/bizapp/server/session/BizappSessionEJB.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/BizappSessionEJB.java 2007-10-04 04:33:03 UTC (rev 6086) +++ trunk/src/org/hyperic/hq/bizapp/server/session/BizappSessionEJB.java 2007-10-04 04:33:53 UTC (rev 6087) @@ -353,7 +353,7 @@ return tmLocal; } - public DerivedMeasurementManagerLocal getDerivedMeasurementManager() { + public DerivedMeasurementManagerLocal getMetricManager() { if(dmmLocal == null){ try { dmmLocal = Modified: trunk/src/org/hyperic/hq/bizapp/server/session/ConfigValidatorImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/ConfigValidatorImpl.java 2007-10-04 04:33:03 UTC (rev 6086) +++ trunk/src/org/hyperic/hq/bizapp/server/session/ConfigValidatorImpl.java 2007-10-04 04:33:53 UTC (rev 6087) @@ -79,8 +79,8 @@ ConfigResponse[] responses; ConfigManagerLocal cman; - rmMan = this.getRawMeasurementManager(); - cman = this.getConfigManager(); + rmMan = getRawMeasurementManager(); + cman = getConfigManager(); responses = new ConfigResponse[ids.length]; for(int i=0; i<ids.length; i++){ @@ -96,8 +96,8 @@ } } - dmMan = this.getDerivedMeasurementManager(); - trackerMan = this.getTrackerManager(); + dmMan = getMetricManager(); + trackerMan = getTrackerManager(); for(int i=0; i<ids.length; i++){ if(responses[i] == null){ Modified: trunk/src/org/hyperic/hq/bizapp/server/session/EventsBossEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/EventsBossEJBImpl.java 2007-10-04 04:33:03 UTC (rev 6086) +++ trunk/src/org/hyperic/hq/bizapp/server/session/EventsBossEJBImpl.java 2007-10-04 04:33:53 UTC (rev 6087) @@ -365,8 +365,8 @@ // since changes to the DerivedMeasurement aren't cascaded // on saving the AlertCondition. DerivedMeasurementValue dmv = - getDerivedMeasurementManager().findMeasurement(subject, - tid, id.getId(), true); + getMetricManager().findMeasurement(subject, tid, + id.getId(), true); clone.setMeasurementId(dmv.getId().intValue()); break; case EventConstants.TYPE_ALERT: Modified: trunk/src/org/hyperic/hq/bizapp/server/session/MeasurementBossEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/MeasurementBossEJBImpl.java 2007-10-04 04:33:03 UTC (rev 6086) +++ trunk/src/org/hyperic/hq/bizapp/server/session/MeasurementBossEJBImpl.java 2007-10-04 04:33:53 UTC (rev 6087) @@ -109,6 +109,7 @@ import org.hyperic.hq.measurement.TemplateNotFoundException; import org.hyperic.hq.measurement.data.DataNotAvailableException; import org.hyperic.hq.measurement.monitor.LiveMeasurementException; +import org.hyperic.hq.measurement.server.session.Baseline; import org.hyperic.hq.measurement.server.session.DerivedMeasurement; import org.hyperic.hq.measurement.server.session.MeasurementTemplate; import org.hyperic.hq.measurement.shared.BaselineValue; @@ -170,12 +171,11 @@ if (cats.size() == 1) { String cat = (String) cats.iterator().next(); metrics = - getDerivedMeasurementManager().findDesignatedMeasurements( - subject, id, cat); + getMetricManager().findDesignatedMeasurements(subject, id, cat); } else { metrics = - getDerivedMeasurementManager().findDesignatedMeasurements(id); + getMetricManager().findDesignatedMeasurements(id); // Now iterate through and throw out the metrics we don't need for (Iterator it = metrics.iterator(); it.hasNext(); ) { @@ -532,13 +532,12 @@ long[] intervals = new long[tids.length]; Arrays.fill(intervals, interval); - getDerivedMeasurementManager().createMeasurements( - subject, id, tids, intervals, mergedCR); + getMetricManager().createMeasurements(subject, id, tids, + intervals, mergedCR); + } else { + getMetricManager().createMeasurements(subject, id, tids, + mergedCR); } - else { - getDerivedMeasurementManager().createMeasurements( - subject, id, tids, mergedCR); - } } } @@ -551,8 +550,7 @@ MeasurementNotFoundException, MeasurementCreateException, PermissionException { AuthzSubjectValue subject = manager.getSubject(sessionID); - getDerivedMeasurementManager().enableMeasurements(subject, mids, - interval); + getMetricManager().enableMeasurements(subject, mids, interval); } /** Update the measurements - set the interval @@ -609,7 +607,7 @@ // First remove all the Derived Measurements AppdefEntityID[] ids = new AppdefEntityID[] { id }; - getDerivedMeasurementManager().removeMeasurements(subject, id, ids); + getMetricManager().removeMeasurements(subject, id, ids); // Then remove the Raw Measurements getRawMeasurementManager().removeMeasurements(ids); @@ -624,7 +622,7 @@ throws SessionTimeoutException, SessionNotFoundException, PermissionException { AuthzSubjectValue subject = manager.getSubject(sessionId); - getDerivedMeasurementManager().disableMeasurements(subject, id); + getMetricManager().disableMeasurements(subject, id); } /** @@ -636,7 +634,7 @@ throws SessionTimeoutException, SessionNotFoundException, MeasurementNotFoundException, PermissionException { AuthzSubjectValue subject = manager.getSubject(sessionId); - getDerivedMeasurementManager().disableMeasurements(subject, mids); + getMetricManager().disableMeasurements(subject, mids); } /** @@ -653,7 +651,7 @@ AuthzSubject subject = manager.getSubjectPojo(sessionId); AuthzSubjectValue subjectVal = subject.getAuthzSubjectValue(); - DerivedMeasurementManagerLocal dmm = getDerivedMeasurementManager(); + DerivedMeasurementManagerLocal dmm = getMetricManager(); if (id == null) { getTemplateManager().setTemplateEnabledByDefault(subject, tids, false); @@ -688,7 +686,7 @@ List grpMembers = getAGMemberIds(subject, parentId, childType); for (Iterator it = grpMembers.iterator(); it.hasNext();) { - getDerivedMeasurementManager().disableMeasurements( + getMetricManager().disableMeasurements( subject, (AppdefEntityID) it.next(), tids); } } @@ -806,7 +804,7 @@ public DerivedMeasurementValue getMeasurement(int sessionID, Integer id) throws SessionTimeoutException, SessionNotFoundException, MeasurementNotFoundException { - return getDerivedMeasurementManager().getMeasurement(id) + return getMetricManager().getMeasurement(id) .getDerivedMeasurementValue(); } @@ -820,7 +818,7 @@ throws SessionTimeoutException, SessionNotFoundException, MeasurementNotFoundException { AuthzSubjectValue subject = manager.getSubject(sessionID); - return getDerivedMeasurementManager().getMeasurement( + return getMetricManager().getMeasurement( subject, id, alias); } @@ -834,8 +832,7 @@ EvaluationException, LiveMeasurementException { AuthzSubjectValue subject = manager.getSubject(sessionId); Integer[] mids = new Integer[] { mid }; - return getDerivedMeasurementManager() - .getLiveMeasurementValues(subject, mids)[0]; + return getMetricManager().getLiveMeasurementValues(subject, mids)[0]; } /** @@ -855,7 +852,7 @@ long interval = 0; for (int i = 0; i < tids.length; i++) { try { - DerivedMeasurement dmv = getDerivedMeasurementManager() + DerivedMeasurement dmv = getMetricManager() .findMeasurement(tids[i], aeid.getId()); mids[i] = dmv.getId(); interval = Math.max(interval, dmv.getInterval()); @@ -925,9 +922,8 @@ } // Get the list of measurements for this resource - PageList metrics = - getDerivedMeasurementManager().findMeasurements( - subject, id, cat, PageControl.PAGE_ALL); + PageList metrics = getMetricManager() + .findMeasurements(subject, id, cat, PageControl.PAGE_ALL); // Iterate through the measurements to get the interval for (Iterator it2 = metrics.iterator(); it2.hasNext(); ) { @@ -1007,8 +1003,7 @@ new AppdefEntityID[] { id }).get(0); AuthzSubjectValue subject = manager.getSubject(sessionId); - return getDerivedMeasurementManager().findMeasurement(subject, tid, - id.getId()); + return getMetricManager().findMeasurement(subject, tid, id.getId()); } /** Retrieve list of measurements for a specific instance @@ -1024,13 +1019,16 @@ return findGroupMeasurements(sessionId, id, null, pc); AuthzSubjectValue subject = manager.getSubject(sessionId); - return getDerivedMeasurementManager().findMeasurements( - subject, id, null, pc); + return getMetricManager().findMeasurements(subject, id, null, pc); } - /** Retrieve list of measurements for a specific template and entities - * @param tid the template ID - * @param entIds the array of entity IDs + /** + * Retrieve list of measurements for a specific template and entities + * + * @param tid + * the template ID + * @param entIds + * the array of entity IDs * @return a List of DerivedMeasurementValue objects * @ejb:interface-method */ @@ -1063,7 +1061,7 @@ ids.add(entIds[i].getId()); } } - return getDerivedMeasurementManager().findMeasurements( + return getMetricManager().findMeasurements( subject, tid, (Integer[]) ids.toArray(new Integer[0])); } @@ -1106,8 +1104,8 @@ String mtype = aeVal.getMonitorableType(); IntHashMap dmvs = new IntHashMap(); - List enabledMetrics = getDerivedMeasurementManager() - .findEnabledMeasurements(subject, id, cat); + List enabledMetrics = + getMetricManager().findEnabledMeasurements(subject, id, cat); for (Iterator it = enabledMetrics.iterator(); it.hasNext(); ) { DerivedMeasurement dmv = (DerivedMeasurement) it.next(); @@ -1162,8 +1160,7 @@ MeasurementNotFoundException, DataNotAvailableException { AuthzSubjectValue subject = manager.getSubject(sessionId); - DerivedMeasurement dmv = - getDerivedMeasurementManager().getMeasurement(mid); + DerivedMeasurement dmv = getMetricManager().getMeasurement(mid); MeasurementTemplate tmpl = dmv.getTemplate(); Integer[] mids = new Integer[] { mid }; @@ -1272,8 +1269,7 @@ } Integer[] mids = - getDerivedMeasurementManager().findMeasurementIds( - subject, tid, ids); + getMetricManager().findMeasurementIds(subject, tid, ids); return getDataMan().getHistoricalData(mids, begin, end, interval, tmpl.getCollectionType(), returnNulls, pc); @@ -1335,10 +1331,9 @@ // Get the flattened list of services AppdefEntityID[] serviceIds = aeval.getFlattenedServiceIds(); - Map midMap = getDerivedMeasurementManager() - .findDesignatedMeasurementIds( - subject, serviceIds, - MeasurementConstants.CAT_AVAILABILITY); + Map midMap = getMetricManager() + .findDesignatedMeasurementIds(subject, serviceIds, + MeasurementConstants.CAT_AVAILABILITY); mids = (Integer[]) midMap.values().toArray(new Integer[0]); } else { @@ -1347,8 +1342,8 @@ mids = getMetricIdsForResource(subject, aid, template); if (mids == null || mids.length == 0) { throw new MeasurementNotFoundException( - "There is no measurement for " + aid + " with template " + - tmpl.getId()); + "There is no measurement for " + aid + " with template " + + tmpl.getId()); } } @@ -1374,8 +1369,7 @@ DataNotAvailableException, MeasurementNotFoundException { AuthzSubjectValue subject = manager.getSubject(sessionId); DerivedMeasurementValue dmv = - getDerivedMeasurementManager().findMeasurement( - subject, tid, new Integer(iid)); + getMetricManager().findMeasurement(subject, tid, new Integer(iid)); return findMeasurementData(sessionId, dmv.getId(), count); } @@ -1453,8 +1447,7 @@ } Integer[] mids = - getDerivedMeasurementManager().findMeasurementIds( - subject, tmpl.getId(), ids); + getMetricManager().findMeasurementIds(subject, tmpl.getId(), ids); return getDataMan().getHistoricalData(mids, begin, end, interval, tmpl.getCollectionType(), returnNulls, pc); @@ -1528,8 +1521,7 @@ // get measurement summaries, enriched with metadata // tastes good and it's good for you List mds = new ArrayList(); - List mms = getDerivedMeasurementManager() - .findMeasurements(subject, tid, iids); + List mms = getMetricManager().findMeasurements(subject, tid, iids); for (iter = mms.iterator(); iter.hasNext();) { DerivedMeasurementValue mm = (DerivedMeasurementValue) iter.next(); Integer instanceId = mm.getInstanceId(); @@ -1760,16 +1752,16 @@ Integer[] ids = getGroupMemberIDs(subject, aid); // Get the list of measurements - return getDerivedMeasurementManager().findMeasurementIds( - subject, tmpl.getId(), ids); + return getMetricManager().findMeasurementIds(subject, + tmpl.getId(), ids); } catch (GroupNotCompatibleException e) { throw new MeasurementNotFoundException( "Incompatible group members: " + aid); } } else { Integer[] aids = { aid.getId() }; - return getDerivedMeasurementManager().findMeasurementIds( - subject, tmpl.getId(), aids); + return getMetricManager().findMeasurementIds(subject, tmpl.getId(), + aids); } } @@ -1778,9 +1770,8 @@ long end, double[] data, AppdefEntityID id) throws MeasurementNotFoundException { // Get baseline values - DerivedMeasurementValue dmval = - getDerivedMeasurementManager().findMeasurement( - subject, tmpl.getId(), id.getId()); + DerivedMeasurement dmval = getMetricManager() + .findMeasurement(tmpl.getId(), id.getId()); // Use previous function to set most values, including only 1 resource MetricDisplaySummary summary = @@ -1788,16 +1779,16 @@ begin, end, data, 1); if (dmval.getBaseline() != null) { - BaselineValue bval = dmval.getBaseline(); + Baseline bval = dmval.getBaseline(); if (bval.getMean() != null) summary.setMetric(MetricDisplayConstants.BASELINE_KEY, new MetricDisplayValue(bval.getMean())); - if (bval.getMaxExpectedValue() != null) + if (bval.getMaxExpectedVal() != null) summary.setMetric(MetricDisplayConstants.HIGH_RANGE_KEY, - new MetricDisplayValue(bval.getMaxExpectedValue())); - if (bval.getMinExpectedValue() != null) + new MetricDisplayValue(bval.getMaxExpectedVal())); + if (bval.getMinExpectedVal() != null) summary.setMetric(MetricDisplayConstants.LOW_RANGE_KEY, - new MetricDisplayValue(bval.getMinExpectedValue())); + new MetricDisplayValue(bval.getMinExpectedVal())); } return summary; } @@ -2341,7 +2332,7 @@ // Availability try { - Map midMap = getDerivedMeasurementManager() + Map midMap = getMetricManager() .findDesignatedMeasurementIds( subject, ids, MeasurementConstants.CAT_AVAILABILITY); @@ -2383,9 +2374,9 @@ // Throughput a.k.a. Usage try { - Map midMap = getDerivedMeasurementManager() - .findDesignatedMeasurementIds( - subject, ids, MeasurementConstants.CAT_THROUGHPUT); + Map midMap = getMetricManager() + .findDesignatedMeasurementIds(subject, ids, + MeasurementConstants.CAT_THROUGHPUT); if (midMap.size() > 0) { Integer[] mids = @@ -2400,8 +2391,7 @@ summary.getThroughput().intValue() > 0) { for (int i = 0; i < mids.length ; i++) { DerivedMeasurement dmv = - getDerivedMeasurementManager() - .getMeasurement(mids[i]); + getMetricManager().getMeasurement(mids[i]); summary.setThroughputUnits( dmv.getTemplate().getUnits()); Modified: trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java 2007-10-04 04:33:03 UTC (rev 6086) +++ trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java 2007-10-04 04:33:53 UTC (rev 6087) @@ -114,7 +114,7 @@ else { mtids = (Integer[]) tmpls.toArray(mtids); try { - mtVals = this.getTemplateManager() + mtVals = getTemplateManager() .getTemplates(mtids, PageControl.PAGE_ALL); } catch (TemplateNotFoundException e) { // Well, if we don't find it, *shrug* @@ -163,7 +163,7 @@ timer.reset(); // Now get the aggregate data, keyed by template ID's - Map datamap = this.getDataMan().getAggregateData(mtids, eids, begin, + Map datamap = getDataMan().getAggregateData(mtids, eids, begin, end); if (log.isTraceEnabled()) { @@ -173,8 +173,7 @@ // Get the intervals, keyed by template ID's as well Map intervals = showNoCollect == null ? new HashMap() : - getDerivedMeasurementManager().findMetricIntervals(subject, aeids, - mtids); + getMetricManager().findMetricIntervals(subject, aeids, mtids); for (it = mtVals.iterator(); it.hasNext(); ) { MeasurementTemplateValue tmpl = @@ -203,7 +202,7 @@ // Now create a MetricDisplaySummary and add it to the list MetricDisplaySummary summary = - this.getMetricDisplaySummary(tmpl, interval, begin, end, + getMetricDisplaySummary(tmpl, interval, begin, end, data, total); summaries.add(summary); @@ -227,12 +226,12 @@ boolean showNoCollect) throws AppdefCompatException { // Need to get the templates for this type - List tmpls = this.getTemplateManager() - .findTemplates(resourceType, filters, keyword); + List tmpls = getTemplateManager().findTemplates(resourceType, filters, + keyword); // Look up the metric summaries of associated servers - return this.getResourceMetrics(subject, resources, tmpls, begin, end, - new Boolean(showNoCollect)); + return getResourceMetrics(subject, resources, tmpls, begin, end, + new Boolean(showNoCollect)); } protected MetricDisplaySummary @@ -306,7 +305,7 @@ AppdefEntityID parentAid, AppdefEntityTypeID ctype) throws AppdefEntityNotFoundException, PermissionException { - return this.getAGMemberIds(subject, new AppdefEntityID[] { parentAid }, ctype); + return getAGMemberIds(subject, new AppdefEntityID[] { parentAid }, ctype); } protected List getAGMemberIds(AuthzSubjectValue subject, @@ -367,7 +366,7 @@ if (midMap.size() > 0) { Integer[] mids = (Integer[]) midMap.values().toArray(new Integer[0]); - data = this.getDataMan().getLastDataPoints(mids, acceptable); + data = getDataMan().getLastDataPoints(mids, acceptable); } // Organize by agent @@ -427,8 +426,7 @@ AppdefEntityID id) { try { - return getDerivedMeasurementManager() - .getAvailabilityMeasurement(subject, id); + return getMetricManager().getAvailabilityMeasurement(subject, id); } catch (MeasurementNotFoundException e) { return null; } @@ -437,26 +435,25 @@ protected AppdefEntityID[] toAppdefEntityIDArray(List entities) { AppdefEntityID[] result = new AppdefEntityID[entities.size()]; int idx = 0; - for (Iterator iter = entities.iterator(); iter.hasNext();) { + for (Iterator iter = entities.iterator(); iter.hasNext();) { Object thisThing = iter.next(); if (thisThing instanceof AppdefResourceValue) { - result[idx++] = ((AppdefResourceValue)thisThing).getEntityId(); + result[idx++] = ((AppdefResourceValue) thisThing).getEntityId(); continue; - } - result[idx++] = (AppdefEntityID)thisThing; + } + result[idx++] = (AppdefEntityID) thisThing; } - return result; + return result; } /** - * Given an array of AppdefEntityID's, disqulifies their aggregate - * availability (with the disqualifying status) for all of them if any are - * down or unknown, otherwise the aggregate is deemed - * available + * Given an array of AppdefEntityID's, disqulifies their aggregate + * availability (with the disqualifying status) for all of them if any are + * down or unknown, otherwise the aggregate is deemed available * - * If there's nothing in the array, then aggregate is not populated. - * Ergo, the availability shall be disqualified as unknown i.e. the - * (?) representation + * If there's nothing in the array, then aggregate is not populated. Ergo, + * the availability shall be disqualified as unknown i.e. the (?) + * representation */ protected double getAggregateAvailability(AuthzSubjectValue subject, AppdefEntityID[] ids) @@ -506,9 +503,8 @@ InvalidAppdefTypeException, PermissionException, AppdefEntityNotFoundException, AppdefCompatException { AppdefEntityID[] entIds = new AppdefEntityID[] { entId }; - return this.findMetrics(sessionId, entIds, - MeasurementConstants.FILTER_NONE, null, - begin, end, false); + return findMetrics(sessionId, entIds, MeasurementConstants.FILTER_NONE, + null, begin, end, false); } protected Map findMetrics(int sessionId, AppdefEntityID[] entIds, @@ -551,9 +547,8 @@ String monitorableType = rv.getMonitorableType(); // Look up the metric summaries of associated servers - return this.getResourceMetrics(subject, entArr, monitorableType, - filters, keyword, begin, end, - showNoCollect); + return getResourceMetrics(subject, entArr, monitorableType, filters, + keyword, begin, end, showNoCollect); } protected Map findMetrics(int sessionId, AppdefEntityID entId, List mtids, @@ -598,22 +593,20 @@ // Look up the metric summaries of all associated resources Map results = new HashMap(); if (platforms != null) - results.putAll(this.getResourceMetrics(subject, platforms, - mtids, begin, end, - Boolean.TRUE)); + results.putAll(getResourceMetrics(subject, platforms, mtids, + begin, end, Boolean.TRUE)); if (servers != null) - results.putAll(this.getResourceMetrics(subject, servers, - mtids, begin, end, - Boolean.TRUE)); + results.putAll(getResourceMetrics(subject, servers, mtids, + begin, end, Boolean.TRUE)); if (services != null) - results.putAll(this.getResourceMetrics(subject, services, - mtids, begin, end, - Boolean.TRUE)); + results.putAll(getResourceMetrics(subject, services, mtids, + begin, end, Boolean.TRUE)); return results; } protected List findAllMetrics(int sessionId, AppdefEntityID aeid, - AppdefEntityTypeID ctype, long begin, long end) + AppdefEntityTypeID ctype, + long begin, long end) throws SessionTimeoutException, SessionNotFoundException, AppdefEntityNotFoundException, PermissionException, AppdefCompatException, InvalidAppdefTypeException { @@ -692,12 +685,12 @@ " is not a platform type"); } Integer[] platIds = - this.getPlatformManager().getPlatformIds(subject, ctype.getId()); + getPlatformManager().getPlatformIds(subject, ctype.getId()); List entIds = new ArrayList(platIds.length); for(int i = 0; i < platIds.length; i++) { entIds.add( - new AppdefEntityID(AppdefEntityConstants.APPDEF_TYPE_PLATFORM, - platIds[i])); + new AppdefEntityID(AppdefEntityConstants.APPDEF_TYPE_PLATFORM, + platIds[i])); } return entIds; } @@ -712,16 +705,16 @@ AuthzSubjectValue subject = manager.getSubject(sessionId); // Get the member IDs - List platforms = this.getPlatformAG(subject, platTypeId); + List platforms = getPlatformAG(subject, platTypeId); // Get resource type name PlatformTypeValue platType = - this.getPlatformManager().findPlatformTypeValueById(platTypeId.getId()); + getPlatformManager().findPlatformTypeValueById(platTypeId.getId()); // Look up the metric summaries of platforms - return this.getResourceMetrics(subject, platforms, platType.getName(), - MeasurementConstants.FILTER_NONE, null, - begin, end, showAll); + return getResourceMetrics(subject, platforms, platType.getName(), + MeasurementConstants.FILTER_NONE, null, + begin, end, showAll); } protected Map findAGMetricsByType(int sessionId, AppdefEntityID[] entIds, @@ -746,7 +739,7 @@ case AppdefEntityConstants.APPDEF_TYPE_SERVICE: // Get the associated services group.addAll(rv.getAssociatedServices(typeId.getId(), - PageControl.PAGE_ALL)); + PageControl.PAGE_ALL)); break; default: break; @@ -758,7 +751,7 @@ String resourceType = resource.getAppdefResourceTypeValue().getName(); // Look up the metric summaries of associated servers - return this.getResourceMetrics(subject, group, resourceType, - filters, keyword, begin, end, showAll); + return getResourceMetrics(subject, group, resourceType, filters, + keyword, begin, end, showAll); } } |