modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftChangeSetJPACriteria.java | 32 +++++----- 1 file changed, 19 insertions(+), 13 deletions(-)
New commits: commit 7e9ec31437b8b547bb1c048113081031b86a9721 Author: John Sanda jsanda@redhat.com Date: Fri Jul 29 13:47:51 2011 -0400
Fix filter overrides for range filters
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftChangeSetJPACriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftChangeSetJPACriteria.java index 6c17877..7a7f78f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftChangeSetJPACriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftChangeSetJPACriteria.java @@ -39,9 +39,9 @@ public class DriftChangeSetJPACriteria extends Criteria implements DriftChangeSe private Integer filterId; private Integer filterInitial; // needs override private Integer filterResourceId; // needs override - private String filterVersion; - private String filterStartVersion; - private String filterEndVersion; + private Integer filterVersion; + private Integer filterStartVersion; + private Integer filterEndVersion; private Long filterCreatedAfter; private Long filterCreatedBefore; private DriftChangeSetCategory filterCategory; @@ -52,10 +52,10 @@ public class DriftChangeSetJPACriteria extends Criteria implements DriftChangeSe public DriftChangeSetJPACriteria() { filterOverrides.put("initial", "version = 0"); filterOverrides.put("resourceId", "resource.id = ?"); - filterOverrides.put("filterStartVersion", "version >= ?"); - filterOverrides.put("filterEndVersion", "version <= ?"); - filterOverrides.put("filterCreatedAfter", "ctime >= ?"); - filterOverrides.put("filterCreatedBefore", "ctime <= ?"); + filterOverrides.put("startVersion", "version >= ?"); + filterOverrides.put("endVersion", "version <= ?"); + filterOverrides.put("createdAfter", "ctime >= ?"); + filterOverrides.put("createdBefore", "ctime <= ?"); }
@Override @@ -75,32 +75,38 @@ public class DriftChangeSetJPACriteria extends Criteria implements DriftChangeSe }
public void addFilterVersion(String filterVersion) { - this.filterVersion = filterVersion; + if (filterVersion != null) { + this.filterVersion = Integer.parseInt(filterVersion); + } }
@Override public String getFilterVersion() { - return filterVersion; + return filterVersion == null ? null : filterVersion.toString(); }
@Override public void addFilterStartVersion(String filterStartVersion) { - this.filterStartVersion = filterStartVersion; + if (filterStartVersion != null) { + this.filterStartVersion = Integer.parseInt(filterStartVersion); + } }
@Override public String getFilterStartVersion() { - return filterStartVersion; + return filterStartVersion == null ? null : filterStartVersion.toString(); }
@Override public void addFilterEndVersion(String filterEndVersion) { - this.filterEndVersion = filterEndVersion; + if (filterEndVersion != null) { + this.filterEndVersion = Integer.parseInt(filterEndVersion); + } }
@Override public String getFilterEndVersion() { - return filterEndVersion; + return filterEndVersion == null ? null : filterEndVersion.toString(); }
@Override
rhq-commits@lists.fedorahosted.org