condition
| 1
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java
| 11 ----
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
| 11 ----
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AvailabilityCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDeploymentCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDestinationCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleFileCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java
| 11 ----
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
| 20
+++++++-
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DashboardCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftChangeSetCriteria.java
| 20 ++++----
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageHistoryCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
| 25
++++------
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
| 15 ++++++
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PartitionEventCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RepoCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
| 11 ----
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
| 11 ----
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
| 12 ----
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java
| 12 ----
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java
| 5 --
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
| 11 ----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
| 2
39 files changed, 57 insertions(+), 241 deletions(-)
New commits:
commit c5b87b9f1c8b77746d0a13313f8ad239385df950
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Mar 4 20:22:14 2013 +0100
Added support for filtering by ID or by multiple IDs into Criteria class ->
subsequently for all derived criteria classes
diff --git a/condition b/condition
new file mode 100644
index 0000000..6e39775
--- /dev/null
+++ b/condition
@@ -0,0 +1 @@
+{"name":"AVAIL_GOES_UP","category":"AVAILABILITY","id":10001,"threshold":null,"option":null,"triggerId":null,"comparator":null,"measurementDefinition":0}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java
index 242de00..b58f221 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java
@@ -43,8 +43,6 @@ public abstract class AbstractConfigurationUpdateCriteria extends
Criteria {
public static final String FETCH_FIELD_CONFIGURATION = "configuration";
- private Integer filterId;
- private List<Integer> filterIds; // requires overrides
private Long filterStartTime; // requires overrides
private Long filterEndTime; // requires overrides
private ConfigurationUpdateStatus filterStatus;
@@ -56,20 +54,11 @@ public abstract class AbstractConfigurationUpdateCriteria extends
Criteria {
private PageOrdering sortStatus; // requires sort override
public AbstractConfigurationUpdateCriteria() {
- filterOverrides.put("ids", "id IN ( ? )");
filterOverrides.put("startTime", "createdTime >= ?");
filterOverrides.put("endTime", "createdTime <= ?");
filterOverrides.put("statuses", "status IN ( ? )");
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
- public void addFilterIds(List<Integer> filterIds) {
- this.filterIds = filterIds;
- }
-
public void addFilterStartTime(Long filterStartTime) {
this.filterStartTime = filterStartTime;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java
index b535141..e38fbcc 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java
@@ -42,7 +42,6 @@ public class AgentCriteria extends Criteria {
public static final String SORT_FIELD_NAME = "name";
- private Integer filterId;
private String filterName;
private String filterAddress;
private Integer filterPort;
@@ -65,10 +64,6 @@ public class AgentCriteria extends Criteria {
return Agent.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java
index 3e73c33..e138ef1 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java
@@ -52,7 +52,6 @@ public class AlertCriteria extends Criteria {
public static final String SORT_FIELD_RESOURCE_ID = "resourceId";
public static final String SORT_FIELD_RESOURCE_NAME = "resourceName";
- private Integer filterId;
private String filterTriggeredOperationName; // requires overrides
private Long filterStartTime; // requires overrides
private Long filterEndTime; // requires overrides
@@ -110,10 +109,6 @@ public class AlertCriteria extends Criteria {
return Alert.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterTriggeredOperationName(String filterTriggeredOperationName) {
this.filterTriggeredOperationName = filterTriggeredOperationName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
index a11b88e..6ddb395 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
@@ -45,8 +45,6 @@ public class AlertDefinitionCriteria extends Criteria {
public static final String SORT_FIELD_RESOURCE_ID = "resourceId";
public static final String SORT_FIELD_RESOURCE_NAME = "resourceName";
- private Integer filterId;
- private List<Integer> filterIds;
private String filterName;
private String filterDescription;
private AlertPriority filterPriority;
@@ -85,7 +83,6 @@ public class AlertDefinitionCriteria extends Criteria {
filterOverrides.put("resourceOnly", "resource IS NOT NULL");
filterOverrides.put("notificationSenderNames", "id IN ("
+ "SELECT notif.alertDefinition.id FROM AlertNotification notif " +
"WHERE notif.senderName IN ( ? ))");
- filterOverrides.put("filterIds", "id IN ( ? )");
sortOverrides.put(SORT_FIELD_RESOURCE_ID, "resource.id");
sortOverrides.put(SORT_FIELD_RESOURCE_NAME, "resource.name");
@@ -98,14 +95,6 @@ public class AlertDefinitionCriteria extends Criteria {
return AlertDefinition.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
- public void addFilterIds(Integer... filterIds) {
- this.filterIds = Arrays.asList(filterIds);
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AvailabilityCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AvailabilityCriteria.java
index fcee832..838f5ba 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AvailabilityCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AvailabilityCriteria.java
@@ -42,7 +42,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class AvailabilityCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
// this is used to perform an interval check, see below for more, or to filter out
the initial avail record
private Long filterStartTime;
private Integer filterResourceId; // requires overrides
@@ -62,10 +61,6 @@ public class AvailabilityCriteria extends Criteria {
return Availability.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
/**
* Return Availability where any portion of the Availability period falls into the
specified interval. This
* filter is mutually exclusive with filterInitialAvailability.
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java
index 84018a8..abef183 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java
@@ -37,7 +37,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class BundleCriteria extends TaggedCriteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private List<Integer> filterBundleVersionIds; // needs overrides
private Integer filterBundleTypeId; // needs override
private String filterBundleTypeName; // needs override
@@ -75,10 +74,6 @@ public class BundleCriteria extends TaggedCriteria {
return Bundle.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
/** Convenience routine calls addFilterBundleVersionIds */
public void addFilterBundleVersionId(Integer filterBundleVersionId) {
List<Integer> ids = new ArrayList<Integer>(1);
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDeploymentCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDeploymentCriteria.java
index 8449905..3861cd1 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDeploymentCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDeploymentCriteria.java
@@ -36,7 +36,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class BundleDeploymentCriteria extends TaggedCriteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private Boolean filterIsLive;
private String filterName;
private String filterDescription;
@@ -65,10 +64,6 @@ public class BundleDeploymentCriteria extends TaggedCriteria {
return BundleDeployment.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterIsLive(Boolean filterIsLive) {
this.filterIsLive = filterIsLive;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDestinationCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDestinationCriteria.java
index dcd99d8..4dfadf2 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDestinationCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDestinationCriteria.java
@@ -35,7 +35,6 @@ import org.rhq.core.domain.bundle.BundleDestination;
public class BundleDestinationCriteria extends TaggedCriteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private String filterDescription;
private Integer filterBundleId; // needs override
@@ -60,10 +59,6 @@ public class BundleDestinationCriteria extends TaggedCriteria {
return BundleDestination.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleFileCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleFileCriteria.java
index 26f2b3e..71c1d7c 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleFileCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleFileCriteria.java
@@ -34,7 +34,6 @@ import org.rhq.core.domain.bundle.BundleFile;
public class BundleFileCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private Integer filterBundleVersionId; // needs override
private Integer filterPackageVersionId; // needs override
@@ -51,10 +50,6 @@ public class BundleFileCriteria extends Criteria {
return BundleFile.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterBundleVersionId(Integer filterBundleVersionId) {
this.filterBundleVersionId = filterBundleVersionId;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java
index 9e28999..7ec26d7 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java
@@ -37,8 +37,6 @@ import org.rhq.core.domain.util.CriteriaUtils;
public class BundleResourceDeploymentCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
- private List<Integer> filterIds; // needs overrides
private Integer filterBundleDeploymentId; // requires override
private String filterBundleDeploymentName; // requires override
private Integer filterResourceId; // requires override
@@ -50,7 +48,6 @@ public class BundleResourceDeploymentCriteria extends Criteria {
private boolean fetchHistories;
public BundleResourceDeploymentCriteria() {
- filterOverrides.put("ids", "id IN ( ? )");
filterOverrides.put("bundleDeploymentId", "bundleDeployment.id =
?");
filterOverrides.put("bundleDeploymentName", "bundleDeployment.name
like ?");
filterOverrides.put("resourceId", "resource.id = ?");
@@ -62,14 +59,6 @@ public class BundleResourceDeploymentCriteria extends Criteria {
return BundleResourceDeployment.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
- public void addFilterIds(Integer... filterIds) {
- this.filterIds = CriteriaUtils.getListIgnoringNulls(filterIds);
- }
-
public void addFilterBundleDeploymentId(Integer filterBundleDeploymentId) {
this.filterBundleDeploymentId = filterBundleDeploymentId;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java
index bf8b885..ef5f6e1 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java
@@ -34,7 +34,6 @@ import org.rhq.core.domain.bundle.BundleVersion;
public class BundleVersionCriteria extends TaggedCriteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterDescription;
private String filterName;
private String filterVersion;
@@ -56,10 +55,6 @@ public class BundleVersionCriteria extends TaggedCriteria {
return BundleVersion.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterDescription(String filterDescription) {
this.filterDescription = filterDescription;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
index 06f90e4..e2d435c 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
@@ -33,6 +33,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import org.rhq.core.domain.authz.Permission;
+import org.rhq.core.domain.util.CriteriaUtils;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
@@ -43,7 +44,7 @@ import org.rhq.core.domain.util.PageOrdering;
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class Criteria implements Serializable, BaseCriteria {
public enum Type {
- FILTER(), FETCH(), SORT(new String[] { "sortId" });
+ FILTER(new String[] { "filterId", "filterIds" }), FETCH(),
SORT(new String[] { "sortId" });
private List<String> globalFields;
@@ -59,7 +60,7 @@ public abstract class Criteria implements Serializable, BaseCriteria {
}
private Type() {
- this.globalFields = new ArrayList(0);
+ this.globalFields = new ArrayList<String>(0);
}
private Type(String[] globalFields) {
@@ -120,6 +121,12 @@ public abstract class Criteria implements Serializable, BaseCriteria
{
// All Criteria support sorting on ID
private PageOrdering sortId;
+
+ // All Criteria support filtering on ID
+ private Integer filterId;
+
+ // All Criteria support filtering on IDs
+ private List<Integer> filterIds;
/**
* This default constructor will set default paging to avoid unintended fetch of huge
results. The default is:
@@ -127,6 +134,7 @@ public abstract class Criteria implements Serializable, BaseCriteria
{
*/
public Criteria() {
this.filterOverrides = new HashMap<String, String>();
+ this.filterOverrides.put("ids", "id IN ( ? )");
this.sortOverrides = new HashMap<String, String>();
this.orderingFieldNames = new ArrayList<String>();
@@ -168,6 +176,14 @@ public abstract class Criteria implements Serializable, BaseCriteria
{
addSortField("id");
this.sortId = sortId;
}
+
+ public void addFilterId(Integer filterId) {
+ this.filterId = filterId;
+ }
+
+ public void addFilterIds(Integer... filterIds) {
+ this.filterIds = CriteriaUtils.getListIgnoringNulls(filterIds);
+ }
protected void addSortField(String fieldName) {
orderingFieldNames.add("sort" +
Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1));
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DashboardCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DashboardCriteria.java
index e1ef74a..13751f0 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DashboardCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DashboardCriteria.java
@@ -39,7 +39,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class DashboardCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private DashboardCategory filterCategory = DashboardCategory.INVENTORY;
private Integer filterGroupId; // needs overrides
private String filterName;
@@ -68,10 +67,6 @@ public class DashboardCriteria extends Criteria {
return Dashboard.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
/**
* If not set explicitly this defaults to {@link DashboardCategory.INVENTORY}.
* @param category
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionCriteria.java
index 708bb38..a047311 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionCriteria.java
@@ -40,7 +40,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class DriftDefinitionCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private List<Integer> filterResourceIds; // needs override
private Integer filterTemplateId;
@@ -61,10 +60,6 @@ public class DriftDefinitionCriteria extends Criteria {
return DriftDefinition.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String name) {
this.filterName = name;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java
index d4ff131..9d27dc2 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java
@@ -25,7 +25,6 @@ import org.rhq.core.domain.drift.DriftDefinitionTemplate;
public class DriftDefinitionTemplateCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private Integer filterResourceTypeId;
@@ -41,10 +40,6 @@ public class DriftDefinitionTemplateCriteria extends Criteria {
return DriftDefinitionTemplate.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
index 3bf0a28..83d9678 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
@@ -43,7 +43,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class EventCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterDetail;
private String filterSourceName; // requires overrides
private List<EventSeverity> filterSeverities;
@@ -89,10 +88,6 @@ public class EventCriteria extends Criteria {
return Event.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterDetail(String filterDetail) {
this.filterDetail = filterDetail;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftChangeSetCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftChangeSetCriteria.java
index c640bf0..a019f79 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftChangeSetCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftChangeSetCriteria.java
@@ -78,16 +78,6 @@ public class GenericDriftChangeSetCriteria implements Serializable,
DriftChangeS
private boolean strict;
@Override
- public void addFilterId(String filterId) {
- this.filterId = filterId;
- }
-
- @Override
- public String getFilterId() {
- return filterId;
- }
-
- @Override
public void addFilterVersion(String filterVersion) {
this.filterVersion = filterVersion;
}
@@ -264,4 +254,14 @@ public class GenericDriftChangeSetCriteria implements Serializable,
DriftChangeS
return result;
}
+ @Override
+ public void addFilterId(String filterId) {
+ this.filterId = filterId;
+ }
+
+ @Override
+ public String getFilterId() {
+ return filterId;
+ }
+
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java
index bf9ba40..5df6a4d 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java
@@ -11,7 +11,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class InstalledPackageCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private Long filterInstallationTimeMinimum; // requires overrides
private Long filterInstallationTimeMaximum; // requires overrides
private Integer filterPackageVersionId; // requires overrides
@@ -37,10 +36,6 @@ public class InstalledPackageCriteria extends Criteria {
return InstalledPackage.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterPackageVersionId(Integer filterPackageVersionId) {
this.filterPackageVersionId = filterPackageVersionId;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageHistoryCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageHistoryCriteria.java
index e640369..f2ea35b 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageHistoryCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageHistoryCriteria.java
@@ -14,7 +14,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class InstalledPackageHistoryCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private Long filterInstallationTimeMinimum; // requires overrides
private Long filterInstallationTimeMaximum; // requires overrides
private Integer filterPackageVersionId; // requires overrides
@@ -49,10 +48,6 @@ public class InstalledPackageHistoryCriteria extends Criteria {
return InstalledPackageHistory.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterPackageVersionId(Integer filterPackageVersionId) {
this.filterPackageVersionId = filterPackageVersionId;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
index c80cb72..4b6a24b 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
@@ -96,7 +96,6 @@ public class JPADriftChangeSetCriteria extends Criteria implements
DriftChangeSe
this.addFilterCreatedBefore(changeSetCriteria.getFilterCreatedBefore());
this.addFilterDriftDefinitionId(changeSetCriteria.getFilterDriftDefinitionId());
this.addFilterEndVersion(changeSetCriteria.getFilterEndVersion());
- this.addFilterId(changeSetCriteria.getFilterId());
this.addFilterResourceId(changeSetCriteria.getFilterResourceId());
this.addFilterStartVersion(changeSetCriteria.getFilterStartVersion());
this.addFilterVersion(changeSetCriteria.getFilterVersion());
@@ -117,18 +116,6 @@ public class JPADriftChangeSetCriteria extends Criteria implements
DriftChangeSe
return JPADriftChangeSet.class;
}
- @Override
- public void addFilterId(String filterId) {
- if (filterId != null) {
- this.filterId = Integer.parseInt(filterId);
- }
- }
-
- @Override
- public String getFilterId() {
- return filterId == null ? null : filterId.toString();
- }
-
public void addFilterVersion(Integer filterVersion) {
this.filterVersion = filterVersion;
}
@@ -293,4 +280,16 @@ public class JPADriftChangeSetCriteria extends Criteria implements
DriftChangeSe
public PageOrdering getSortVersion() {
return sortVersion;
}
+
+ @Override
+ public void addFilterId(String filterId) {
+ if (filterId != null) {
+ this.filterId = Integer.parseInt(filterId);
+ }
+ }
+
+ @Override
+ public String getFilterId() {
+ return filterId == null ? null : filterId.toString();
+ }
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
index 22df940..c032c48 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
@@ -133,4 +133,19 @@ public class MeasurementDataTraitCriteria extends Criteria {
addSortField(SORT_FIELD_RESOURCE_NAME);
this.sortResourceName = sortResourceName;
}
+
+ @Override
+ public void addSortId(PageOrdering sortId) {
+ throw new UnsupportedOperationException("The id column is not defined on
this entity.");
+ }
+
+ @Override
+ public void addFilterId(Integer filterId) {
+ throw new UnsupportedOperationException("The id column is not defined on
this entity.");
+ }
+
+ @Override
+ public void addFilterIds(Integer... filterIds) {
+ throw new UnsupportedOperationException("The id column is not defined on
this entity.");
+ }
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java
index 0e22859..23efae9 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java
@@ -41,7 +41,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class MeasurementDefinitionCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private String filterDisplayName;
private String filterDescription;
@@ -80,10 +79,6 @@ public class MeasurementDefinitionCriteria extends Criteria {
return MeasurementDefinition.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
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 f82a2cd..60b4b92 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
@@ -52,7 +52,6 @@ public class MeasurementScheduleCriteria extends Criteria {
public static final String FILTER_FIELD_AUTO_GROUP_RESOURCE_TYPE_ID =
"autoGroupResourceTypeId";
public static final String FILTER_FIELD_AUTO_GROUP_PARENT_RESOURCE_ID =
"autoGroupParentResourceId";
- private Integer filterId;
private Boolean filterEnabled;
private List<Integer> filterDefinitionIds; // requires overrides
private Integer filterResourceId; // requires overrides
@@ -99,10 +98,6 @@ public class MeasurementScheduleCriteria extends Criteria {
return MeasurementSchedule.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterEnabled(Boolean filterEnabled) {
this.filterEnabled = filterEnabled;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java
index 854a561..e89361b 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java
@@ -39,7 +39,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class OperationDefinitionCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private String filterDisplayName;
private String filterDescription;
@@ -76,10 +75,6 @@ public class OperationDefinitionCriteria extends Criteria {
return OperationDefinition.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java
index 86e4554..7a82678 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java
@@ -41,7 +41,6 @@ import org.rhq.core.domain.util.PageOrdering;
public abstract class OperationHistoryCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterJobName;
private String filterJobGroup;
private OperationRequestStatus filterStatus;
@@ -83,10 +82,6 @@ public abstract class OperationHistoryCriteria extends Criteria {
return OperationHistory.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterJobId(JobId filterJobId) {
this.filterJobName = filterJobId.getJobName();
this.filterJobGroup = filterJobId.getJobGroup();
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageCriteria.java
index 306ce0a..176931b 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageCriteria.java
@@ -36,7 +36,6 @@ public class PackageCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private String filterClassification;
private Integer filterPackageTypeId;
@@ -56,10 +55,6 @@ public class PackageCriteria extends Criteria {
public Class<?> getPersistentClass() {
return Package.class;
}
-
- public void addFilterId(Integer id) {
- this.filterId = id;
- }
public void addFilterName(String name) {
this.filterName = name;
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java
index 592cea1..77387cd 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java
@@ -11,7 +11,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class PackageVersionCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private Integer filterPackageId; // requires override
private Integer filterRepoId; // requires overrides
private Integer filterResourceId; // requires overrides
@@ -55,10 +54,6 @@ public class PackageVersionCriteria extends Criteria {
return PackageVersion.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterRepoId(Integer filterRepoId) {
this.filterRepoId = filterRepoId;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PartitionEventCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PartitionEventCriteria.java
index 975d425..40ff836 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PartitionEventCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PartitionEventCriteria.java
@@ -44,7 +44,6 @@ public class PartitionEventCriteria extends Criteria {
public static final String SORT_FIELD_CTIME = "ctime";
- private Integer filterId;
private List<PartitionEventType> filterEventType; // requires override
private List<ExecutionStatus> filterExecutionStatus; // requires override
private String filterEventDetail;
@@ -60,10 +59,6 @@ public class PartitionEventCriteria extends Criteria {
return PartitionEvent.class;
}
- public void addFilterId(Integer id) {
- this.filterId = id;
- }
-
public void addFilterEventType(PartitionEventType... filterEventType) {
if (filterEventType != null && filterEventType.length > 0) {
this.filterEventType = Arrays.asList(filterEventType);
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RepoCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RepoCriteria.java
index f6912b0..26f3923 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RepoCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RepoCriteria.java
@@ -39,7 +39,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class RepoCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private String filterDescription;
private List<Integer> filterResourceIds; // needs overrides
@@ -71,10 +70,6 @@ public class RepoCriteria extends Criteria {
return Repo.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
index 24e5bb9..e8a5e0f 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
@@ -45,7 +45,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class ResourceCriteria extends TaggedCriteria {
private static final long serialVersionUID = 2L;
- private Integer filterId;
private String filterName;
private String filterResourceKey;
private InventoryStatus filterInventoryStatus = InventoryStatus.COMMITTED; //
default
@@ -66,7 +65,6 @@ public class ResourceCriteria extends TaggedCriteria {
private AvailabilityType filterCurrentAvailability; // needs overrides
private Long filterStartItime;
private Long filterEndItime;
- private List<Integer> filterIds; // needs overrides
private List<Integer> filterExplicitGroupIds; // requires overrides
private List<Integer> filterImplicitGroupIds; // requires overrides
private Integer filterRootResourceId; // requires overrides
@@ -129,7 +127,6 @@ public class ResourceCriteria extends TaggedCriteria {
filterOverrides.put("currentAvailability",
"currentAvailability.availabilityType = ?");
filterOverrides.put("startItime", "itime >= ?");
filterOverrides.put("endItime", "itime <= ?");
- filterOverrides.put("ids", "id IN ( ? )");
filterOverrides.put("explicitGroupIds", "" //
+ "id IN ( SELECT ires.id " //
+ " FROM Resource ires " //
@@ -158,10 +155,6 @@ public class ResourceCriteria extends TaggedCriteria {
return Resource.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
@@ -254,10 +247,6 @@ public class ResourceCriteria extends TaggedCriteria {
filterEndItime = itime;
}
- public void addFilterIds(Integer... filterIds) {
- this.filterIds = CriteriaUtils.getListIgnoringNulls(filterIds);
- }
-
public void addFilterExplicitGroupIds(Integer... filterExplicitGroupIds) {
this.filterExplicitGroupIds =
CriteriaUtils.getListIgnoringNulls(filterExplicitGroupIds);
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
index dda954f..2bbb609 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
@@ -41,7 +41,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class ResourceGroupCriteria extends TaggedCriteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private Boolean filterRecursive;
private Integer filterResourceTypeId; // requires overrides
@@ -59,7 +58,6 @@ public class ResourceGroupCriteria extends TaggedCriteria {
private Integer filterGroupDefinitionId; // requires overrides
private Boolean filterPrivate; /* if true, show only private groups for the calling
user */
private Boolean filterVisible = true; /* only show visible groups by default */
- private List<Integer> filterIds; // requires overrides
private NonBindingOverrideFilter filterBundleTargetableOnly; // requires overrides -
finds only those that have bundle config - that is, can be targeted for bundle deployment
private boolean fetchExplicitResources;
@@ -116,7 +114,6 @@ public class ResourceGroupCriteria extends TaggedCriteria {
+ " JOIN res.explicitGroups explicitGroup " //
+ " WHERE resourcegroup.id = explicitGroup.id AND NOT
res.resourceType.name = ? AND res.inventoryStatus = 'COMMITTED' )");
filterOverrides.put("groupDefinitionId", "groupDefinition.id =
?");
- filterOverrides.put("ids", "id IN ( ? )");
filterOverrides.put("bundleTargetableOnly",
"resourceType.bundleConfiguration IS NOT NULL");
sortOverrides.put("resourceTypeName", "resourceType.name");
@@ -128,10 +125,6 @@ public class ResourceGroupCriteria extends TaggedCriteria {
return ResourceGroup.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
/**
* Only returns groups with at least this many downed implicit resource members
*/
@@ -236,10 +229,6 @@ public class ResourceGroupCriteria extends TaggedCriteria {
return (Boolean.TRUE.equals(this.filterVisible));
}
- public void addFilterIds(Integer... filterIds) {
- this.filterIds = CriteriaUtils.getListIgnoringNulls(filterIds);
- }
-
/**
* If true is passed in, only those groups that can be targeted for bundle
deployments will
* be fetched. By definition, this means no mixed groups are ever fetched and only
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java
index 356dabc..188c3f0 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java
@@ -36,7 +36,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class ResourceGroupDefinitionCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private String filterDescription;
private Boolean filterRecursive;
@@ -58,10 +57,6 @@ public class ResourceGroupDefinitionCriteria extends Criteria {
return GroupDefinition.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
index 1641ab2..073741c 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
@@ -46,9 +46,7 @@ import org.rhq.core.domain.util.PageOrdering;
public class ResourceTypeCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private Integer filterParentId; // required overrides
- private List<Integer> filterIds; // requires overrides
private String filterName;
private String filterDescription;
@@ -92,7 +90,6 @@ public class ResourceTypeCriteria extends Criteria {
+ " JOIN innerRt.parentResourceTypes innerParentRt " //
+ " WHERE innerParentRt.id IN ( ? ) )");
filterOverrides.put("pluginName", "plugin like ?");
- filterOverrides.put("ids", "id in ( ? )");
filterOverrides.put("bundleTypeId", "bundleType.id = ?");
filterOverrides.put("categories", "category in ( ? )");
filterOverrides.put("parentResourceTypesEmpty", "" //
@@ -109,18 +106,10 @@ public class ResourceTypeCriteria extends Criteria {
return ResourceType.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterParentId(Integer filterParentId) {
this.filterParentId = filterParentId;
}
- public void addFilterIds(Integer... filterIds) {
- this.filterIds = Arrays.asList(filterIds);
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
@@ -253,5 +242,4 @@ public class ResourceTypeCriteria extends Criteria {
addSortField("pluginName");
this.sortPluginName = sortPluginName;
}
-
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java
index 4cbdf7c..21ea647 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java
@@ -40,12 +40,10 @@ public class RoleCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterDescription;
private String filterName;
private Integer filterSubjectId; // needs overrides
private Integer filterLdapSubjectId; // needs overrides
- private List<Integer> filterIds; // needs overrides
private boolean fetchPermissions;
private boolean fetchResourceGroups;
@@ -67,8 +65,6 @@ public class RoleCriteria extends Criteria {
+ " FROM Role innerRole " //
+ " JOIN innerRole.ldapSubjects innerSubject " //
+ " WHERE innerSubject.id = ? )");
-
- filterOverrides.put("ids", "id IN ( ? )");
}
@Override
@@ -76,10 +72,6 @@ public class RoleCriteria extends Criteria {
return Role.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
@@ -96,10 +88,6 @@ public class RoleCriteria extends Criteria {
this.filterLdapSubjectId = filterLdapSubjectId;
}
- public void addFilterIds(Integer... filterIds) {
- this.filterIds = CriteriaUtils.getListIgnoringNulls(filterIds);
- }
-
/**
* Requires MANAGE_SECURITY
*
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java
index 634dc15..7efbbb1 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java
@@ -37,7 +37,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class SavedSearchCriteria extends Criteria {
public static final long serialVersionUID = 1L;
- private Integer filterId;
private SearchSubsystem filterSearchSubsystem;
private String filterName;
private String filterDescription;
@@ -69,10 +68,6 @@ public class SavedSearchCriteria extends Criteria {
return SavedSearch.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterSearchSubsystem(SearchSubsystem filterSearchSubsystem) {
this.filterSearchSubsystem = filterSearchSubsystem;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java
index ebbdbc6..b693890 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java
@@ -47,7 +47,6 @@ public class ServerCriteria extends Criteria {
public static final String SORT_FIELD_COMPUTE_POWER = "computePower";
- private Integer filterId;
private String filterName;
private String filterAddress;
private Integer filterPort;
@@ -72,10 +71,6 @@ public class ServerCriteria extends Criteria {
return Server.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
index 71c2bea..f3ed640 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
@@ -41,7 +41,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class SubjectCriteria extends Criteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private String filterName;
private String filterFirstName;
private String filterLastName;
@@ -52,7 +51,6 @@ public class SubjectCriteria extends Criteria {
private Boolean filterFactive;
private Boolean filterFsystem;
private Integer filterRoleId; // needs overrides
- private List<Integer> filterIds; // needs overrides
private boolean fetchConfiguration;
private boolean fetchRoles;
@@ -72,7 +70,6 @@ public class SubjectCriteria extends Criteria {
+ " JOIN innerSubject.roles innerRole " //
+ " WHERE innerRole.id = ? )");
- filterOverrides.put("ids", "id IN ( ? )");
}
@Override
@@ -80,10 +77,6 @@ public class SubjectCriteria extends Criteria {
return Subject.class;
}
- public void addFilterId(Integer filterId) {
- this.filterId = filterId;
- }
-
public void addFilterName(String filterName) {
this.filterName = filterName;
}
@@ -124,10 +117,6 @@ public class SubjectCriteria extends Criteria {
this.filterRoleId = filterRoleId;
}
- public void addFilterIds(Integer... filterIds) {
- this.filterIds = CriteriaUtils.getListIgnoringNulls(filterIds);
- }
-
public void fetchConfiguration(boolean fetchConfiguration) {
this.fetchConfiguration = fetchConfiguration;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
index cdce132..de448fa 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
@@ -335,7 +335,7 @@ public abstract class AbstractConfigurationHistoryDataSource<T
extends AbstractR
List<Integer> ids = getFilter(request, CriteriaField.IDS, List.class);
if (ids != null) {
- criteria.addFilterIds(ids);
+ criteria.addFilterIds(ids.toArray(new Integer[0]));
}
Boolean fetchConfiguration =
request.getAttributeAsBoolean(RequestProperty.FETCH_CONFIGURATION);