Frank Kobzik has uploaded a new change for review. Change subject: core: Extract hardcoded strings to constants ......................................................................
core: Extract hardcoded strings to constants This patch pulls hardcoded strings in VmConditionFieldAutoCompleter to constants. They are used in follow up frontend patch (sorting columns in VM main tab in webadmin application). Change-Id: I7d2fb964cc0c5520e37cd190e88f09d4218868d2 Signed-off-by: Frantisek Kobzik <fkob...@redhat.com> Bug-Url: https://bugzilla.redhat.com/1103715 --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java 1 file changed, 122 insertions(+), 86 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/28281/1 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..f1a1a90 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 @@ -13,106 +13,142 @@ import org.ovirt.engine.core.compat.TimeSpan; public class VmConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { + + public static final String NAME = "NAME"; + public static final String COMMENT = "COMMENT"; + public static final String STATUS = "STATUS"; + public static final String HOST = "HOST"; + public static final String IP = "IP"; + public static final String FQDN = "FQDN"; + public static final String UPTIME = "UPTIME"; + public static final String OS = "OS"; + public static final String CREATIONDATE = "CREATIONDATE"; + public static final String ADDRESS = "ADDRESS"; + public static final String CPU_USAGE = "CPU_USAGE"; + public static final String MEM_USAGE = "MEM_USAGE"; + public static final String NETWORK_USAGE = "NETWORK_USAGE"; + public static final String MIGRATION_PROGRESS_PERCENT = "MIGRATION_PROGRESS_PERCENT"; + public static final String MEMORY = "MEMORY"; + public static final String APPS = "APPS"; + public static final String CLUSTER = "CLUSTER"; + public static final String POOL = "POOL"; + public static final String LOGGEDINUSER = "LOGGEDINUSER"; + public static final String TAG = "TAG"; + public static final String DATACENTER = "DATACENTER"; + public static final String TYPE = "TYPE"; + public static final String QUOTA = "QUOTA"; + public static final String ID = "ID"; + public static final String DESCRIPTION = "DESCRIPTION"; + public static final String ARCHITECTURE = "ARCHITECTURE"; + public VmConditionFieldAutoCompleter() { // Building the basic verbs Dict - mVerbs.add("NAME"); - mVerbs.add("COMMENT"); - mVerbs.add("STATUS"); - mVerbs.add("IP"); - mVerbs.add("UPTIME"); - mVerbs.add("OS"); - mVerbs.add("CREATIONDATE"); - mVerbs.add("ADDRESS"); - mVerbs.add("CPU_USAGE"); - mVerbs.add("MEM_USAGE"); - mVerbs.add("NETWORK_USAGE"); - mVerbs.add("MEMORY"); - mVerbs.add("APPS"); - mVerbs.add("CLUSTER"); - mVerbs.add("POOL"); - mVerbs.add("LOGGEDINUSER"); - mVerbs.add("TAG"); - mVerbs.add("DATACENTER"); - mVerbs.add("TYPE"); - mVerbs.add("QUOTA"); - mVerbs.add("ID"); - mVerbs.add("DESCRIPTION"); - mVerbs.add("ARCHITECTURE"); + mVerbs.add(NAME); + mVerbs.add(COMMENT); + mVerbs.add(STATUS); + mVerbs.add(IP); + mVerbs.add(HOST); + mVerbs.add(FQDN); + mVerbs.add(UPTIME); + mVerbs.add(OS); + mVerbs.add(CREATIONDATE); + mVerbs.add(ADDRESS); + mVerbs.add(CPU_USAGE); + mVerbs.add(MEM_USAGE); + mVerbs.add(NETWORK_USAGE); + mVerbs.add(MEMORY); + mVerbs.add(MIGRATION_PROGRESS_PERCENT); + mVerbs.add(APPS); + mVerbs.add(CLUSTER); + mVerbs.add(POOL); + mVerbs.add(LOGGEDINUSER); + mVerbs.add(TAG); + mVerbs.add(DATACENTER); + mVerbs.add(TYPE); + mVerbs.add(QUOTA); + mVerbs.add(ID); + mVerbs.add(DESCRIPTION); + mVerbs.add(ARCHITECTURE); // Building the autoCompletion Dict buildCompletions(); // Building the types dict - getTypeDictionary().put("NAME", String.class); - getTypeDictionary().put("COMMENT", String.class); - getTypeDictionary().put("STATUS", VMStatus.class); - getTypeDictionary().put("IP", String.class); - getTypeDictionary().put("UPTIME", TimeSpan.class); - getTypeDictionary().put("OS", String.class); - getTypeDictionary().put("CREATIONDATE", Date.class); - getTypeDictionary().put("ADDRESS", String.class); - getTypeDictionary().put("CPU_USAGE", Integer.class); - getTypeDictionary().put("MEM_USAGE", Integer.class); - getTypeDictionary().put("NETWORK_USAGE", Integer.class); - getTypeDictionary().put("MEMORY", Integer.class); - getTypeDictionary().put("APPS", String.class); - getTypeDictionary().put("CLUSTER", String.class); - getTypeDictionary().put("POOL", String.class); - getTypeDictionary().put("LOGGEDINUSER", String.class); - getTypeDictionary().put("TAG", String.class); - getTypeDictionary().put("DATACENTER", String.class); - getTypeDictionary().put("TYPE", VmType.class); - getTypeDictionary().put("QUOTA", String.class); - getTypeDictionary().put("HOST", String.class); - getTypeDictionary().put("ID", UUID.class); - getTypeDictionary().put("DESCRIPTION", String.class); - getTypeDictionary().put("ARCHITECTURE", ArchitectureType.class); + getTypeDictionary().put(NAME, String.class); + getTypeDictionary().put(COMMENT, String.class); + getTypeDictionary().put(STATUS, VMStatus.class); + getTypeDictionary().put(IP, String.class); + getTypeDictionary().put(FQDN, String.class); + getTypeDictionary().put(UPTIME, TimeSpan.class); + getTypeDictionary().put(OS, String.class); + getTypeDictionary().put(CREATIONDATE, Date.class); + getTypeDictionary().put(ADDRESS, String.class); + getTypeDictionary().put(CPU_USAGE, Integer.class); + getTypeDictionary().put(MEM_USAGE, Integer.class); + getTypeDictionary().put(NETWORK_USAGE, Integer.class); + getTypeDictionary().put(MIGRATION_PROGRESS_PERCENT, Integer.class); + getTypeDictionary().put(MEMORY, Integer.class); + getTypeDictionary().put(APPS, String.class); + getTypeDictionary().put(CLUSTER, String.class); + getTypeDictionary().put(POOL, String.class); + getTypeDictionary().put(LOGGEDINUSER, String.class); + getTypeDictionary().put(TAG, String.class); + getTypeDictionary().put(DATACENTER, String.class); + getTypeDictionary().put(TYPE, VmType.class); + getTypeDictionary().put(QUOTA, String.class); + getTypeDictionary().put(HOST, String.class); + getTypeDictionary().put(ID, UUID.class); + getTypeDictionary().put(DESCRIPTION, String.class); + getTypeDictionary().put(ARCHITECTURE, ArchitectureType.class); // building the ColumnName Dict - columnNameDict.put("NAME", "vm_name"); - columnNameDict.put("COMMENT", "vm_comment"); - columnNameDict.put("STATUS", "status"); - columnNameDict.put("IP", "vm_ip"); - columnNameDict.put("UPTIME", "elapsed_time"); - columnNameDict.put("OS", "vm_os"); - columnNameDict.put("CREATIONDATE", "vm_creation_date"); - columnNameDict.put("ADDRESS", "vm_host"); - columnNameDict.put("MEM_USAGE", "usage_mem_percent"); - columnNameDict.put("NETWORK_USAGE", "usage_network_percent"); - columnNameDict.put("CPU_USAGE", "usage_cpu_percent"); - columnNameDict.put("MEMORY", "vm_mem_size_mb"); - columnNameDict.put("APPS", "app_list"); - columnNameDict.put("CLUSTER", "vds_group_name"); - columnNameDict.put("POOL", "vm_pool_name"); + columnNameDict.put(NAME, "vm_name"); + columnNameDict.put(COMMENT, "vm_comment"); + columnNameDict.put(STATUS, "status"); + columnNameDict.put(IP, "vm_ip"); + columnNameDict.put(FQDN, "vm_fqdn"); + columnNameDict.put(UPTIME, "elapsed_time"); + columnNameDict.put(OS, "vm_os"); + columnNameDict.put(CREATIONDATE, "vm_creation_date"); + columnNameDict.put(ADDRESS, "vm_host"); + columnNameDict.put(MEM_USAGE, "usage_mem_percent"); + columnNameDict.put(NETWORK_USAGE, "usage_network_percent"); + columnNameDict.put(CPU_USAGE, "usage_cpu_percent"); + columnNameDict.put(MIGRATION_PROGRESS_PERCENT, "migration_progress_percent"); + columnNameDict.put(MEMORY, "vm_mem_size_mb"); + columnNameDict.put(APPS, "app_list"); + columnNameDict.put(CLUSTER, "vds_group_name"); + columnNameDict.put(POOL, "vm_pool_name"); // mColumnNameDict.Add("NOTE", "note"); - columnNameDict.put("LOGGEDINUSER", "guest_cur_user_name"); - columnNameDict.put("TAG", "tag_name"); - columnNameDict.put("DATACENTER", "storage_pool_name"); - columnNameDict.put("TYPE", "vm_type"); - columnNameDict.put("QUOTA", "quota_name"); - columnNameDict.put("HOST", "run_on_vds_name"); - columnNameDict.put("ID", "vm_guid"); - columnNameDict.put("DESCRIPTION", "vm_description"); - columnNameDict.put("ARCHITECTURE", "architecture"); + columnNameDict.put(LOGGEDINUSER, "guest_cur_user_name"); + columnNameDict.put(TAG, "tag_name"); + columnNameDict.put(DATACENTER, "storage_pool_name"); + columnNameDict.put(TYPE, "vm_type"); + columnNameDict.put(QUOTA, "quota_name"); + columnNameDict.put(HOST, "run_on_vds_name"); + columnNameDict.put(ID, "vm_guid"); + columnNameDict.put(DESCRIPTION, "vm_description"); + columnNameDict.put(ARCHITECTURE, "architecture"); // Override field names for purpose of sorting, if needed - sortableFieldDict.put("IP", StringFormat.format("fn_get_comparable_ip_list(%s)", getDbFieldName("IP"))); + sortableFieldDict.put(IP, StringFormat.format("fn_get_comparable_ip_list(%s)", getDbFieldName(IP))); /** */ - notFreeTextSearchableFieldsList.add("APPS"); - notFreeTextSearchableFieldsList.add("OS"); + notFreeTextSearchableFieldsList.add(APPS); + notFreeTextSearchableFieldsList.add(OS); // Building the validation dict buildBasicValidationTable(); } @Override public IAutoCompleter getFieldRelationshipAutoCompleter(String fieldName) { - if ("UPTIME".equals(fieldName) || "CREATIONDATE".equals(fieldName)) { + if (UPTIME.equals(fieldName) || CREATIONDATE.equals(fieldName)) { return BiggerOrSmallerRelationAutoCompleter.INSTANCE; - } else if ("CPU_USAGE".equals(fieldName) || "MEM_USAGE".equals(fieldName) - || "MEMORY".equals(fieldName) || "NETWORK_USAGE".equals(fieldName)) { + } else if (CPU_USAGE.equals(fieldName) || MEM_USAGE.equals(fieldName) + || MEM_USAGE.equals(fieldName) || NETWORK_USAGE.equals(fieldName) + || MIGRATION_PROGRESS_PERCENT.equals(fieldName)) { return NumericConditionRelationAutoCompleter.INSTANCE; - } else if ("TAG".equals(fieldName)) { + } else if (TAG.equals(fieldName)) { return StringOnlyEqualConditionRelationAutoCompleter.INSTANCE; } else { return StringConditionRelationAutoCompleter.INSTANCE; @@ -121,15 +157,15 @@ @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { - if ("OS".equals(fieldName)) { + if (OS.equals(fieldName)) { return SimpleDependecyInjector.getInstance().get(OsValueAutoCompleter.class); - } else if ("STATUS".equals(fieldName)) { + } else if (STATUS.equals(fieldName)) { return new EnumValueAutoCompleter(VMStatus.class); - } else if ("TYPE".equals(fieldName)) { + } else if (TYPE.equals(fieldName)) { return new EnumValueAutoCompleter(VmType.class); - } else if ("QUOTA".equals(fieldName)) { + } else if (QUOTA.equals(fieldName)) { return new NullableStringAutoCompleter(); - } else if ("ARCHITECTURE".equals(fieldName)) { + } else if (ARCHITECTURE.equals(fieldName)) { return new EnumValueAutoCompleter(ArchitectureType.class); } return null; @@ -137,7 +173,7 @@ @Override public void formatValue(String fieldName, Pair<String, String> pair, boolean caseSensitive) { - if ("APPS".equals(fieldName)) { + if (APPS.equals(fieldName)) { pair.setSecond( StringFormat.format(BaseConditionFieldAutoCompleter.getI18NPrefix() + "'%%%1$s%%'", StringHelper.trim(pair.getSecond(), '\'').replace("N'", @@ -148,12 +184,12 @@ pair.setFirst("NOT " + BaseConditionFieldAutoCompleter.getLikeSyntax(caseSensitive)); } } - else if ("UPTIME".equals(fieldName)) { + else if (UPTIME.equals(fieldName)) { pair.setSecond(StringHelper.trim(pair.getSecond(), '\'')); TimeSpan ts = TimeSpan.parse(pair.getSecond()); pair.setSecond(StringFormat.format("'%1$s'", ts.TotalSeconds)); } - else if ("CREATIONDATE".equals(fieldName)) { + else if (CREATIONDATE.equals(fieldName)) { Date tmp = new Date(Date.parse(StringHelper.trim(pair.getSecond(), '\''))); pair.setSecond(StringFormat.format("'%1$s'", tmp)); } else { -- To view, visit http://gerrit.ovirt.org/28281 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d2fb964cc0c5520e37cd190e88f09d4218868d2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkob...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
