modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
| 3 ++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
| 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 4d12070eeb9da3f79f855ccd36cf923b31e7732e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 4 13:49:20 2011 -0500
do not hard code enum ordinals directly in the string in case it ever changes in the
future
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
index b16270d..b8b1f1f 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
@@ -26,6 +26,7 @@ import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.search.SearchSubsystem;
import org.rhq.core.domain.search.assist.AlertSearchAssistParam;
@@ -114,7 +115,7 @@ public class ResourceSearchAssistant extends TabAwareSearchAssistant
{
+ " FROM MeasurementSchedule ms, Resource res " //
+ " JOIN ms.definition def " //
+ " WHERE ms.resource = res " // only suggest names that exist
for resources in inventory
- + " AND def.dataType = 1 " // trait types
+ + " AND def.dataType = " + DataType.TRAIT.ordinal() // trait
types
+ conditionallyAddJPQLString("ms.definition.name", filter) //
+ conditionallyAddJPQLString("res.resourceType.category", tab)
//
+ conditionallyAddAuthzFragment(getAuthzFragment()) //
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
index d411efb..c25d12c 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
@@ -24,6 +24,7 @@ import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.search.assist.AlertSearchAssistParam;
import org.rhq.enterprise.server.search.SearchExpressionException;
@@ -87,7 +88,7 @@ public class ResourceSearchTranslator extends AbstractSearchTranslator
{
+ " FROM Resource res, MeasurementDataTrait trait " //
+ " JOIN res.schedules schedule " //
+ " WHERE trait.schedule = schedule " //
- + " AND schedule.definition.dataType = 1 " //
+ + " AND schedule.definition.dataType = " +
DataType.TRAIT.ordinal() //
+ " AND " +
getJPQLForString("schedule.definition.name", RHQLComparisonOperator.EQUALS,
param) //
+ " AND " + getJPQLForString("trait.value", op,
filter));
Show replies by date