Author: fanningpj
Date: Fri Jul 17 18:25:41 2026
New Revision: 1936278
Log:
more num parsing utils
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.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/xpath/XPathFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java Fri Jul
17 18:15:55 2026 (r1936277)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java Fri Jul
17 18:25:41 2026 (r1936278)
@@ -16,6 +16,7 @@
package org.apache.xmlbeans;
import org.apache.xmlbeans.impl.util.ExceptionUtil;
+import org.apache.xmlbeans.impl.util.MathUtil;
import org.apache.xmlbeans.impl.util.SuppressForbidden;
import java.math.BigDecimal;
@@ -273,7 +274,7 @@ public class XmlCalendar extends Gregori
{
String yearstring =
SystemProperties.getProperty("user.defaultyear");
if (yearstring != null)
- defaultYear = Integer.parseInt(yearstring);
+ defaultYear = MathUtil.parseAsInteger(yearstring);
else
defaultYear = DEFAULT_DEFAULT_YEAR;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
Fri Jul 17 18:15:55 2026 (r1936277)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
Fri Jul 17 18:25:41 2026 (r1936278)
@@ -17,6 +17,7 @@ package org.apache.xmlbeans.impl.inst2xs
import org.apache.xmlbeans.*;
import org.apache.xmlbeans.impl.inst2xsd.util.TypeSystemHolder;
import org.apache.xmlbeans.impl.tool.CommandLine;
+import org.apache.xmlbeans.impl.util.MathUtil;
import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import java.io.File;
@@ -149,7 +150,7 @@ public class Inst2Xsd
{
try
{
- int intVal = Integer.parseInt(enumerations);
+ int intVal = MathUtil.parseAsInteger(enumerations);
inst2XsdOptions.setUseEnumerations(intVal);
}
catch (NumberFormatException e)
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
Fri Jul 17 18:15:55 2026 (r1936277)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
Fri Jul 17 18:25:41 2026 (r1936278)
@@ -18,6 +18,7 @@ package org.apache.xmlbeans.impl.schema;
import org.apache.xmlbeans.*;
import org.apache.xmlbeans.impl.common.QNameHelper;
import org.apache.xmlbeans.impl.store.Locale;
+import org.apache.xmlbeans.impl.util.MathUtil;
import org.apache.xmlbeans.impl.xpath.XPathFactory;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Node;
@@ -328,7 +329,7 @@ public abstract class SchemaTypeLoaderBa
for (int i = parts.size() - 1; i >= 0; i -= 1) {
String part = parts.get(i);
- if (part.length() < 1) {
+ if (part.isEmpty()) {
throw new IllegalArgumentException();
}
int offset = (part.length() >= 2 && part.charAt(1) == '=') ? 2 : 1;
@@ -449,12 +450,7 @@ public abstract class SchemaTypeLoaderBa
if (curType == null) {
throw new IllegalArgumentException();
} else {
- int index;
- try {
- index = Integer.parseInt(part.substring(offset));
- } catch (Exception e) {
- throw new IllegalArgumentException();
- }
+ int index =
MathUtil.parseAsInteger(part.substring(offset));
if (curType.getSimpleVariety() != SchemaType.UNION) {
return null;
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java
Fri Jul 17 18:15:55 2026 (r1936277)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java
Fri Jul 17 18:25:41 2026 (r1936278)
@@ -18,6 +18,7 @@ package org.apache.xmlbeans.impl.tool;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.impl.util.MathUtil;
import java.util.Set;
import java.util.HashSet;
@@ -92,7 +93,7 @@ public class PrettyPrinter
if (indentStr == null)
indent = DEFAULT_INDENT;
else
- indent = Integer.parseInt(indentStr);
+ indent = MathUtil.parseAsInteger(indentStr);
File[] files = cl.getFiles();
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 18:15:55 2026 (r1936277)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/MathUtil.java
Fri Jul 17 18:25:41 2026 (r1936278)
@@ -87,4 +87,72 @@ public class MathUtil {
}
return new BigInteger(s);
}
+
+ /**
+ * @param s string to parse
+ * @return valid Float
+ * @throws NumberFormatException if parse fails
+ * @throws IllegalArgumentException if string is too long
+ * @throws NullPointerException if string is null
+ */
+ public static Float parseAsFloat(String s) {
+ if (s == null) {
+ throw new NullPointerException("Cannot parse null as Float");
+ }
+ if (s.length() > MAX_NUMBER_LENGTH) {
+ throw new IllegalArgumentException("Number has more than " +
MAX_NUMBER_LENGTH + " characters");
+ }
+ return Float.parseFloat(s);
+ }
+
+ /**
+ * @param s string to parse
+ * @return valid Float
+ * @throws NumberFormatException if parse fails
+ * @throws IllegalArgumentException if string is too long
+ * @throws NullPointerException if string is null
+ */
+ public static Double parseAsDouble(String s) {
+ if (s == null) {
+ throw new NullPointerException("Cannot parse null as Double");
+ }
+ if (s.length() > MAX_NUMBER_LENGTH) {
+ throw new IllegalArgumentException("Number has more than " +
MAX_NUMBER_LENGTH + " characters");
+ }
+ return Double.parseDouble(s);
+ }
+
+ /**
+ * @param s string to parse
+ * @return valid Long
+ * @throws NumberFormatException if parse fails
+ * @throws IllegalArgumentException if string is too long
+ * @throws NullPointerException if string is null
+ */
+ public static Long parseAsLong(String s) {
+ if (s == null) {
+ throw new NullPointerException("Cannot parse null as Long");
+ }
+ if (s.length() > MAX_NUMBER_LENGTH) {
+ throw new IllegalArgumentException("Number has more than " +
MAX_NUMBER_LENGTH + " characters");
+ }
+ return Long.parseLong(s);
+ }
+
+ /**
+ * @param s string to parse
+ * @return valid Integer
+ * @throws NumberFormatException if parse fails
+ * @throws IllegalArgumentException if string is too long
+ * @throws NullPointerException if string is null
+ */
+ public static Integer parseAsInteger(String s) {
+ if (s == null) {
+ throw new NullPointerException("Cannot parse null as Integer");
+ }
+ if (s.length() > MAX_NUMBER_LENGTH) {
+ throw new IllegalArgumentException("Number has more than " +
MAX_NUMBER_LENGTH + " characters");
+ }
+ return Integer.parseInt(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 18:15:55 2026 (r1936277)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
Fri Jul 17 18:25:41 2026 (r1936278)
@@ -116,7 +116,7 @@ public final class XsTypeConverter {
throw new NumberFormatException("Invalid char '" + ch + "' in
float.");
}
}
- return Float.parseFloat(v);
+ return MathUtil.parseAsFloat(v);
}
public static float lexFloat(CharSequence cs, Collection<XmlError> errors)
{
@@ -186,7 +186,7 @@ public final class XsTypeConverter {
throw new NumberFormatException("Invalid char '" + ch + "' in
double.");
}
}
- return Double.parseDouble(v);
+ return MathUtil.parseAsDouble(v);
}
public static double lexDouble(CharSequence cs, Collection<XmlError>
errors) {
@@ -331,7 +331,7 @@ public final class XsTypeConverter {
rejectInvalidNumber(cs);
rejectSignAfterPlus(cs);
final String v = cs.toString();
- return Long.parseLong(trimInitialPlus(v));
+ return MathUtil.parseAsLong(trimInitialPlus(v));
}
// trimInitialPlus drops a single leading '+', then Long.parseLong /
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/XPathFactory.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/XPathFactory.java
Fri Jul 17 18:15:55 2026 (r1936277)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/XPathFactory.java
Fri Jul 17 18:25:41 2026 (r1936278)
@@ -19,6 +19,7 @@ import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.impl.store.Cur;
+import org.apache.xmlbeans.impl.util.MathUtil;
import org.apache.xmlbeans.impl.xpath.saxon.SaxonXPath;
import org.apache.xmlbeans.impl.xpath.saxon.SaxonXQuery;
import org.apache.xmlbeans.impl.xpath.xmlbeans.XmlbeansXPath;
@@ -135,7 +136,7 @@ public class XPathFactory {
}
- int offset =
Integer.parseInt(namespaces.getOrDefault(XPath._NS_BOUNDARY, "0"));
+ int offset =
MathUtil.parseAsInteger(namespaces.getOrDefault(XPath._NS_BOUNDARY, "0"));
namespaces.remove(XPath._NS_BOUNDARY);
return new SaxonXPath(pathExpr.substring(offset), currentVar,
namespaces);
@@ -176,7 +177,7 @@ public class XPathFactory {
} catch (XPath.XPathCompileException e) {
//don't care if it fails, just care about boundary
} finally {
- boundaryVal =
Integer.parseInt(boundary.getOrDefault(XPath._NS_BOUNDARY, "0"));
+ boundaryVal =
MathUtil.parseAsInteger(boundary.getOrDefault(XPath._NS_BOUNDARY, "0"));
}
return new SaxonXQuery(queryExpr, currentVar, boundaryVal, options);
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
Fri Jul 17 18:15:55 2026 (r1936277)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
Fri Jul 17 18:25:41 2026 (r1936278)
@@ -18,6 +18,7 @@ package org.apache.xmlbeans.soap;
import org.apache.xmlbeans.impl.common.PrefixResolver;
import org.apache.xmlbeans.impl.common.QNameHelper;
import org.apache.xmlbeans.impl.common.XmlWhitespace;
+import org.apache.xmlbeans.impl.util.MathUtil;
import org.apache.xmlbeans.impl.values.XmlValueOutOfRangeException;
import javax.xml.namespace.QName;
@@ -66,7 +67,7 @@ public final class SOAPArrayType {
private static int collapseDimString(String dimString2) {
String dimString = XmlWhitespace.collapse(dimString2,
XmlWhitespace.WS_COLLAPSE);
try {
- return ("*".equals(dimString) || dimString.isEmpty()) ? -1 :
Integer.parseInt(dimString);
+ return ("*".equals(dimString) || dimString.isEmpty()) ? -1 :
MathUtil.parseAsInteger(dimString);
} catch (Exception e) {
throw new XmlValueOutOfRangeException("Malformed integer in SOAP
array index");
}
@@ -126,7 +127,7 @@ public final class SOAPArrayType {
// _hasIndeterminateDimensions = true;
} else {
try {
- _dimensions[i] = Integer.parseInt(dimStrings[i]);
+ _dimensions[i] =
MathUtil.parseAsInteger(dimStrings[i]);
} catch (Exception e) {
throw new XmlValueOutOfRangeException();
}
@@ -292,7 +293,7 @@ public final class SOAPArrayType {
// _hasIndeterminateDimensions = true;
} else {
try {
- dimensions[i] = Integer.parseInt(dimStrings[i]);
+ dimensions[i] = MathUtil.parseAsInteger(dimStrings[i]);
} catch (Exception e) {
throw new XmlValueOutOfRangeException();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]