Eli Mesika has uploaded a new change for review. Change subject: core: enable <not equal> operator for tag search ......................................................................
core: enable <not equal> operator for tag search This patch allows searching Tags with != operator. Up to now, when "tag" is used in the search criteria, we had used StringOnlyEqualConditionRelationAutoCompleter to validate the tag value, this class allows only for "=" operator. Actually, there is no reason for this limitation and we can safely replace this class use with StringConditionRelationAutoCompleter that allows both "=" and "!=" operators. This makes StringOnlyEqualConditionRelationAutoCompleter unused and therefor it was removed. Change-Id: Icb8fd9c3f75a62841b8d89933c16ac2077c95e4d Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1092609 Signed-off-by: Eli Mesika <emes...@redhat.com> --- D backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StringOnlyEqualConditionRelationAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java 4 files changed, 1 insertion(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/28280/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StringOnlyEqualConditionRelationAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StringOnlyEqualConditionRelationAutoCompleter.java deleted file mode 100644 index 144d77e..0000000 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StringOnlyEqualConditionRelationAutoCompleter.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.ovirt.engine.core.searchbackend; - -public final class StringOnlyEqualConditionRelationAutoCompleter extends BaseAutoCompleter { - - public final static StringOnlyEqualConditionRelationAutoCompleter INSTANCE = - new StringOnlyEqualConditionRelationAutoCompleter(); - - private StringOnlyEqualConditionRelationAutoCompleter() { - super("="); - } -} diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java index 9bb7ac1..788d3e1 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java @@ -60,11 +60,7 @@ @Override public IAutoCompleter getFieldRelationshipAutoCompleter(String fieldName) { - if ("TAG".equals(fieldName)) { - return StringOnlyEqualConditionRelationAutoCompleter.INSTANCE; - } else { return StringConditionRelationAutoCompleter.INSTANCE; - } } @Override diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java index d9c9e7f..9fd6159 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java @@ -95,9 +95,7 @@ || "COMMITTED_MEM".equals(fieldName)) { return NumericConditionRelationAutoCompleter.INSTANCE; } - else if ("TAG".equals(fieldName)) { - return StringOnlyEqualConditionRelationAutoCompleter.INSTANCE; - } else { + else { return StringConditionRelationAutoCompleter.INSTANCE; } } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java index 588ab32..887a1d7 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java @@ -112,8 +112,6 @@ } else if ("CPU_USAGE".equals(fieldName) || "MEM_USAGE".equals(fieldName) || "MEMORY".equals(fieldName) || "NETWORK_USAGE".equals(fieldName)) { return NumericConditionRelationAutoCompleter.INSTANCE; - } else if ("TAG".equals(fieldName)) { - return StringOnlyEqualConditionRelationAutoCompleter.INSTANCE; } else { return StringConditionRelationAutoCompleter.INSTANCE; } -- To view, visit http://gerrit.ovirt.org/28280 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb8fd9c3f75a62841b8d89933c16ac2077c95e4d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emes...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
