Tal Nisan has uploaded a new change for review. Change subject: core: Removed DoubleCompat class ......................................................................
core: Removed DoubleCompat class Change-Id: Ia5f3cb48bf49064de543c9478bbb2b445055bbb0 Signed-off-by: Tal Nisan <[email protected]> --- D backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DoubleCompat.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml 4 files changed, 28 insertions(+), 37 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/11668/1 diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DoubleCompat.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DoubleCompat.java deleted file mode 100644 index 18c6ec4..0000000 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DoubleCompat.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ovirt.engine.core.compat; - -import java.math.BigDecimal; - -/** - * @deprecated Use org.apache.commons.lang.math.NumberUtils instead. - */ -@Deprecated -public class DoubleCompat { - - public static BigDecimal tryParse(String value) { - try { - return new BigDecimal(value); - } catch (NumberFormatException e) { - // eat it and return null - return null; - } - } - - public static Double tryParseDouble(String value) { - try { - return new Double(value); - } catch (NumberFormatException e) { - // eat it and return null - 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 e5d637f..b8d5014 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 @@ -1,5 +1,6 @@ package org.ovirt.engine.core.searchbackend; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -14,7 +15,6 @@ import org.ovirt.engine.core.compat.DateFormatCompat; import org.ovirt.engine.core.compat.DateTime; import org.ovirt.engine.core.compat.DayOfWeek; -import org.ovirt.engine.core.compat.DoubleCompat; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.IntegerCompat; import org.ovirt.engine.core.compat.RefObject; @@ -98,6 +98,7 @@ } } + @Override public boolean validateFieldValue(String fieldName, String fieldValue) { if (validationDict.containsKey(fieldName)) { final List<ValueValidationFunction> validationList = validationDict.get(fieldName); @@ -110,6 +111,7 @@ return true; } + @Override public String getDbFieldName(String fieldName) { String retval = null; if (columnNameDict.containsKey(fieldName)) { @@ -118,6 +120,7 @@ return retval; } + @Override public String getSortableDbField(String fieldName) { if (sortableFieldDict.containsKey(fieldName)) { return sortableFieldDict.get(fieldName); @@ -126,6 +129,7 @@ } } + @Override public Class<?> getDbFieldType(String fieldName) { Class<?> retval = null; if (typeDict.containsKey(fieldName)) { @@ -136,6 +140,7 @@ } // FIXME Probably Not Hibernate Friendly + @Override public final String buildFreeTextConditionSql(String tableName, String relations, String value, @@ -172,12 +177,14 @@ final static Regex validChar = new Regex("^[^\\<\\>&^#!']*$"); public final static ValueValidationFunction validCharacters = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { return validChar.IsMatch(value); } }; public final static ValueValidationFunction validDateTime = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { Date test = DateUtils.parse(value); if (test != null) { @@ -200,24 +207,35 @@ }; public final static ValueValidationFunction validTimeSpan = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { return TimeSpan.tryParse(value) != null; } }; public final static ValueValidationFunction validInteger = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { return IntegerCompat.tryParse(value) != null; } }; public final static ValueValidationFunction validDecimal = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { - return DoubleCompat.tryParse(value) != null; + try { + new BigDecimal(value); // No assignment, we just want to create a new instance and to see if there's an + // Exception + return true; + } + catch (NumberFormatException e) { + return false; + } } }; public final ValueValidationFunction validateDateEnumValueByValueAC = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { boolean retval = true; IConditionValueAutoCompleter vlaueAc = getFieldValueAutoCompleter(field); @@ -245,6 +263,7 @@ }; public final ValueValidationFunction validateFieldValueByValueAC = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { boolean retval = true; IConditionValueAutoCompleter vlaueAc = getFieldValueAutoCompleter(field); @@ -255,14 +274,17 @@ } }; + @Override public IAutoCompleter getFieldRelationshipAutoCompleter(String fieldName) { return null; } + @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { return null; } + @Override public void formatValue(String fieldName, RefObject<String> relations, RefObject<String> value, @@ -348,6 +370,7 @@ return formatedValue.resetToMidnight(); } + @Override public final String buildConditionSql(String fieldName, String customizedValue, String customizedRelation, String tableName, boolean caseSensitive) { RefObject<String> tempRefObject = new RefObject<String>(customizedRelation); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java index d1145eb..56137bc 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java @@ -11,7 +11,6 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.queries.ValueObjectMap; -import org.ovirt.engine.core.compat.DoubleCompat; import org.ovirt.engine.core.compat.IntegerCompat; import org.ovirt.engine.core.compat.LongCompat; import org.ovirt.engine.core.utils.log.Log; @@ -520,10 +519,9 @@ } } else if (type.equalsIgnoreCase(DOUBLE)) { - final Double doubleVal = DoubleCompat.tryParseDouble(fencingAgentInstanceOptions - .get(key)); - if (doubleVal != null) { - result = doubleVal; + try { + result = Double.parseDouble(fencingAgentInstanceOptions.get(key)); + } catch (NumberFormatException e) { } } else // return as string { diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml index 0b65e2d..f1b10df 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml @@ -17,7 +17,6 @@ <include name="compat/NGuid.java" /> <include name="compat/Serializable.java" /> <include name="compat/LongCompat.java" /> - <include name="compat/DoubleCompat.java" /> <include name="compat/ApplicationException.java" /> <!-- Required by common's utils --> <include name="compat/PropertyInfo.java" /> -- To view, visit http://gerrit.ovirt.org/11668 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5f3cb48bf49064de543c9478bbb2b445055bbb0 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
