Lior Vernia has uploaded a new change for review. Change subject: engine: Beautification (refactoring + formatting) ......................................................................
engine: Beautification (refactoring + formatting) Changed a couple of Hungarian notation field names to camelCase, and a little auto-formatting. Change-Id: Ie46af2ece1af0fdc4c2ed6600823fb41771b0f27 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdGroupConditionFieldAutoCompleter.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/DiskConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.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/NetworkHostConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PoolConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.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/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 M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java 19 files changed, 167 insertions(+), 161 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/11504/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdGroupConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdGroupConditionFieldAutoCompleter.java index 68e8f08..1ff9ed2 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdGroupConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdGroupConditionFieldAutoCompleter.java @@ -16,11 +16,11 @@ getTypeDictionary().put("NAME", String.class); // building the ColumnName Dict - mColumnNameDict.put("NAME", "$CN"); + columnNameDict.put("NAME", "$CN"); // Building the validation dict for (String key : mVerbs.keySet()) { - mValidationDict.put(key, Collections.singletonList(validCharacters)); + validationDict.put(key, Collections.singletonList(validCharacters)); } } 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 0f1e876..068b1d1 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 @@ -27,16 +27,16 @@ getTypeDictionary().put("TITLE", String.class); } // building the ColumnName Dict - mColumnNameDict.put("NAME", "$GIVENNAME"); - mColumnNameDict.put("USERNAME", "$SAMACCOUNTNAME"); + columnNameDict.put("NAME", "$GIVENNAME"); + columnNameDict.put("USERNAME", "$SAMACCOUNTNAME"); if (StringHelper.EqOp(SyntaxCheckerFactory.getConfigAuthenticationMethod().toUpperCase(), "LDAP")) { - mColumnNameDict.put("LASTNAME", "$SN"); - mColumnNameDict.put("DEPARTMENT", "$DEPARTMENT"); - mColumnNameDict.put("TITLE", "$TITLE"); + columnNameDict.put("LASTNAME", "$SN"); + columnNameDict.put("DEPARTMENT", "$DEPARTMENT"); + columnNameDict.put("TITLE", "$TITLE"); } // Building the validation dict for (String key : mVerbs.keySet()) { - mValidationDict.put(key, Collections.singletonList(validCharacters)); + 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 e71367f..44fda9b 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 @@ -59,29 +59,29 @@ getTypeDictionary().put("CUSTOM_EVENT_ID", Integer.class); getTypeDictionary().put("DELETED", Boolean.class); // building the ColumnName Dict - mColumnNameDict.put("TYPE", "log_type"); - mColumnNameDict.put("SEVERITY", "severity"); - mColumnNameDict.put("MESSAGE", "message"); - mColumnNameDict.put("TIME", "log_time"); - mColumnNameDict.put("USRNAME", "user_name"); - mColumnNameDict.put("USRID", "user_id::varchar"); - mColumnNameDict.put("EVENT_HOST", "vds_name"); - mColumnNameDict.put("_EVENT_HOST_ID", "vds_id::varchar"); - mColumnNameDict.put("EVENT_VM", "vm_name"); - mColumnNameDict.put("_EVENT_VM_ID", "vm_id::varchar"); - mColumnNameDict.put("EVENT_TEMPLATE", "vm_template_name"); - mColumnNameDict.put("_EVENT_TEMPLATE_ID", "vm_template_id::varchar"); - mColumnNameDict.put("EVENT_STORAGE", "storage_domain_name"); - mColumnNameDict.put("_EVENT_STORAGE_ID", "storage_domain_id::varchar"); - mColumnNameDict.put("EVENT_DATACENTER", "storage_pool_name"); - mColumnNameDict.put("_EVENT_DATACENTER_ID", "storage_pool_id::varchar"); - mColumnNameDict.put("_EVENT_QUOTA_ID", "quota_id::varchar"); - mColumnNameDict.put("EVENT_VOLUME", "gluster_volume_name"); - mColumnNameDict.put("_EVENT_VOLUME_ID", "gluster_volume_id::varchar"); - mColumnNameDict.put("CORRELATION_ID", "correlation_id::varchar"); - mColumnNameDict.put("ORIGIN", "origin::varchar"); - mColumnNameDict.put("CUSTOM_EVENT_ID", "custom_event_id::int"); - mColumnNameDict.put("DELETED", "deleted::boolean"); + columnNameDict.put("TYPE", "log_type"); + columnNameDict.put("SEVERITY", "severity"); + columnNameDict.put("MESSAGE", "message"); + columnNameDict.put("TIME", "log_time"); + columnNameDict.put("USRNAME", "user_name"); + columnNameDict.put("USRID", "user_id::varchar"); + columnNameDict.put("EVENT_HOST", "vds_name"); + columnNameDict.put("_EVENT_HOST_ID", "vds_id::varchar"); + columnNameDict.put("EVENT_VM", "vm_name"); + columnNameDict.put("_EVENT_VM_ID", "vm_id::varchar"); + columnNameDict.put("EVENT_TEMPLATE", "vm_template_name"); + columnNameDict.put("_EVENT_TEMPLATE_ID", "vm_template_id::varchar"); + columnNameDict.put("EVENT_STORAGE", "storage_domain_name"); + columnNameDict.put("_EVENT_STORAGE_ID", "storage_domain_id::varchar"); + columnNameDict.put("EVENT_DATACENTER", "storage_pool_name"); + columnNameDict.put("_EVENT_DATACENTER_ID", "storage_pool_id::varchar"); + columnNameDict.put("_EVENT_QUOTA_ID", "quota_id::varchar"); + columnNameDict.put("EVENT_VOLUME", "gluster_volume_name"); + columnNameDict.put("_EVENT_VOLUME_ID", "gluster_volume_id::varchar"); + columnNameDict.put("CORRELATION_ID", "correlation_id::varchar"); + columnNameDict.put("ORIGIN", "origin::varchar"); + columnNameDict.put("CUSTOM_EVENT_ID", "custom_event_id::int"); + columnNameDict.put("DELETED", "deleted::boolean"); // Building the validation dict buildBasicValidationTable(); } 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 f6553f0..9163dc4 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 @@ -30,14 +30,15 @@ public static final int DAY_IN_MILLIS = 24 * 60 * 60 * 1000; - protected final Map<String, List<ValueValidationFunction>> mValidationDict = + protected final Map<String, List<ValueValidationFunction>> validationDict = new HashMap<String, List<ValueValidationFunction>>(); - private final Map<String, Class<?>> mTypeDict = new HashMap<String, Class<?>>(); - protected final Map<String, String> mColumnNameDict = new HashMap<String, String>(); - protected final List<String> mNotFreeTextSearchableFieldsList = new ArrayList<String>(); + private final Map<String, Class<?>> typeDict = new HashMap<String, Class<?>>(); + protected final Map<String, String> columnNameDict = new HashMap<String, String>(); + protected final List<String> notFreeTextSearchableFieldsList = new ArrayList<String>(); /** * Gets the LIKE clause syntax for non case-sensitive search + * * @return the LIKE syntax according to current DBEngine. */ public static String getLikeSyntax(boolean caseSensitive) { @@ -51,6 +52,7 @@ /** * Gets the I18N prefix used for value compare. + * * @return */ public static String getI18NPrefix() { @@ -65,13 +67,13 @@ public static ITagsHandler TagsHandler; public Map<String, Class<?>> getTypeDictionary() { - return mTypeDict; + return typeDict; } protected void buildBasicValidationTable() { for (String key : mVerbs.keySet()) { final List<ValueValidationFunction> curList = new ArrayList<ValueValidationFunction>(); - final Class<?> curType = mTypeDict.get(key); + final Class<?> curType = typeDict.get(key); if (curType == java.math.BigDecimal.class) { curList.add(validDecimal); } else if (curType == Integer.class) { @@ -91,13 +93,13 @@ curList.add(validateFieldValueByValueAC); } } - mValidationDict.put(key, curList); + validationDict.put(key, curList); } } public boolean validateFieldValue(String fieldName, String fieldValue) { - if (mValidationDict.containsKey(fieldName)) { - final List<ValueValidationFunction> validationList = mValidationDict.get(fieldName); + if (validationDict.containsKey(fieldName)) { + final List<ValueValidationFunction> validationList = validationDict.get(fieldName); for (ValueValidationFunction curValidationFunc : validationList) { if (!curValidationFunc.isValid(fieldName, fieldValue)) { return false; @@ -109,23 +111,26 @@ public String getDbFieldName(String fieldName) { String retval = null; - if (mColumnNameDict.containsKey(fieldName)) { - retval = mColumnNameDict.get(fieldName); + if (columnNameDict.containsKey(fieldName)) { + retval = columnNameDict.get(fieldName); } return retval; } public Class<?> getDbFieldType(String fieldName) { Class<?> retval = null; - if (mTypeDict.containsKey(fieldName)) { - retval = mTypeDict.get(fieldName); + if (typeDict.containsKey(fieldName)) { + retval = typeDict.get(fieldName); } return retval; } // FIXME Probably Not Hibernate Friendly - public final String buildFreeTextConditionSql(String tableName, String relations, String value, boolean caseSensitive) { + public final String buildFreeTextConditionSql(String tableName, + String relations, + String value, + boolean caseSensitive) { StringBuilder sb = new StringBuilder(" ( "); boolean firstTime = true; if (!StringHelper.isNullOrEmpty(value) && !"''".equals(value)) { @@ -137,8 +142,8 @@ } else if ("!=".equals(relations)) { relations = "NOT " + getLikeSyntax(caseSensitive); } - for (String field : mColumnNameDict.keySet()) { - if (mTypeDict.get(field) == String.class && !mNotFreeTextSearchableFieldsList.contains(field)) { + for (String field : columnNameDict.keySet()) { + if (typeDict.get(field) == String.class && !notFreeTextSearchableFieldsList.contains(field)) { if (firstTime) { firstTime = false; } else { @@ -146,7 +151,7 @@ } sb.append(StringFormat.format(" %1$s.%2$s %3$s %4$s", tableName, - mColumnNameDict.get(field), + columnNameDict.get(field), relations, value)); } @@ -305,6 +310,7 @@ } } } + // private static final String DATE_FORMAT = "MMM dd,yyyy"; private static DateTime DealWithDateEnum(String value) { DateTime formatedValue = new DateTime(); 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 d84fdc2..01e4cda 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 @@ -17,8 +17,8 @@ getTypeDictionary().put("INITIALIZED", Boolean.class); // building the ColumnName Dict - mColumnNameDict.put("NAME", "name"); - mColumnNameDict.put("DESCRIPTION", "description"); + columnNameDict.put("NAME", "name"); + columnNameDict.put("DESCRIPTION", "description"); // mColumnNameDict.put("INITIALIZED", "is_initialized"); // Building the validation dict diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleter.java index afc1b27..96f180c 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleter.java @@ -45,19 +45,19 @@ // building the ColumnName dict. - mColumnNameDict.put("ALIAS", "disk_alias"); - mColumnNameDict.put("DESCRIPTION", "disk_description"); - mColumnNameDict.put("PROVISIONED_SIZE", "size"); - mColumnNameDict.put("SIZE", "size"); - mColumnNameDict.put("ACTUAL_SIZE", "actual_size"); - mColumnNameDict.put("CREATION_DATE", "creation_date"); - mColumnNameDict.put("BOOTABLE", "boot"); - mColumnNameDict.put("SHAREABLE", "shareable"); - mColumnNameDict.put("STATUS", "imageStatus"); - mColumnNameDict.put("DISK_TYPE", "disk_storage_type"); - mColumnNameDict.put("NUMBER_OF_VMS", "number_of_vms"); - mColumnNameDict.put("VM_NAMES", "vm_names"); - mColumnNameDict.put("QUOTA", "quota_name"); + columnNameDict.put("ALIAS", "disk_alias"); + columnNameDict.put("DESCRIPTION", "disk_description"); + columnNameDict.put("PROVISIONED_SIZE", "size"); + columnNameDict.put("SIZE", "size"); + columnNameDict.put("ACTUAL_SIZE", "actual_size"); + columnNameDict.put("CREATION_DATE", "creation_date"); + columnNameDict.put("BOOTABLE", "boot"); + columnNameDict.put("SHAREABLE", "shareable"); + columnNameDict.put("STATUS", "imageStatus"); + columnNameDict.put("DISK_TYPE", "disk_storage_type"); + columnNameDict.put("NUMBER_OF_VMS", "number_of_vms"); + columnNameDict.put("VM_NAMES", "vm_names"); + columnNameDict.put("QUOTA", "quota_name"); // Building the validation dict. buildBasicValidationTable(); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java index f3c21f4..16b6c52 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java @@ -18,8 +18,8 @@ getTypeDictionary().put(CLUSTER_NAME, String.class); // building the ColumnName dict. - mColumnNameDict.put(NETWORK_NAME, "network_name"); - mColumnNameDict.put(CLUSTER_NAME, "cluster_name"); + columnNameDict.put(NETWORK_NAME, "network_name"); + columnNameDict.put(CLUSTER_NAME, "cluster_name"); // Building the validation dict. buildBasicValidationTable(); 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 d2a2564..6d8d9d7 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 @@ -34,13 +34,13 @@ getTypeDictionary().put(DATA_CENTER, String.class); // building the ColumnName dict. - mColumnNameDict.put(NAME, "name"); - mColumnNameDict.put(DESCRIPTION, "description"); - mColumnNameDict.put(VLAN_ID, "vlan_id"); - mColumnNameDict.put(STP, "stp"); - mColumnNameDict.put(MTU, "mtu"); - mColumnNameDict.put(VM_NETWORK, "vm_network"); - mColumnNameDict.put(DATA_CENTER, "storage_pool_name"); + columnNameDict.put(NAME, "name"); + columnNameDict.put(DESCRIPTION, "description"); + columnNameDict.put(VLAN_ID, "vlan_id"); + columnNameDict.put(STP, "stp"); + columnNameDict.put(MTU, "mtu"); + columnNameDict.put(VM_NETWORK, "vm_network"); + columnNameDict.put(DATA_CENTER, "storage_pool_name"); // Building the validation dict. buildBasicValidationTable(); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkHostConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkHostConditionFieldAutoCompleter.java index 53112e7..5c69762 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkHostConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkHostConditionFieldAutoCompleter.java @@ -14,7 +14,7 @@ getTypeDictionary().put(HOST_NAME, String.class); // building the ColumnName dict. - mColumnNameDict.put(HOST_NAME, "vds_name"); + columnNameDict.put(HOST_NAME, "vds_name"); // Building the validation dict. buildBasicValidationTable(); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java index b441ced..b8c2991 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java @@ -15,7 +15,7 @@ getTypeDictionary().put(NETWORK_NAME, String.class); // building the ColumnName dict. - mColumnNameDict.put(NETWORK_NAME, "network_name"); + columnNameDict.put(NETWORK_NAME, "network_name"); // Building the validation dict. buildBasicValidationTable(); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PoolConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PoolConditionFieldAutoCompleter.java index 3bba3b1..f57e101 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PoolConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PoolConditionFieldAutoCompleter.java @@ -17,9 +17,9 @@ getTypeDictionary().put("TYPE", VmPoolType.class); // building the ColumnName Dict - mColumnNameDict.put("NAME", "vm_pool_name"); - mColumnNameDict.put("DESCRIPTION", "vm_pool_description"); - mColumnNameDict.put("TYPE", "vm_pool_type"); + columnNameDict.put("NAME", "vm_pool_name"); + columnNameDict.put("DESCRIPTION", "vm_pool_description"); + columnNameDict.put("TYPE", "vm_pool_type"); // Building the validation dict buildBasicValidationTable(); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java index aeeba29..5ae197d 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java @@ -38,14 +38,14 @@ getTypeDictionary().put(enforcementType, QuotaEnforcementTypeEnum.class); // building the ColumnName dict. - mColumnNameDict.put(name, "quota_name"); - mColumnNameDict.put(storagePoolName, "storage_pool_name"); - mColumnNameDict.put(description, "description"); - mColumnNameDict.put(thresholdVdsGroupPercentage, "threshold_vds_group_percentage"); - mColumnNameDict.put(thresholdStoragePercentage, "threshold_storage_percentage"); - mColumnNameDict.put(graceStoragePercentage, "grace_storage_percentage"); - mColumnNameDict.put(graceVdsGrouPercentage, "grace_vds_group_percentage"); - mColumnNameDict.put(enforcementType, "quota_enforcement_type"); + columnNameDict.put(name, "quota_name"); + columnNameDict.put(storagePoolName, "storage_pool_name"); + columnNameDict.put(description, "description"); + columnNameDict.put(thresholdVdsGroupPercentage, "threshold_vds_group_percentage"); + columnNameDict.put(thresholdStoragePercentage, "threshold_storage_percentage"); + columnNameDict.put(graceStoragePercentage, "grace_storage_percentage"); + columnNameDict.put(graceVdsGrouPercentage, "grace_vds_group_percentage"); + columnNameDict.put(enforcementType, "quota_enforcement_type"); // Building the validation dict. buildBasicValidationTable(); 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 db3dcc4..0937400 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 @@ -26,13 +26,13 @@ getTypeDictionary().put("COMMITTED", Integer.class); // building the ColumnName Dict - mColumnNameDict.put("NAME", "storage_name"); - mColumnNameDict.put("STATUS", "storage_domain_shared_status"); - mColumnNameDict.put("DATACENTER", "storage_pool_name"); - mColumnNameDict.put("TYPE", "storage_type"); - mColumnNameDict.put("SIZE", "available_disk_size"); - mColumnNameDict.put("USED", "used_disk_size"); - mColumnNameDict.put("COMMITTED", "commited_disk_size"); + columnNameDict.put("NAME", "storage_name"); + columnNameDict.put("STATUS", "storage_domain_shared_status"); + columnNameDict.put("DATACENTER", "storage_pool_name"); + columnNameDict.put("TYPE", "storage_type"); + columnNameDict.put("SIZE", "available_disk_size"); + columnNameDict.put("USED", "used_disk_size"); + columnNameDict.put("COMMITTED", "commited_disk_size"); // Building the validation dict buildBasicValidationTable(); 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 2fd7c90..4d48c53 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 @@ -20,10 +20,10 @@ getTypeDictionary().put("STATUS", StoragePoolStatus.class); // building the ColumnName Dict - mColumnNameDict.put("NAME", "name"); - mColumnNameDict.put("DESCRIPTION", "description"); - mColumnNameDict.put("TYPE", "storage_pool_type"); - mColumnNameDict.put("STATUS", "status"); + columnNameDict.put("NAME", "name"); + columnNameDict.put("DESCRIPTION", "description"); + columnNameDict.put("TYPE", "storage_pool_type"); + columnNameDict.put("STATUS", "status"); // Building the validation dict buildBasicValidationTable(); 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 1e8a230..7b11de1 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 @@ -40,17 +40,17 @@ getTypeDictionary().put("TYPE", UserOrGroup.class); // building the ColumnName Dict - mColumnNameDict.put("NAME", "name"); - mColumnNameDict.put("LASTNAME", "surname"); - mColumnNameDict.put("USRNAME", "username"); - mColumnNameDict.put("DEPARTMENT", "department"); - mColumnNameDict.put("TITLE", "role"); - mColumnNameDict.put("GROUP", "groups"); - mColumnNameDict.put("STATUS", "status"); - mColumnNameDict.put("ROLE", "mla_role"); - mColumnNameDict.put("TAG", "tag_name"); - mColumnNameDict.put("POOL", "vm_pool_name"); - mColumnNameDict.put("TYPE", "user_group"); + columnNameDict.put("NAME", "name"); + columnNameDict.put("LASTNAME", "surname"); + columnNameDict.put("USRNAME", "username"); + columnNameDict.put("DEPARTMENT", "department"); + columnNameDict.put("TITLE", "role"); + columnNameDict.put("GROUP", "groups"); + columnNameDict.put("STATUS", "status"); + columnNameDict.put("ROLE", "mla_role"); + columnNameDict.put("TAG", "tag_name"); + columnNameDict.put("POOL", "vm_pool_name"); + columnNameDict.put("TYPE", "user_group"); // Building the validation dict buildBasicValidationTable(); } 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 8aa7fcf..b314041 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 @@ -50,25 +50,25 @@ getTypeDictionary().put("DATACENTER", String.class); // mTypeDict.Add("NOTE", typeof(string)); // building the ColumnName Dict - mColumnNameDict.put("NAME", "vds_name"); - mColumnNameDict.put("STATUS", "status"); - mColumnNameDict.put("CLUSTER", "vds_group_name"); - mColumnNameDict.put("ADDRESS", "host_name"); - mColumnNameDict.put("CPU_USAGE", "usage_cpu_percent"); - mColumnNameDict.put("MEM_USAGE", "usage_mem_percent"); - mColumnNameDict.put("NETWORK_USAGE", "usage_network_percent"); - mColumnNameDict.put("LOAD", "cpu_load"); - mColumnNameDict.put("VERSION", "software_version"); - mColumnNameDict.put("CPUS", "cpu_cores"); - mColumnNameDict.put("MEMORY", "physical_mem_mb"); - mColumnNameDict.put("CPU_SPEED", "cpu_speed_mh"); - mColumnNameDict.put("CPU_MODEL", "cpu_model"); - mColumnNameDict.put("ACTIVE_VMS", "vm_active"); - mColumnNameDict.put("MIGRATING_VMS", "vm_migrating"); - mColumnNameDict.put("COMMITTED_MEM", "mem_commited"); - mColumnNameDict.put("TAG", "tag_name"); - mColumnNameDict.put("TYPE", "vds_type"); - mColumnNameDict.put("DATACENTER", "storage_pool_name"); + columnNameDict.put("NAME", "vds_name"); + columnNameDict.put("STATUS", "status"); + columnNameDict.put("CLUSTER", "vds_group_name"); + columnNameDict.put("ADDRESS", "host_name"); + columnNameDict.put("CPU_USAGE", "usage_cpu_percent"); + columnNameDict.put("MEM_USAGE", "usage_mem_percent"); + columnNameDict.put("NETWORK_USAGE", "usage_network_percent"); + columnNameDict.put("LOAD", "cpu_load"); + columnNameDict.put("VERSION", "software_version"); + columnNameDict.put("CPUS", "cpu_cores"); + columnNameDict.put("MEMORY", "physical_mem_mb"); + columnNameDict.put("CPU_SPEED", "cpu_speed_mh"); + columnNameDict.put("CPU_MODEL", "cpu_model"); + columnNameDict.put("ACTIVE_VMS", "vm_active"); + columnNameDict.put("MIGRATING_VMS", "vm_migrating"); + columnNameDict.put("COMMITTED_MEM", "mem_commited"); + columnNameDict.put("TAG", "tag_name"); + columnNameDict.put("TYPE", "vds_type"); + columnNameDict.put("DATACENTER", "storage_pool_name"); // mColumnNameDict.Add("NOTE", "note"); // Building the validation dict buildBasicValidationTable(); 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 d9261bc..0053d92 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 @@ -62,31 +62,31 @@ getTypeDictionary().put("_VM_ID", UUID.class); // building the ColumnName Dict - mColumnNameDict.put("NAME", "vm_name"); - mColumnNameDict.put("STATUS", "status"); - mColumnNameDict.put("IP", "vm_ip"); - mColumnNameDict.put("UPTIME", "elapsed_time"); - mColumnNameDict.put("DOMAIN", "vm_domain"); - mColumnNameDict.put("OS", "vm_os"); - mColumnNameDict.put("CREATIONDATE", "vm_creation_date"); - mColumnNameDict.put("ADDRESS", "vm_host"); - mColumnNameDict.put("CPU_USAGE", "usage_cpu_percent"); - mColumnNameDict.put("MEM_USAGE", "usage_mem_percent"); - mColumnNameDict.put("NETWORK_USAGE", "usage_network_percent"); - mColumnNameDict.put("MEMORY", "vm_mem_size_mb"); - mColumnNameDict.put("APPS", "app_list"); - mColumnNameDict.put("CLUSTER", "vds_group_name"); - mColumnNameDict.put("POOL", "vm_pool_name"); + columnNameDict.put("NAME", "vm_name"); + columnNameDict.put("STATUS", "status"); + columnNameDict.put("IP", "vm_ip"); + columnNameDict.put("UPTIME", "elapsed_time"); + columnNameDict.put("DOMAIN", "vm_domain"); + columnNameDict.put("OS", "vm_os"); + columnNameDict.put("CREATIONDATE", "vm_creation_date"); + columnNameDict.put("ADDRESS", "vm_host"); + columnNameDict.put("CPU_USAGE", "usage_cpu_percent"); + columnNameDict.put("MEM_USAGE", "usage_mem_percent"); + columnNameDict.put("NETWORK_USAGE", "usage_network_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"); - mColumnNameDict.put("LOGGEDINUSER", "guest_cur_user_name"); - mColumnNameDict.put("TAG", "tag_name"); - mColumnNameDict.put("DATACENTER", "storage_pool_name"); - mColumnNameDict.put("TYPE", "vm_type"); - mColumnNameDict.put("QUOTA", "quota_name"); - mColumnNameDict.put("_VM_ID", "vm_guid"); + 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("_VM_ID", "vm_guid"); /** */ - mNotFreeTextSearchableFieldsList.add("APPS"); + notFreeTextSearchableFieldsList.add("APPS"); // Building the validation dict buildBasicValidationTable(); } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java index 9ae9453..e016a86 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java @@ -37,18 +37,18 @@ getTypeDictionary().put("_VMT_ID", UUID.class); // building the ColumnName Dict - mColumnNameDict.put("NAME", "name"); - mColumnNameDict.put("DOMAIN", "domain"); - mColumnNameDict.put("OS", "os"); - mColumnNameDict.put("CREATIONDATE", "creation_date"); - mColumnNameDict.put("CHILDCOUNT", "child_count"); - mColumnNameDict.put("MEM", "mem_size_mb"); - mColumnNameDict.put("DESCRIPTION", "description"); - mColumnNameDict.put("STATUS", "status"); - mColumnNameDict.put("CLUSTER", "vds_group_name"); - mColumnNameDict.put("DATACENTER", "storage_pool_name"); - mColumnNameDict.put("QUOTA", "quota_name"); - mColumnNameDict.put("_VMT_ID", "vmt_guid"); + columnNameDict.put("NAME", "name"); + columnNameDict.put("DOMAIN", "domain"); + columnNameDict.put("OS", "os"); + columnNameDict.put("CREATIONDATE", "creation_date"); + columnNameDict.put("CHILDCOUNT", "child_count"); + columnNameDict.put("MEM", "mem_size_mb"); + columnNameDict.put("DESCRIPTION", "description"); + columnNameDict.put("STATUS", "status"); + columnNameDict.put("CLUSTER", "vds_group_name"); + columnNameDict.put("DATACENTER", "storage_pool_name"); + columnNameDict.put("QUOTA", "quota_name"); + columnNameDict.put("_VMT_ID", "vmt_guid"); // Building the validation dict buildBasicValidationTable(); } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java index f474013..2b21933 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java @@ -110,7 +110,7 @@ // Build the column name dictionary for (AutoCompletionField field : fields) { - mColumnNameDict.put(field.fieldName, field.columnName); + columnNameDict.put(field.fieldName, field.columnName); } // Build the validation dictionary -- To view, visit http://gerrit.ovirt.org/11504 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie46af2ece1af0fdc4c2ed6600823fb41771b0f27 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
