Sharad Mishra has uploaded a new change for review. Change subject: core: SyntaxChecker cleanup ......................................................................
core: SyntaxChecker cleanup Use equals() instead of StringHelper.EqOp() Change-Id: Ic5f395a3a99780a73e056239b805e127ef931935 Signed-off-by: Sharad Mishra <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/8217/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java index d62ec42..8a0a3a6 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java @@ -150,7 +150,7 @@ container.setErr(SyntaxError.CANT_GET_CONDITION_FIELD_AC, startPos.argvalue, idx); return ValueParseResult.Err; } - if ((!StringHelper.EqOp(curConditionField, "")) + if ((!"".equals(curConditionField)) && (!curConditionFieldAC.validateFieldValue(curConditionField, strRealObj))) { container.setErr(SyntaxError.INVALID_CONDITION_VALUE, startPos.argvalue, idx); return ValueParseResult.Err; @@ -257,7 +257,7 @@ if (mDotAC.validate(nextObject)) { syntaxContainer.addSyntaxObject(SyntaxObjectType.DOT, nextObject, curStartPos, idx + 1); curStartPos = idx + 1; - } else if ((!StringHelper.EqOp(tryNextObj, "")) && (curConditionRelationAC.validate(tryNextObj))) { + } else if ((!"".equals(tryNextObj)) && (curConditionRelationAC.validate(tryNextObj))) { break; // i.e. the relation object has another charecter } else if (curConditionRelationAC.validate(nextObject)) { syntaxContainer.addSyntaxObject(SyntaxObjectType.CONDITION_RELATION, nextObject, curStartPos, idx + 1); @@ -844,7 +844,7 @@ } // adding the sorting part if required - if (StringHelper.EqOp(sortByPhrase, "")) { + if ("".equals(sortByPhrase)) { sortByPhrase = StringFormat.format(" ORDER BY %1$s", mSearchObjectAC.getDefaultSort(searchObjStr)); } // adding the paging phrase -- To view, visit http://gerrit.ovirt.org/8217 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5f395a3a99780a73e056239b805e127ef931935 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sharad Mishra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
