Author: fanningpj
Date: Sun Jul 19 15:41:02 2026
New Revision: 1936323
Log:
more conversion issues
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.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/values/JavaIntHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java Sun Jul
19 14:47:17 2026 (r1936322)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java Sun Jul
19 15:41:02 2026 (r1936323)
@@ -22,6 +22,8 @@ import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
+import org.apache.xmlbeans.impl.util.MathUtil;
+
/**
* Used to build {@link GDate GDates}.
* <p>
@@ -811,7 +813,7 @@ public final class GDateBuilder implemen
if (_fs != null && (_fs.signum() < 0 || _fs.compareTo(GDate._one) >=
0)) {
BigDecimal bdcarry = _fs.setScale(0, RoundingMode.FLOOR);
_fs = _fs.subtract(bdcarry);
- carry = bdcarry.longValue();
+ carry = MathUtil.toLong(bdcarry);
}
if (carry != 0 || _s < 0 || _s > 59 || _m < 0 || _m > 50 || _h < 0 ||
_h > 23) {
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
Sun Jul 19 14:47:17 2026 (r1936322)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
Sun Jul 19 15:41:02 2026 (r1936323)
@@ -19,6 +19,8 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
+import org.apache.xmlbeans.impl.util.MathUtil;
+
/**
* Used to build {@link GDuration GDurations}.
*/
@@ -348,7 +350,7 @@ public class GDurationBuilder implements
if (_fs != null && (_fs.signum() < 0 || _fs.compareTo(GDate._one) >=
0)) {
BigDecimal bdcarry = _fs.setScale(0, RoundingMode.FLOOR);
_fs = _fs.subtract(bdcarry);
- carry = bdcarry.intValue();
+ carry = MathUtil.toInt(bdcarry);
}
if (carry != 0 || _s < 0 || _s > 59 || _m < 0 || _m > 50 || _h < 0 ||
_h > 23) {
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
Sun Jul 19 14:47:17 2026 (r1936322)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/MathUtil.java
Sun Jul 19 15:41:02 2026 (r1936323)
@@ -195,7 +195,7 @@ public class MathUtil {
* @param value BigDecimal to convert
* @return valid BigInteger
* @throws IllegalArgumentException if the input has an absolute exponent
that is too large to safely convert
- * @throws NullPointerException if string is null
+ * @throws NullPointerException if value is null
*/
public static BigInteger toBigInteger(BigDecimal value) {
BigDecimal normalized = value.stripTrailingZeros();
@@ -207,4 +207,29 @@ public class MathUtil {
}
return normalized.toBigInteger();
}
+
+ /**
+ * @param value BigDecimal to convert
+ * @return valid long
+ * @throws IllegalArgumentException if the input has an absolute exponent
that is too large to safely convert
+ * @throws ArithmeticException if the value cannot be represented as a long
+ * @throws NullPointerException if value is null
+ */
+ public static long toLong(BigDecimal value) {
+ BigInteger bigInt = toBigInteger(value);
+ return bigInt.longValueExact();
+ }
+
+ /**
+ * @param value BigDecimal to convert
+ * @return valid int
+ * @throws IllegalArgumentException if the input has an absolute exponent
that is too large to safely convert
+ * @throws ArithmeticException if the value cannot be represented as an int
+ * @throws NullPointerException if value is null
+ */
+ public static int toInt(BigDecimal value) {
+ BigInteger bigInt = toBigInteger(value);
+ return bigInt.intValueExact();
+ }
+
}
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
Sun Jul 19 14:47:17 2026 (r1936322)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
Sun Jul 19 15:41:02 2026 (r1936323)
@@ -264,7 +264,7 @@ public final class XsTypeConverter {
// The following code comes from Apache Harmony
String intStr = value.unscaledValue().toString();
int scale = value.scale();
- if ((scale == 0) || ((value.longValue() == 0) && (scale < 0))) {
+ if (scale == 0 || (MathUtil.toLong(value) == 0 && scale < 0)) {
return intStr;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java
Sun Jul 19 14:47:17 2026 (r1936322)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java
Sun Jul 19 15:41:02 2026 (r1936323)
@@ -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 org.apache.xmlbeans.impl.util.XsTypeConverter;
public abstract class JavaIntHolderEx extends JavaIntHolder {
@@ -150,7 +151,7 @@ public abstract class JavaIntHolderEx ex
SchemaType s = o.schemaType();
switch (s.getDecimalSize()) {
case SchemaType.SIZE_BIG_DECIMAL:
- return ((XmlObjectBase) o).getBigDecimalValue().intValue();
+ return MathUtil.toInt(((XmlObjectBase)
o).getBigDecimalValue());
case SchemaType.SIZE_BIG_INTEGER:
return ((XmlObjectBase) o).getBigIntegerValue().intValue();
case SchemaType.SIZE_LONG:
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java
Sun Jul 19 14:47:17 2026 (r1936322)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java
Sun Jul 19 15:41:02 2026 (r1936323)
@@ -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 org.apache.xmlbeans.impl.util.XsTypeConverter;
public abstract class JavaLongHolderEx extends JavaLongHolder {
@@ -150,7 +151,7 @@ public abstract class JavaLongHolderEx e
SchemaType s = o.schemaType();
switch (s.getDecimalSize()) {
case SchemaType.SIZE_BIG_DECIMAL:
- return ((XmlObjectBase) o).getBigDecimalValue().longValue();
+ return MathUtil.toLong(((XmlObjectBase)
o).getBigDecimalValue());
case SchemaType.SIZE_BIG_INTEGER:
return ((XmlObjectBase) o).getBigIntegerValue().longValue();
case SchemaType.SIZE_LONG:
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
Sun Jul 19 14:47:17 2026 (r1936322)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
Sun Jul 19 15:41:02 2026 (r1936323)
@@ -409,7 +409,7 @@ public class SampleXmlUtil {
xmlD = (XmlDecimal) sType.getFacet(SchemaType.FACET_TOTAL_DIGITS);
int totalDigits = -1;
if (xmlD != null) {
- totalDigits = xmlD.getBigDecimalValue().intValue();
+ totalDigits = MathUtil.toInt(xmlD.getBigDecimalValue());
StringBuilder sb = new StringBuilder(totalDigits);
for (int i = 0; i < totalDigits; i++) {
@@ -439,7 +439,7 @@ public class SampleXmlUtil {
if (xmlD == null) {
increment = new BigDecimal(1);
} else {
- fractionDigits = xmlD.getBigDecimalValue().intValue();
+ fractionDigits = MathUtil.toInt(xmlD.getBigDecimalValue());
if (fractionDigits > 0) {
StringBuilder sb = new StringBuilder("0.");
for (int i = 1; i < fractionDigits; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]