From: <jma...@rh...> - 2009-07-15 07:39:36
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [4412] fix MeasurementDefinitionManagerBean methods which return a list to begin with "find"</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4412</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-07-15 02:39:29 -0500 (Wed, 15 Jul 2009)</dd> </dl> <h3>Log Message</h3> <pre>fix MeasurementDefinitionManagerBean methods which return a list to begin with "find"</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyactionresourcecommonmonitoralertsconfigDefinitionFormPrepareActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyactionresourcecommonmonitorconfigConfigMetricsFormPrepareActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/config/ConfigMetricsFormPrepareAction.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguimeasurementtablesMetricsTableUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/tables/MetricsTableUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguinavigationgroupResourceGroupTreeContextMenuUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeContextMenuUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguinavigationresourceAutoGroupTreeContextMenuUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/AutoGroupTreeContextMenuUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementChartsManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementDataManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementDefinitionManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementDefinitionManagerLocaljava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerLocal.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverresourcegroupdefinitionGroupDefinitionExpressionBuilderManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionExpressionBuilderManagerBean.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyactionresourcecommonmonitoralertsconfigDefinitionFormPrepareActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -137,10 +137,10 @@ </span><span class="cx"> defForm.setResourceType(type.getId()); </span><span class="rem">- List<MeasurementDefinition> dataDefinitions = definitionManager.getMeasurementDefinitionsByResourceType( </span><span class="add">+ List<MeasurementDefinition> dataDefinitions = definitionManager.findMeasurementDefinitionsByResourceType( </span><span class="cx"> subject, type.getId(), DataType.MEASUREMENT, null); </span><span class="rem">- List<MeasurementDefinition> traitDefinitions = definitionManager.getMeasurementDefinitionsByResourceType( </span><span class="add">+ List<MeasurementDefinition> traitDefinitions = definitionManager.findMeasurementDefinitionsByResourceType( </span><span class="cx"> subject, type.getId(), DataType.TRAIT, null); List<RelatedOptionBean> baselines = new ArrayList<RelatedOptionBean>(); </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyactionresourcecommonmonitorconfigConfigMetricsFormPrepareActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/config/ConfigMetricsFormPrepareAction.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/config/ConfigMetricsFormPrepareAction.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/config/ConfigMetricsFormPrepareAction.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -97,7 +97,7 @@ </span><span class="cx"> if (configuringDefaultSchedules) { int resourceTypeId = type; log.debug("Obtaining default metric schedules for resource type " + resourceTypeId + "..."); </span><span class="rem">- List<MeasurementDefinition> definitions = definitionManager.getMeasurementDefinitionsByResourceType( </span><span class="add">+ List<MeasurementDefinition> definitions = definitionManager.findMeasurementDefinitionsByResourceType( </span><span class="cx"> subject, resourceTypeId, null, null); List<MeasurementScheduleComposite> composites = new ArrayList<MeasurementScheduleComposite>(); for (MeasurementDefinition definition : definitions) { </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguimeasurementtablesMetricsTableUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/tables/MetricsTableUIBean.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/tables/MetricsTableUIBean.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/tables/MetricsTableUIBean.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -102,7 +102,7 @@ </span><span class="cx"> } else if (context.category == EntityContext.Category.ResourceGroup) { List<MeasurementDefinition> measurementDefinitions = definitionManager </span><span class="rem">- .getMeasurementDefinitionsByResourceType(user.getSubject(), getResourceGroup(user).getResourceType() </span><span class="add">+ .findMeasurementDefinitionsByResourceType(user.getSubject(), getResourceGroup(user).getResourceType() </span><span class="cx"> .getId(), DataType.MEASUREMENT, null); int[] defIds = new int[measurementDefinitions.size()]; </span><span class="lines">@@ -116,7 +116,7 @@ </span><span class="cx"> } else if (context.category == EntityContext.Category.AutoGroup) { List<MeasurementDefinition> measurementDefinitions = definitionManager </span><span class="rem">- .getMeasurementDefinitionsByResourceType(user.getSubject(), context.getResourceTypeId(), </span><span class="add">+ .findMeasurementDefinitionsByResourceType(user.getSubject(), context.getResourceTypeId(), </span><span class="cx"> DataType.MEASUREMENT, null); int[] defIds = new int[measurementDefinitions.size()]; </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguinavigationgroupResourceGroupTreeContextMenuUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeContextMenuUIBean.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeContextMenuUIBean.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeContextMenuUIBean.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -85,7 +85,7 @@ </span><span class="cx"> if (currentResourceGroup != null) { List<MeasurementDefinition> definitions = measurementDefinitionManager </span><span class="rem">- .getMeasurementDefinitionsByResourceType(subject, currentResourceGroup.getResourceType().getId(), </span><span class="add">+ .findMeasurementDefinitionsByResourceType(subject, currentResourceGroup.getResourceType().getId(), </span><span class="cx"> DataType.MEASUREMENT, null); // operations menugroup, lazy-loaded entries because only name/id are needed for display </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguinavigationresourceAutoGroupTreeContextMenuUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/AutoGroupTreeContextMenuUIBean.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/AutoGroupTreeContextMenuUIBean.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/AutoGroupTreeContextMenuUIBean.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -65,7 +65,7 @@ </span><span class="cx"> currentAutoGroup = getAutoGroupForResourceType(subject, parentId, resourceTypeId); List<MeasurementDefinition> definitions = measurementDefinitionManager </span><span class="rem">- .getMeasurementDefinitionsByResourceType(subject, resourceTypeId, DataType.MEASUREMENT, null); </span><span class="add">+ .findMeasurementDefinitionsByResourceType(subject, resourceTypeId, DataType.MEASUREMENT, null); </span><span class="cx"> metricMenuItemDescriptorsForView = createViewMenuItemDescriptors(currentAutoGroup, definitions); metricMenuItemDescriptorsForGraph = createGraphMenuItemDescriptors(currentAutoGroup, definitions); </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementChartsManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -557,7 +557,7 @@ </span><span class="cx"> collectingDefIdArr[i] = collectingDefIds[i]; } </span><span class="rem">- List<MeasurementDefinition> definitions = measurementDefinitionManager.getMeasurementDefinitionsByIds(subject, </span><span class="add">+ List<MeasurementDefinition> definitions = measurementDefinitionManager.findMeasurementDefinitionsByIds(subject, </span><span class="cx"> collectingDefIds); for (MeasurementDefinition definition : definitions) { measurementDefinitionsMap.put(definition.getId(), definition); </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementDataManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -423,7 +423,7 @@ </span><span class="cx"> Map<Integer, Integer> alerts = alertManager.getAlertCountForSchedules(begin, end, scheduleIds); </span><span class="rem">- List<MeasurementDefinition> definitions = measurementDefinitionManager.getMeasurementDefinitionsByResourceType( </span><span class="add">+ List<MeasurementDefinition> definitions = measurementDefinitionManager.findMeasurementDefinitionsByResourceType( </span><span class="cx"> subject, resourceTypeId, DataType.MEASUREMENT, null); Map<Integer, MeasurementDefinition> defMap = new HashMap<Integer, MeasurementDefinition>(definitions.size()); for (MeasurementDefinition def : definitions) { </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementDefinitionManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -112,7 +112,7 @@ </span><span class="cx"> } @SuppressWarnings("unchecked") </span><span class="rem">- public List<MeasurementDefinition> getMeasurementDefinitionsByResourceType(Subject user, int resourceTypeId, </span><span class="add">+ public List<MeasurementDefinition> findMeasurementDefinitionsByResourceType(Subject user, int resourceTypeId, </span><span class="cx"> DataType dataType, DisplayType displayType) { Query query = entityManager .createNamedQuery(MeasurementDefinition.FIND_BY_RESOURCE_TYPE_DATA_TYPE_DISPLAY_TYPE); </span><span class="lines">@@ -125,7 +125,7 @@ </span><span class="cx"> } @SuppressWarnings("unchecked") </span><span class="rem">- public List<MeasurementDefinition> getMeasurementDefinitionsByIds(Subject subject, </span><span class="add">+ public List<MeasurementDefinition> findMeasurementDefinitionsByIds(Subject subject, </span><span class="cx"> Integer[] measurementDefinitionIds) { Query query = entityManager.createNamedQuery(MeasurementDefinition.FIND_BY_IDS); List<Integer> ids = Arrays.asList(measurementDefinitionIds); </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementDefinitionManagerLocaljava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerLocal.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerLocal.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerLocal.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -53,7 +53,7 @@ </span><span class="cx"> * * @return List<MeasurementDefinition> list of definitions found */ </span><span class="rem">- List<MeasurementDefinition> getMeasurementDefinitionsByResourceType(Subject user, int resourceTypeId, </span><span class="add">+ List<MeasurementDefinition> findMeasurementDefinitionsByResourceType(Subject user, int resourceTypeId, </span><span class="cx"> DataType dataType, DisplayType displayType); /** </span><span class="lines">@@ -64,7 +64,7 @@ </span><span class="cx"> * * @return List<MeasurementDefinition> list of definitions found */ </span><span class="rem">- List<MeasurementDefinition> getMeasurementDefinitionsByIds(Subject subject, Integer[] measurementDefinitionIds); </span><span class="add">+ List<MeasurementDefinition> findMeasurementDefinitionsByIds(Subject subject, Integer[] measurementDefinitionIds); </span><span class="cx"> // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverresourcegroupdefinitionGroupDefinitionExpressionBuilderManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionExpressionBuilderManagerBean.java (4411 => 4412)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionExpressionBuilderManagerBean.java 2009-07-15 07:34:10 UTC (rev 4411) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionExpressionBuilderManagerBean.java 2009-07-15 07:39:29 UTC (rev 4412) </span><span class="lines">@@ -53,7 +53,7 @@ </span><span class="cx"> private ResourceTypeManagerLocal resourceTypeManager; public List<String> getTraitPropertyNames(int resourceTypeId) { </span><span class="rem">- List<MeasurementDefinition> definitions = measurementDefinitionManager.getMeasurementDefinitionsByResourceType( </span><span class="add">+ List<MeasurementDefinition> definitions = measurementDefinitionManager.findMeasurementDefinitionsByResourceType( </span><span class="cx"> subjectManager.getOverlord(), resourceTypeId, DataType.TRAIT, null); List<String> results = new ArrayList<String>(); </span> </pre> </div> </div> </body> </html> |