Merge branch 'sndurkin-AXIS2-6041'

Author: Robert Lazarski

modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

@@ -1290,9 +1290,14 @@ public static List toList(Object[] array) {
      * @return 0 if equal , + value if greater than , - value if less than
      */
     public static int compare(int intValue, String value) {
-        int other = Integer.parseInt(value);
-        return intValue < other ? -1 : (intValue == other ? 0 : 1);
-
+        int param;
+        try {
+            NumberFormat nf = NumberFormat.getInstance(Locale.US);
+            param = nf.parse(value).intValue();
+        } catch (Exception e) {
+            throw new ObjectConversionException(e);
+        }
+        return intValue < param ? -1 : (intValue == param ? 0 : 1);
     }
 
     /**
@@ -1320,7 +1325,14 @@ public static float compare(float floatValue, String value) {
      * @return 0 if equal , + value if greater than , - value if less than
      */
     public static long compare(long longValue, String value) {
-        return longValue - Long.parseLong(value);
+        long param;
+        try {
+            NumberFormat nf = NumberFormat.getInstance(Locale.US);
+            param = nf.parse(value).longValue();
+        } catch (Exception e) {
+            throw new ObjectConversionException(e);
+        }
+        return longValue - param;
     }
 
     /**
@@ -1329,7 +1341,14 @@ public static long compare(long longValue, String value) {
      * @return 0 if equal , + value if greater than , - value if less than
      */
     public static int compare(short shortValue, String value) {
-        return shortValue - Short.parseShort(value);
+        short param;
+        try {
+            NumberFormat nf = NumberFormat.getInstance(Locale.US);
+            param = nf.parse(value).shortValue();
+        } catch (Exception e) {
+            throw new ObjectConversionException(e);
+        }
+        return shortValue - param;
     }
 
     /**

modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

@@ -583,4 +583,46 @@ public void testCompareBigIntegerValueIsGreaterThanOrEqualToTotalDigitsFacetRest
         long result = ConverterUtil.compare(value, decimalNotationString);
         assertThat(result).isGreaterThanOrEqualTo(0L);
     }
+
+    public void testCompareLongIsLessThanTotalDigitsFacetRestriction() {
+        long value = 1L;
+        String totalDigitsFromXsd = "1";
+        String decimalNotationString = ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+        assertThat(ConverterUtil.compare(value, decimalNotationString)).isLessThan(0L);
+    }
+
+    public void testCompareLongIsGreaterThanOrEqualToTotalDigitsFacetRestriction() {
+        long value = 10L;
+        String totalDigitsFromXsd = "1";
+        String decimalNotationString = ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+        assertThat(ConverterUtil.compare(value, decimalNotationString)).isGreaterThanOrEqualTo(0L);
+    }
+
+    public void testCompareIntIsLessThanTotalDigitsFacetRestriction() {
+        int value = 1;
+        String totalDigitsFromXsd = "1";
+        String decimalNotationString = ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+        assertThat(ConverterUtil.compare(value, decimalNotationString)).isLessThan(0);
+    }
+
+    public void testCompareIntIsGreaterThanOrEqualToTotalDigitsFacetRestriction() {
+        int value = 10;
+        String totalDigitsFromXsd = "1";
+        String decimalNotationString = ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+        assertThat(ConverterUtil.compare(value, decimalNotationString)).isGreaterThanOrEqualTo(0);
+    }
+
+    public void testCompareShortIsLessThanTotalDigitsFacetRestriction() {
+        short value = 1;
+        String totalDigitsFromXsd = "1";
+        String decimalNotationString = ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+        assertThat(ConverterUtil.compare(value, decimalNotationString)).isLessThan(0);
+    }
+
+    public void testCompareShortIsGreaterThanOrEqualToTotalDigitsFacetRestriction() {
+        short value = 10;
+        String totalDigitsFromXsd = "1";
+        String decimalNotationString = ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+        assertThat(ConverterUtil.compare(value, decimalNotationString)).isGreaterThanOrEqualTo(0);
+    }
 }