Tal Nisan has uploaded a new change for review. Change subject: core: Eliminated use of StringHelper.EqOp ......................................................................
core: Eliminated use of StringHelper.EqOp Removed the method StringHelper.EqOp, it was used mainly in searchbackend module to check String equality with constancts thus it could be replaced with standard String implementation of equals and equalsIgnoreCase Change-Id: Iaf3d65db824f31df05dc7b0eda5f9c24274cf53c Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringHelper.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdUserConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StoragePoolFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.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 13 files changed, 66 insertions(+), 83 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/11670/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java index 4749a38..4422fba 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java @@ -2,8 +2,6 @@ import java.io.Serializable; -import org.ovirt.engine.core.compat.StringHelper; - public class StorageServerConnections implements Serializable { private static final long serialVersionUID = 5444293590307760809L; @@ -186,7 +184,8 @@ public boolean equals(Object obj) { boolean returnValue = super.equals(obj); if (!returnValue && obj != null && obj instanceof StorageServerConnections) { - returnValue = (!"".equals(getid()) && StringHelper.EqOp(getid(), ((StorageServerConnections) obj).getid())); + returnValue = + (getid() != null && !getid().isEmpty() && getid().equals(((StorageServerConnections) obj).getid())); } return returnValue; } diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringHelper.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringHelper.java index d1d74d7..c734b2f 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringHelper.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringHelper.java @@ -115,18 +115,6 @@ return trimEnd(trimStart(string, charsToTrim), charsToTrim); } - // ------------------------------------------------------------------------------------ - // This method is used for string equality comparisons when the option - // 'Use helper 'stringsEqual' method to handle null strings' is selected - // (The Java String 'equals' method can't be called on a null instance). - // ------------------------------------------------------------------------------------ - public static boolean EqOp(String s1, String s2) { - if (s1 == null && s2 == null) - return true; - else - return s1 != null && s1.equals(s2); - } - public static String trim(String s, char[] cs) { Character[] chars = new Character[cs.length]; for (int i = 0; i < cs.length; i++) @@ -146,7 +134,7 @@ /** * Aggregate String using the given char separator - * + * * @param messgaes * - the string to aggregate * @param seperator diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdUserConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdUserConditionFieldAutoCompleter.java index 068b1d1..888a1da 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdUserConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdUserConditionFieldAutoCompleter.java @@ -2,38 +2,37 @@ import java.util.Collections; -import org.ovirt.engine.core.compat.StringHelper; - public class AdUserConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public AdUserConditionFieldAutoCompleter() { // Building the basic vervs Dict mVerbs.put("NAME", "NAME"); mVerbs.put("USERNAME", "USERNAME"); - if (StringHelper.EqOp(SyntaxCheckerFactory.getConfigAuthenticationMethod().toUpperCase(), "LDAP")) { - mVerbs.put("LASTNAME", "LASTNAME"); - mVerbs.put("DEPARTMENT", "DEPARTMENT"); - mVerbs.put("TITLE", "TITLE"); - } mVerbs.put("ALLNAMES", "ALLNAMES"); - // Building the autoCompletion Dict - buildCompletions(); // Building the types dict getTypeDictionary().put("NAME", String.class); getTypeDictionary().put("USERNAME", String.class); - if (StringHelper.EqOp(SyntaxCheckerFactory.getConfigAuthenticationMethod().toUpperCase(), "LDAP")) { - getTypeDictionary().put("LASTNAME", String.class); - getTypeDictionary().put("DEPARTMENT", String.class); - getTypeDictionary().put("TITLE", String.class); - } // building the ColumnName Dict columnNameDict.put("NAME", "$GIVENNAME"); columnNameDict.put("USERNAME", "$SAMACCOUNTNAME"); - if (StringHelper.EqOp(SyntaxCheckerFactory.getConfigAuthenticationMethod().toUpperCase(), "LDAP")) { + + if ("LDAP".equalsIgnoreCase(SyntaxCheckerFactory.getConfigAuthenticationMethod())) { + mVerbs.put("LASTNAME", "LASTNAME"); + mVerbs.put("DEPARTMENT", "DEPARTMENT"); + mVerbs.put("TITLE", "TITLE"); + + getTypeDictionary().put("LASTNAME", String.class); + getTypeDictionary().put("DEPARTMENT", String.class); + getTypeDictionary().put("TITLE", String.class); + columnNameDict.put("LASTNAME", "$SN"); columnNameDict.put("DEPARTMENT", "$DEPARTMENT"); columnNameDict.put("TITLE", "$TITLE"); } + + // Building the autoCompletion Dict + buildCompletions(); + // Building the validation dict for (String key : mVerbs.keySet()) { validationDict.put(key, Collections.singletonList(validCharacters)); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java index 44fda9b..d489410 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java @@ -2,7 +2,6 @@ import org.ovirt.engine.core.common.AuditLogSeverity; import org.ovirt.engine.core.common.businessentities.DateEnumForSearch; -import org.ovirt.engine.core.compat.StringHelper; public class AuditLogConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public AuditLogConditionFieldAutoCompleter() { @@ -89,23 +88,23 @@ @SuppressWarnings("deprecation") @Override public IAutoCompleter getFieldRelationshipAutoCompleter(final String fieldName) { - if (StringHelper.EqOp(fieldName, "SEVERITY")) { + if ("SEVERITY".equals(fieldName)) { return NumericConditionRelationAutoCompleter.INSTANCE; } - else if (StringHelper.EqOp(fieldName, "TIME")) { + else if ("TIME".equals(fieldName)) { return TimeConditionRelationAutoCompleter.INSTANCE; } - else if (StringHelper.EqOp(fieldName, "TYPE") || StringHelper.EqOp(fieldName, "MESSAGE") - || StringHelper.EqOp(fieldName, "USRNAME") || StringHelper.EqOp(fieldName, "EVENT_HOST") - || StringHelper.EqOp(fieldName, "_EVENT_HOST_ID") - || StringHelper.EqOp(fieldName, "EVENT_VM") || StringHelper.EqOp(fieldName, "_EVENT_VM_ID") - || StringHelper.EqOp(fieldName, "EVENT_TEMPLATE") || StringHelper.EqOp(fieldName, "_EVENT_TEMPLATE_ID") - || StringHelper.EqOp(fieldName, "EVENT_STORAGE") || StringHelper.EqOp(fieldName, "EVENT_DATACENTER") - || StringHelper.EqOp(fieldName, "_EVENT_DATACENTER_ID") - || StringHelper.EqOp(fieldName, "_EVENT_QUOTA_ID") - || StringHelper.EqOp(fieldName, "EVENT_VOLUME") || StringHelper.EqOp(fieldName, "_EVENT_VOLUME_ID") || - StringHelper.EqOp(fieldName, "CORRELATION_ID") || StringHelper.EqOp(fieldName, "ORIGIN") || - StringHelper.EqOp(fieldName, "CUSTOM_EVENT_ID") || StringHelper.EqOp(fieldName, "DELETED")) { + else if ("TYPE".equals(fieldName) || "MESSAGE".equals(fieldName) + || "USRNAME".equals(fieldName) || "EVENT_HOST".equals(fieldName) + || "_EVENT_HOST_ID".equals(fieldName) + || "EVENT_VM".equals(fieldName) || "_EVENT_VM_ID".equals(fieldName) + || "EVENT_TEMPLATE".equals(fieldName) || "_EVENT_TEMPLATE_ID".equals(fieldName) + || "EVENT_STORAGE".equals(fieldName) || "EVENT_DATACENTER".equals(fieldName) + || "_EVENT_DATACENTER_ID".equals(fieldName) + || "_EVENT_QUOTA_ID".equals(fieldName) + || "EVENT_VOLUME".equals(fieldName) || "_EVENT_VOLUME_ID".equals(fieldName) || + "CORRELATION_ID".equals(fieldName) || "ORIGIN".equals(fieldName) || + "CUSTOM_EVENT_ID".equals(fieldName) || "DELETED".equals(fieldName)) { return StringConditionRelationAutoCompleter.INSTANCE; } else { return null; @@ -114,10 +113,10 @@ @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { - if (StringHelper.EqOp(fieldName, "SEVERITY")) { + if ("SEVERITY".equals(fieldName)) { return new EnumValueAutoCompleter(AuditLogSeverity.class); } - else if (StringHelper.EqOp(fieldName, "TIME")) { + else if ("TIME".equals(fieldName)) { return new DateEnumValueAutoCompleter(DateEnumForSearch.class); } else { return null; diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java index 36a883a..62ba525 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java @@ -352,7 +352,7 @@ } } else { for (int i = -2; i > -8; i--) { - if (StringHelper.EqOp(DateUtils.getDayOfWeek(i), StringHelper.trim(value, '\'').toUpperCase())) { + if (DateUtils.getDayOfWeek(i).equalsIgnoreCase(StringHelper.trim(value, '\''))) { formatedValue = DateTime.getNow(); return formatedValue.resetToMidnight(); } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterConditionFieldAutoCompleter.java index 01e4cda..123bbb4 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterConditionFieldAutoCompleter.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.searchbackend; -import org.ovirt.engine.core.compat.*; public class ClusterConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public ClusterConditionFieldAutoCompleter() { @@ -33,7 +32,7 @@ @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { IConditionValueAutoCompleter retval = null; - if (StringHelper.EqOp(fieldName, "INITIALIZED")) { + if ("INITIALIZED".equals(fieldName)) { retval = new BitValueAutoCompleter(); } else { } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleter.java index 1ab9301..81e42ce 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleter.java @@ -3,7 +3,6 @@ import org.ovirt.engine.core.common.businessentities.Identifiable; import org.ovirt.engine.core.compat.DateTime; import org.ovirt.engine.core.compat.DayOfWeek; -import org.ovirt.engine.core.compat.StringHelper; public class DateEnumValueAutoCompleter extends BaseAutoCompleter implements IConditionValueAutoCompleter { private java.util.HashMap<String, Integer> mEnumValues = new java.util.HashMap<String, Integer>(); @@ -31,6 +30,7 @@ } + @Override public String convertFieldEnumValueToActualValue(String fieldValue) { if (DateUtils.parse(fieldValue) != null) { return fieldValue; @@ -43,7 +43,7 @@ // check for rest of the week for (DayOfWeek day : DayOfWeek.values()) { - if (StringHelper.EqOp(fieldValue.toUpperCase(), day.toString().toUpperCase())) { + if (day.toString().equalsIgnoreCase(fieldValue)) { return day.toString(); } } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java index 6d8d9d7..dea078a 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.searchbackend; -import org.ovirt.engine.core.compat.StringHelper; public class NetworkConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { private static final String NAME = "NAME"; @@ -58,7 +57,7 @@ @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { IConditionValueAutoCompleter completer = null; - if (StringHelper.EqOp(fieldName, STP) || StringHelper.EqOp(fieldName, VM_NETWORK)) { + if (STP.equals(fieldName) || VM_NETWORK.equals(fieldName)) { completer = new BitValueAutoCompleter(); } return completer; diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java index 0937400..b90cad8 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java @@ -1,7 +1,8 @@ package org.ovirt.engine.core.searchbackend; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; +import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; +import org.ovirt.engine.core.common.businessentities.StorageType; public class StorageDomainFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public StorageDomainFieldAutoCompleter() { @@ -40,8 +41,8 @@ @Override public IAutoCompleter getFieldRelationshipAutoCompleter(String fieldName) { - if (StringHelper.EqOp(fieldName, "SIZE") || StringHelper.EqOp(fieldName, "USED") - || StringHelper.EqOp(fieldName, "COMMITTED")) { + if ("SIZE".equals(fieldName) || "USED".equals(fieldName) + || "COMMITTED".equals(fieldName)) { return NumericConditionRelationAutoCompleter.INSTANCE; } else { return StringConditionRelationAutoCompleter.INSTANCE; @@ -51,10 +52,10 @@ @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { IConditionValueAutoCompleter retval = null; - if (StringHelper.EqOp(fieldName, "TYPE")) { + if ("TYPE".equals(fieldName)) { retval = new EnumValueAutoCompleter(StorageType.class); } - else if (StringHelper.EqOp(fieldName, "STATUS")) { + else if ("STATUS".equals(fieldName)) { retval = new EnumValueAutoCompleter(StorageDomainSharedStatus.class); } else { } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StoragePoolFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StoragePoolFieldAutoCompleter.java index 4d48c53..dca9bbf 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StoragePoolFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StoragePoolFieldAutoCompleter.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.searchbackend; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; +import org.ovirt.engine.core.common.businessentities.StorageType; public class StoragePoolFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public StoragePoolFieldAutoCompleter() { @@ -37,10 +37,10 @@ @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { IConditionValueAutoCompleter retval = null; - if (StringHelper.EqOp(fieldName, "STATUS")) { + if ("STATUS".equals(fieldName)) { retval = new EnumValueAutoCompleter(StoragePoolStatus.class); } - else if (StringHelper.EqOp(fieldName, "TYPE")) { + else if ("TYPE".equals(fieldName)) { retval = new EnumValueAutoCompleter(StorageType.class); } else { } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java index 4e199aa..d15897a 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java @@ -4,8 +4,6 @@ import java.util.LinkedList; import java.util.List; -import org.ovirt.engine.core.compat.StringHelper; - public class SyntaxContainer implements Iterable<SyntaxObject> { private final String mOrigText; @@ -151,7 +149,8 @@ for (SyntaxObject obj : mObjList) { if (obj.getType() == SyntaxObjectType.CROSS_REF_OBJ) { String objSingularName = getObjSingularName(obj.getBody()); - if ((!retval.contains(objSingularName)) && (!StringHelper.EqOp(searchObj, objSingularName))) { + if ((!retval.contains(objSingularName)) && + searchObj != null && !searchObj.equals(objSingularName)) { retval.add(objSingularName); } } 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 7b11de1..3dda369 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 @@ -1,7 +1,8 @@ package org.ovirt.engine.core.searchbackend; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.LdapRefStatus; +import org.ovirt.engine.core.compat.RefObject; +import org.ovirt.engine.core.compat.StringHelper; public class VdcUserConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public enum UserOrGroup { @@ -57,7 +58,7 @@ @Override public IAutoCompleter getFieldRelationshipAutoCompleter(String fieldName) { - if (StringHelper.EqOp(fieldName, "TAG")) { + if ("TAG".equals(fieldName)) { return StringOnlyEqualConditionRelationAutoCompleter.INSTANCE; } else { return StringConditionRelationAutoCompleter.INSTANCE; @@ -67,7 +68,7 @@ @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { IConditionValueAutoCompleter retval = null; - if (StringHelper.EqOp(fieldName, "STATUS")) { + if ("STATUS".equals(fieldName)) { retval = new EnumValueAutoCompleter(LdapRefStatus.class); } return retval; @@ -75,12 +76,12 @@ @Override public void formatValue(String fieldName, RefObject<String> relations, RefObject<String> value, boolean caseSensitive) { - if (StringHelper.EqOp(fieldName, "STATUS")) { + if ("STATUS".equals(fieldName)) { String tmp = StringHelper.trim(value.argvalue, '\''); - if ((StringHelper.EqOp(relations.argvalue, "=")) && (StringHelper.EqOp(tmp, "1"))) { + if ("=".equals(relations.argvalue) && "1".equals(tmp)) { relations.argvalue = ">="; } - if ((StringHelper.EqOp(relations.argvalue, "!=")) && (StringHelper.EqOp(tmp, "1"))) { + if ("!=".equals(relations.argvalue) && "1".equals(tmp)) { relations.argvalue = "<"; } } else { 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 b314041..6f9f7fe 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 @@ -2,7 +2,6 @@ import org.ovirt.engine.core.common.businessentities.VDSNiceType; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.compat.StringHelper; public class VdsConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public VdsConditionFieldAutoCompleter() { @@ -76,14 +75,14 @@ @Override public IAutoCompleter getFieldRelationshipAutoCompleter(String fieldName) { - if (StringHelper.EqOp(fieldName, "MEMORY") || StringHelper.EqOp(fieldName, "CPUS") - || StringHelper.EqOp(fieldName, "CPU_USAGE") || StringHelper.EqOp(fieldName, "MEM_USAGE") - || StringHelper.EqOp(fieldName, "LOAD") || StringHelper.EqOp(fieldName, "CPU_SPEED") - || StringHelper.EqOp(fieldName, "ACTIVE_VMS") || StringHelper.EqOp(fieldName, "NETWORK_USAGE") - || StringHelper.EqOp(fieldName, "COMMITTED_MEM")) { + if ("MEMORY".equals(fieldName) || "CPUS".equals(fieldName) + || "CPU_USAGE".equals(fieldName) || "MEM_USAGE".equals(fieldName) + || "LOAD".equals(fieldName) || "CPU_SPEED".equals(fieldName) + || "ACTIVE_VMS".equals(fieldName) || "NETWORK_USAGE".equals(fieldName) + || "COMMITTED_MEM".equals(fieldName)) { return NumericConditionRelationAutoCompleter.INSTANCE; } - else if (StringHelper.EqOp(fieldName, "TAG")) { + else if ("TAG".equals(fieldName)) { return StringOnlyEqualConditionRelationAutoCompleter.INSTANCE; } else { return StringConditionRelationAutoCompleter.INSTANCE; @@ -93,10 +92,10 @@ @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { IConditionValueAutoCompleter retval = null; - if (StringHelper.EqOp(fieldName, "STATUS")) { + if ("STATUS".equals(fieldName)) { retval = new EnumValueAutoCompleter(VDSStatus.class); } - else if (StringHelper.EqOp(fieldName, "TYPE")) { + else if ("TYPE".equals(fieldName)) { retval = new EnumValueAutoCompleter(VDSNiceType.class); } else { } -- To view, visit http://gerrit.ovirt.org/11670 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf3d65db824f31df05dc7b0eda5f9c24274cf53c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
