modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit 761b250755f3b21feeace531c324afeb13b36d54 Author: Joseph Marques joseph@redhat.com Date: Fri Aug 13 10:12:00 2010 -0400
add the missing pieces to finish up filtering MeasurementSchedules by resourceTypeId
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java index c82c98e..a4c8a09 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java @@ -53,6 +53,7 @@ public class MeasurementScheduleCriteria extends Criteria { // filter fields public static final String FILTER_FIELD_RESOURCE_ID = "resourceId"; public static final String FILTER_FIELD_RESOURCE_GROUP_ID = "resourceGroupId"; + public static final String FILTER_FIELD_RESOURCE_TYPE_ID = "resourceTypeId";
private Integer filterId; private Boolean filterEnabled; @@ -89,6 +90,7 @@ public class MeasurementScheduleCriteria extends Criteria { + " FROM Resource res " // + " JOIN res.parentResource parent " // + " WHERE parent.id = ? )"); + filterOverrides.put(FILTER_FIELD_RESOURCE_TYPE_ID, "resource.type.id = ?");
sortOverrides.put(SORT_FIELD_DEFINITION_ID, "definition.id"); sortOverrides.put(SORT_FIELD_NAME, "definition.name"); @@ -130,6 +132,10 @@ public class MeasurementScheduleCriteria extends Criteria { this.filterAutoGroupParentResourceId = filterAutoGroupParentResourceId; }
+ public void addFilterResourceTypeId(Integer filterResourceTypeId) { + this.filterResourceTypeId = filterResourceTypeId; + } + public void fetchBaseline(boolean fetchBaseline) { this.fetchBaseline = fetchBaseline; }