Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [5110] [RHQ-2403] Updating Criteria subclasses to pass persistent class to Criteria constructor.
|
From: <js...@rh...> - 2009-09-03 16:16:07
|
<!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] [5110] [RHQ-2403] Updating Criteria subclasses to pass persistent class to Criteria constructor.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5110</dd> <dt>Author</dt> <dd>jsanda</dd> <dt>Date</dt> <dd>2009-09-03 11:16:01 -0500 (Thu, 03 Sep 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-2403] Updating Criteria subclasses to pass persistent class to Criteria constructor. Removing no-arg constructor from Criteria as it is no longer called.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaAlertCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaAlertDefinitionCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaChannelCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ChannelCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaEventCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaGroupOperationHistoryCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupOperationHistoryCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaInstalledPackageCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaMeasurementDefinitionCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaMeasurementScheduleCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaOperationDefinitionCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaOperationHistoryCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaPackageVersionCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaResourceGroupCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaResourceOperationHistoryCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceOperationHistoryCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaResourceTypeCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaRoleCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java</a></li> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaSubjectCriteriajava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaAlertCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -30,6 +30,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlRootElement; import org.rhq.core.domain.alert.AlertPriority; </span><span class="add">+import org.rhq.core.domain.alert.Alert; </span><span class="cx"> import org.rhq.core.domain.util.PageOrdering; /** </span><span class="lines">@@ -64,7 +65,7 @@ </span><span class="cx"> private PageOrdering sortPriority; // requires overrides public AlertCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(Alert.class); </span><span class="cx"> filterOverrides.put("triggeredOperationName", "triggeredOperation like ?"); filterOverrides.put("startTime", "ctime >= ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaAlertDefinitionCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -30,6 +30,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlRootElement; import org.rhq.core.domain.alert.AlertPriority; </span><span class="add">+import org.rhq.core.domain.alert.AlertDefinition; </span><span class="cx"> import org.rhq.core.domain.util.PageOrdering; /** </span><span class="lines">@@ -61,7 +62,7 @@ </span><span class="cx"> private PageOrdering sortPriority; public AlertDefinitionCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(AlertDefinition.class); </span><span class="cx"> filterOverrides.put("alertTemplateParentId", "parentId = ?"); filterOverrides.put("alertTemplateResourceTypeId", "resourceType.id = ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaChannelCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ChannelCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ChannelCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ChannelCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -29,6 +29,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlAccessorType; import org.rhq.core.domain.util.PageOrdering; </span><span class="add">+import org.rhq.core.domain.content.Channel; </span><span class="cx"> /** * @author Joseph Marques </span><span class="lines">@@ -50,7 +51,7 @@ </span><span class="cx"> private PageOrdering sortName; public ChannelCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(Channel.class); </span><span class="cx"> filterOverrides.put("resourceIds", "resourceChannels.resource.id IN ( ? )"); } </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -72,7 +72,9 @@ </span><span class="cx"> private Class<?> persistentClass; </span><span class="rem">- public Criteria() { </span><span class="add">+ public Criteria(Class<?> persistentClass) { + this.persistentClass = persistentClass; + </span><span class="cx"> filterOverrides = new HashMap<String, String>(); sortOverrides = new HashMap<String, String>(); </span><span class="lines">@@ -80,18 +82,13 @@ </span><span class="cx"> requiredPermissions = new HashSet<Permission>(); </span><span class="rem">- /* - * reasonably large default, but prevent accidentally returning 100K objects </span><span class="add">+ /* + * reasonably large default, but prevent accidentally returning 100K objects </span><span class="cx"> * unless you use the setPaging method to explicit denote you want that many */ setPaging(0, 200); } </span><span class="rem">- public Criteria(Class<?> persistentClass) { - this(); - this.persistentClass = persistentClass; - } - </span><span class="cx"> public Class<?> getPersistentClass() { return persistentClass; } </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaEventCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -26,6 +26,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlAccessorType; import org.rhq.core.domain.event.EventSeverity; </span><span class="add">+import org.rhq.core.domain.event.Event; </span><span class="cx"> import org.rhq.core.domain.util.PageOrdering; /** </span><span class="lines">@@ -53,7 +54,7 @@ </span><span class="cx"> private PageOrdering sortSeverity; public EventCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(Event.class); </span><span class="cx"> filterOverrides.put("sourceName", "source.eventDefinition.name like ?"); filterOverrides.put("startTime", "timestamp >= ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaGroupOperationHistoryCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupOperationHistoryCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupOperationHistoryCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupOperationHistoryCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -22,10 +22,11 @@ </span><span class="cx"> */ package org.rhq.core.domain.criteria; </span><span class="rem">-import java.util.List; </span><span class="add">+import org.rhq.core.domain.operation.GroupOperationHistory; </span><span class="cx"> import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; </span><span class="add">+import java.util.List; </span><span class="cx"> /** * @author Joseph Marques </span><span class="lines">@@ -35,7 +36,7 @@ </span><span class="cx"> private List<Integer> filterResourceGroupIds; // requires override public GroupOperationHistoryCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(GroupOperationHistory.class); </span><span class="cx"> filterOverrides.put("resourceGroupIds", "group.id IN ( ? )"); } </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaInstalledPackageCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -4,6 +4,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlAccessorType; import org.rhq.core.domain.util.PageOrdering; </span><span class="add">+import org.rhq.core.domain.content.InstalledPackage; </span><span class="cx"> @XmlAccessorType(XmlAccessType.FIELD) @SuppressWarnings("unused") </span><span class="lines">@@ -24,7 +25,7 @@ </span><span class="cx"> private PageOrdering sortInstallationDate; public InstalledPackageCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(InstalledPackage.class); </span><span class="cx"> filterOverrides.put("installationTimeMinimum", "installationDate >= ?"); filterOverrides.put("installationTimeMaximum", "installationDate <= ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaMeasurementDefinitionCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -30,6 +30,7 @@ </span><span class="cx"> import org.rhq.core.domain.measurement.MeasurementCategory; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.NumericType; </span><span class="add">+import org.rhq.core.domain.measurement.MeasurementDefinition; </span><span class="cx"> import org.rhq.core.domain.util.PageOrdering; /** </span><span class="lines">@@ -66,7 +67,7 @@ </span><span class="cx"> private PageOrdering sortDefaultInterval; public MeasurementDefinitionCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(MeasurementDefinition.class); </span><span class="cx"> filterOverrides.put("resourceTypeName", "resourceType.name like ?"); filterOverrides.put("resourceTypeId", "resourceType.id = ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaMeasurementScheduleCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -29,6 +29,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlAccessorType; import org.rhq.core.domain.util.PageOrdering; </span><span class="add">+import org.rhq.core.domain.measurement.MeasurementSchedule; </span><span class="cx"> /** * @author Joseph Marques </span><span class="lines">@@ -52,7 +53,7 @@ </span><span class="cx"> private PageOrdering sortName; // requires overrides public MeasurementScheduleCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(MeasurementSchedule.class); </span><span class="cx"> filterOverrides.put("definitionIds", "definition.id IN ( ? )"); filterOverrides.put("resourceId", "resource.id IN ( ? )"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaOperationDefinitionCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -29,6 +29,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlAccessorType; import org.rhq.core.domain.util.PageOrdering; </span><span class="add">+import org.rhq.core.domain.operation.OperationDefinition; </span><span class="cx"> /** * @author Joseph Marques </span><span class="lines">@@ -55,7 +56,7 @@ </span><span class="cx"> private PageOrdering sortName; public OperationDefinitionCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(OperationDefinition.class); </span><span class="cx"> filterOverrides.put("resourceTypeId", "resourceType.id = ?"); filterOverrides.put("resourceTypeName", "resourceType.name like ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaOperationHistoryCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -27,6 +27,7 @@ </span><span class="cx"> import org.rhq.core.domain.operation.JobId; import org.rhq.core.domain.operation.OperationRequestStatus; </span><span class="add">+import org.rhq.core.domain.operation.OperationHistory; </span><span class="cx"> import org.rhq.core.domain.util.PageOrdering; /** </span><span class="lines">@@ -56,8 +57,16 @@ </span><span class="cx"> private PageOrdering sortOperationName; // requires override public OperationHistoryCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(OperationHistory.class); + init(); + } </span><span class="cx"> </span><span class="add">+ protected OperationHistoryCriteria(Class<? extends OperationHistory> clazz) { + super(clazz); + init(); + } + + private void init() { </span><span class="cx"> filterOverrides.put("operationDefinitionId", "operationDefinition.id = ?"); filterOverrides.put("operationName", "operationDefinition.name like ?"); filterOverrides.put("startTime", "startedTime >= ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaPackageVersionCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -5,6 +5,7 @@ </span><span class="cx"> import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.util.PageOrdering; </span><span class="add">+import org.rhq.core.domain.content.PackageVersion; </span><span class="cx"> @XmlAccessorType(XmlAccessType.FIELD) @SuppressWarnings("unused") </span><span class="lines">@@ -35,7 +36,7 @@ </span><span class="cx"> private PageOrdering sortDisplayName; public PackageVersionCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(PackageVersion.class); </span><span class="cx"> filterOverrides.put("channelId", "id IN " // + "( SELECT cpv.packageVersion.id" // </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaResourceGroupCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -30,6 +30,7 @@ </span><span class="cx"> import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.resource.group.GroupCategory; </span><span class="add">+import org.rhq.core.domain.resource.group.ResourceGroup; </span><span class="cx"> import org.rhq.core.domain.util.PageOrdering; /** </span><span class="lines">@@ -62,7 +63,7 @@ </span><span class="cx"> private PageOrdering sortResourceTypeName; // requires overrides public ResourceGroupCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(ResourceGroup.class); </span><span class="cx"> filterOverrides.put("resourceTypeId", "resourceType.id = ?"); filterOverrides.put("resourceTypeName", "resourceType.name like ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaResourceOperationHistoryCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceOperationHistoryCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceOperationHistoryCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceOperationHistoryCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -22,6 +22,8 @@ </span><span class="cx"> */ package org.rhq.core.domain.criteria; </span><span class="add">+import org.rhq.core.domain.operation.ResourceOperationHistory; + </span><span class="cx"> import java.util.Arrays; import java.util.List; </span><span class="lines">@@ -43,7 +45,7 @@ </span><span class="cx"> private boolean fetchResults; public ResourceOperationHistoryCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(ResourceOperationHistory.class); </span><span class="cx"> filterOverrides.put("resourceIds", "resource.id IN ( ? )"); } </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaResourceTypeCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -29,6 +29,7 @@ </span><span class="cx"> import org.rhq.core.domain.resource.CreateDeletePolicy; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceCreationDataType; </span><span class="add">+import org.rhq.core.domain.resource.ResourceType; </span><span class="cx"> import org.rhq.core.domain.util.PageOrdering; /** </span><span class="lines">@@ -67,7 +68,7 @@ </span><span class="cx"> private PageOrdering sortPluginName; // needs overrides public ResourceTypeCriteria() { </span><span class="rem">- super(); </span><span class="add">+ super(ResourceType.class); </span><span class="cx"> filterOverrides.put("pluginName", "plugin like ?"); </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaRoleCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -26,6 +26,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlAccessorType; import org.rhq.core.domain.authz.Permission; </span><span class="add">+import org.rhq.core.domain.authz.Role; </span><span class="cx"> import org.rhq.core.domain.util.PageOrdering; /** </span><span class="lines">@@ -47,6 +48,10 @@ </span><span class="cx"> private PageOrdering sortName; </span><span class="add">+ public RoleCriteria() { + super(Role.class); + } + </span><span class="cx"> public void addFilterId(Integer filterId) { this.filterId = filterId; } </span></pre></div> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomaincriteriaSubjectCriteriajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java (5109 => 5110)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java 2009-09-03 16:10:05 UTC (rev 5109) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java 2009-09-03 16:16:01 UTC (rev 5110) </span><span class="lines">@@ -26,6 +26,7 @@ </span><span class="cx"> import javax.xml.bind.annotation.XmlAccessorType; import org.rhq.core.domain.util.PageOrdering; </span><span class="add">+import org.rhq.core.domain.auth.Subject; </span><span class="cx"> /** * @author Joseph Marques </span><span class="lines">@@ -57,6 +58,10 @@ </span><span class="cx"> private PageOrdering sortPhoneNumber; private PageOrdering sortDepartment; </span><span class="add">+ public SubjectCriteria() { + super(Subject.class); + } + </span><span class="cx"> public void addFilterId(Integer filterId) { this.filterId = filterId; } </span> </pre> </div> </div> </body> </html> |