Author: fanningpj
Date: Fri Jul 17 16:51:41 2026
New Revision: 1936273

Log:
add util to parse BigDecimal/BigInteger from string

Modified:
   xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java
   xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java
   xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/MathUtil.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java
   
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java Fri Jul 17 
16:04:01 2026        (r1936272)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java Fri Jul 17 
16:51:41 2026        (r1936273)
@@ -16,6 +16,7 @@
 package org.apache.xmlbeans;
 
 import org.apache.xmlbeans.impl.util.ExceptionUtil;
+import org.apache.xmlbeans.impl.util.MathUtil;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -274,7 +275,7 @@ public final class GDate implements GDat
                         }
                     }
                     try {
-                        fs = new BigDecimal(string.subSequence(start, 
len).toString());
+                        fs = 
MathUtil.parseAsBigDecimal(string.subSequence(start, len).toString());
                     } catch (Throwable e) {
                         if (ExceptionUtil.isFatal(e)) {
                             ExceptionUtil.rethrow(e);

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java     Fri Jul 
17 16:04:01 2026        (r1936272)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java     Fri Jul 
17 16:51:41 2026        (r1936273)
@@ -15,6 +15,8 @@
 
 package org.apache.xmlbeans;
 
+import org.apache.xmlbeans.impl.util.MathUtil;
+
 import java.math.BigDecimal;
 
 /**
@@ -131,7 +133,7 @@ public final class GDuration implements
                 int i = start;
                 do i += 1;
                 while (i < len && GDate.isDigit(ch = str.charAt(i)));
-                _fs = new BigDecimal(str.subSequence(start, i).toString());
+                _fs = MathUtil.parseAsBigDecimal(str.subSequence(start, 
i).toString());
                 if (i >= len || ch != 'S')
                     throw new IllegalArgumentException("illegal duration");
                 start = i;

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
   Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
   Fri Jul 17 16:51:41 2026        (r1936273)
@@ -17,6 +17,7 @@ package org.apache.xmlbeans.impl.schema;
 
 import org.apache.xmlbeans.*;
 import org.apache.xmlbeans.impl.common.QNameHelper;
+import org.apache.xmlbeans.impl.util.MathUtil;
 import org.apache.xmlbeans.impl.values.XmlIntegerImpl;
 import org.apache.xmlbeans.impl.values.XmlStringImpl;
 import org.apache.xmlbeans.impl.values.XmlValueOutOfRangeException;
@@ -165,7 +166,7 @@ public class BuiltinSchemaTypeSystem ext
           build_wsstring(SchemaType.WS_COLLAPSE), null, null };
 
     private final static XmlValueRef[] FACETS_UNSIGNED_LONG = new XmlValueRef[]
-        { null, null, null, null, buildInteger(BigInteger.ZERO), 
buildInteger(new BigInteger("18446744073709551615")), null, null, 
buildNnInteger(BigInteger.ZERO),
+        { null, null, null, null, buildInteger(BigInteger.ZERO), 
buildInteger(MathUtil.parseAsBigInteger("18446744073709551615")), null, null, 
buildNnInteger(BigInteger.ZERO),
           build_wsstring(SchemaType.WS_COLLAPSE), null, null };
 
     private final static XmlValueRef[] FACETS_UNSIGNED_INT = new XmlValueRef[]

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
    Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
    Fri Jul 17 16:51:41 2026        (r1936273)
@@ -19,6 +19,7 @@ import org.apache.xmlbeans.*;
 import org.apache.xmlbeans.impl.common.QNameHelper;
 import org.apache.xmlbeans.impl.common.XMLChar;
 import org.apache.xmlbeans.impl.schema.StscImporter.SchemaToProcess;
+import org.apache.xmlbeans.impl.util.MathUtil;
 import org.apache.xmlbeans.impl.values.NamespaceContext;
 import org.apache.xmlbeans.impl.values.XmlNonNegativeIntegerImpl;
 import org.apache.xmlbeans.impl.values.XmlPositiveIntegerImpl;
@@ -1511,8 +1512,8 @@ public class StscTranslator {
         String text = value.getStringValue();
         BigInteger bigInt;
         try {
-            bigInt = new BigInteger(text);
-        } catch (NumberFormatException e) {
+            bigInt = MathUtil.parseAsBigInteger(text);
+        } catch (Exception e) {
             StscState.get().error(XmlErrorCodes.INVALID_VALUE_DETAIL, new 
Object[]{text, "nonNegativeInteger", e.getMessage()}, value);
             return null;
         }

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java
    Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java
    Fri Jul 17 16:51:41 2026        (r1936273)
@@ -17,6 +17,7 @@ package org.apache.xmlbeans.impl.schema;
 
 import org.apache.xmlbeans.*;
 import org.apache.xmlbeans.impl.common.QNameHelper;
+import org.apache.xmlbeans.impl.util.MathUtil;
 import org.apache.xmlbeans.impl.values.XmlIntegerImpl;
 import org.apache.xmlbeans.impl.values.XmlStringImpl;
 import org.apache.xmlbeans.impl.values.XmlValueOutOfRangeException;
@@ -185,7 +186,7 @@ public class XQuerySchemaTypeSystem exte
             build_wsstring(SchemaType.WS_COLLAPSE), null, null};
 
     private final static XmlValueRef[] FACETS_UNSIGNED_LONG = new XmlValueRef[]
-        {null, null, null, null, buildInteger(BigInteger.ZERO), 
buildInteger(new BigInteger("18446744073709551615")), null, null, 
buildNnInteger(BigInteger.ZERO),
+        {null, null, null, null, buildInteger(BigInteger.ZERO), 
buildInteger(MathUtil.parseAsBigInteger("18446744073709551615")), null, null, 
buildNnInteger(BigInteger.ZERO),
             build_wsstring(SchemaType.WS_COLLAPSE), null, null};
 
     private final static XmlValueRef[] FACETS_UNSIGNED_INT = new XmlValueRef[]

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/MathUtil.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/MathUtil.java    
Fri Jul 17 16:04:01 2026        (r1936272)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/MathUtil.java    
Fri Jul 17 16:51:41 2026        (r1936273)
@@ -16,6 +16,9 @@
 ==================================================================== */
 package org.apache.xmlbeans.impl.util;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 /**
  * Internal Use Only. Utility methods for dealing with conversions
  */
@@ -47,4 +50,41 @@ public class MathUtil {
         }
         return (int) d;
     }
+
+    // TODO try to make this configurable
+    private static final int MAX_NUMBER_LENGTH = 1024;
+
+    /**
+     * @param s string to parse
+     * @return valid BigDecimal
+     * @throws NumberFormatException if parse fails
+     * @throws IllegalArgumentException if string is too long
+     * @throws NullPointerException if string is null
+     */
+    public static BigDecimal parseAsBigDecimal(String s) {
+        if (s == null) {
+            throw new NullPointerException("Cannot parse null as BigDecimal");
+        }
+        if (s.length() > MAX_NUMBER_LENGTH) {
+            throw new IllegalArgumentException("Number has more than " + 
MAX_NUMBER_LENGTH + " characters");
+        }
+        return new BigDecimal(s);
+    }
+
+    /**
+     * @param s string to parse
+     * @return valid BigInteger
+     * @throws NumberFormatException if parse fails
+     * @throws IllegalArgumentException if string is too long
+     * @throws NullPointerException if string is null
+     */
+    public static BigInteger parseAsBigInteger(String s) {
+        if (s == null) {
+            throw new NullPointerException("Cannot parse null as BigInteger");
+        }
+        if (s.length() > MAX_NUMBER_LENGTH) {
+            throw new IllegalArgumentException("Number has more than " + 
MAX_NUMBER_LENGTH + " characters");
+        }
+        return new BigInteger(s);
+    }
 }

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java 
    Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java 
    Fri Jul 17 16:51:41 2026        (r1936273)
@@ -248,7 +248,7 @@ public final class XsTypeConverter {
         //equals() method, but the xml value
         //space does not consider them significant.
         //See http://www.w3.org/2001/05/xmlschema-errata#e2-44
-        return new BigDecimal(trimTrailingZeros(v));
+        return MathUtil.parseAsBigDecimal(trimTrailingZeros(v));
     }
 
     private static final char[] CH_ZEROS = new char[]{'0', '0', '0', '0', '0', 
'0', '0', '0',
@@ -308,7 +308,7 @@ public final class XsTypeConverter {
 
         //TODO: consider special casing zero and one to return static values
         //from BigInteger to avoid object creation.
-        return new BigInteger(trimInitialPlus(v));
+        return MathUtil.parseAsBigInteger(trimInitialPlus(v));
     }
 
     public static BigInteger lexInteger(CharSequence cs, Collection<XmlError> 
errors) {

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java  
    Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java  
    Fri Jul 17 16:51:41 2026        (r1936273)
@@ -20,6 +20,7 @@ import org.apache.xmlbeans.impl.common.*
 import org.apache.xmlbeans.impl.schema.SchemaTypeImpl;
 import org.apache.xmlbeans.impl.schema.SchemaTypeVisitorImpl;
 import org.apache.xmlbeans.impl.util.ExceptionUtil;
+import org.apache.xmlbeans.impl.util.MathUtil;
 import org.apache.xmlbeans.impl.util.XsTypeConverter;
 import org.apache.xmlbeans.impl.values.*;
 
@@ -1108,7 +1109,7 @@ public final class Validator
                 }
 
                 if (errorState == _errorState) {
-                    _decimalValue = new BigDecimal(value);
+                    _decimalValue = MathUtil.parseAsBigDecimal(value);
                     JavaDecimalHolderEx.validateValue(_decimalValue, type, 
_vc);
                 }
 

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
 Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
 Fri Jul 17 16:51:41 2026        (r1936273)
@@ -20,6 +20,7 @@ import org.apache.xmlbeans.XmlErrorCodes
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.impl.common.ValidationContext;
 import org.apache.xmlbeans.impl.schema.BuiltinSchemaTypeSystem;
+import org.apache.xmlbeans.impl.util.MathUtil;
 import org.apache.xmlbeans.impl.util.XsTypeConverter;
 
 import java.math.BigDecimal;
@@ -47,8 +48,8 @@ public class JavaDecimalHolder extends X
         }
 
         try {
-            set_BigDecimal(new BigDecimal(s));
-        } catch (NumberFormatException e) {
+            set_BigDecimal(MathUtil.parseAsBigDecimal(s));
+        } catch (Exception e) {
             _voorVc.invalid(XmlErrorCodes.DECIMAL, new Object[]{s});
         }
     }
@@ -70,8 +71,8 @@ public class JavaDecimalHolder extends X
             // long-standing lenient behaviour: accept whatever BigDecimal 
accepts,
             // which includes scientific/exponent notation such as "1E5".
             try {
-                new BigDecimal(v);
-            } catch (NumberFormatException e) {
+                MathUtil.parseAsBigDecimal(v);
+            } catch (Exception e) {
                 context.invalid(XmlErrorCodes.DECIMAL, new Object[]{v});
             }
             return;

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
       Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
       Fri Jul 17 16:51:41 2026        (r1936273)
@@ -20,6 +20,7 @@ import org.apache.xmlbeans.XmlErrorCodes
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.impl.common.QNameHelper;
 import org.apache.xmlbeans.impl.common.ValidationContext;
+import org.apache.xmlbeans.impl.util.MathUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -44,8 +45,8 @@ public abstract class JavaDecimalHolderE
 
         BigDecimal v = null;
         try {
-            v = new BigDecimal(s);
-        } catch (NumberFormatException e) {
+            v = MathUtil.parseAsBigDecimal(s);
+        } catch (Exception e) {
             _voorVc.invalid(XmlErrorCodes.DECIMAL, new Object[]{s});
         }
 
@@ -83,7 +84,6 @@ public abstract class JavaDecimalHolderE
     /**
      * Performs facet validation only.
      */
-
     public static void validateValue(BigDecimal v, SchemaType sType, 
ValidationContext context) {
         // fractional digits
         XmlObject fd = sType.getFacet(SchemaType.FACET_FRACTION_DIGITS);

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java
 Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java
 Fri Jul 17 16:51:41 2026        (r1936273)
@@ -21,6 +21,7 @@ import org.apache.xmlbeans.XmlErrorCodes
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.impl.common.ValidationContext;
 import org.apache.xmlbeans.impl.schema.BuiltinSchemaTypeSystem;
+import org.apache.xmlbeans.impl.util.MathUtil;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -49,7 +50,7 @@ public abstract class JavaIntegerHolder
         }
 
         try {
-            return new BigInteger(s);
+            return MathUtil.parseAsBigInteger(s);
         } catch (Exception e) {
             vc.invalid(XmlErrorCodes.INTEGER, new Object[]{s});
             return null;

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
   Fri Jul 17 16:04:01 2026        (r1936272)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
   Fri Jul 17 16:51:41 2026        (r1936273)
@@ -26,6 +26,7 @@ package org.apache.xmlbeans.impl.xsd2ins
 
 import org.apache.xmlbeans.*;
 import org.apache.xmlbeans.impl.util.HexBin;
+import org.apache.xmlbeans.impl.util.MathUtil;
 import org.apache.xmlbeans.soap.SOAPArrayType;
 import org.apache.xmlbeans.soap.SchemaWSDLArrayType;
 
@@ -382,7 +383,7 @@ public class SampleXmlUtil {
     }
 
     private String formatDecimal(String start, SchemaType sType) {
-        BigDecimal result = new BigDecimal(start);
+        BigDecimal result = MathUtil.parseAsBigDecimal(start);
         XmlDecimal xmlD;
         xmlD = (XmlDecimal) sType.getFacet(SchemaType.FACET_MIN_INCLUSIVE);
         BigDecimal min = xmlD != null ? xmlD.getBigDecimalValue() : null;
@@ -414,7 +415,7 @@ public class SampleXmlUtil {
             for (int i = 0; i < totalDigits; i++) {
                 sb.append('9');
             }
-            BigDecimal digitsLimit = new BigDecimal(sb.toString());
+            BigDecimal digitsLimit = MathUtil.parseAsBigDecimal(sb.toString());
             if (max != null && max.compareTo(digitsLimit) > 0) {
                 max = digitsLimit;
                 maxInclusive = true;
@@ -445,7 +446,7 @@ public class SampleXmlUtil {
                     sb.append('0');
                 }
                 sb.append('1');
-                increment = new BigDecimal(sb.toString());
+                increment = MathUtil.parseAsBigDecimal(sb.toString());
             } else {
                 increment = BigDecimal.ONE;
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to