Skip to content

Fix BigIntegerValidator minValue(), maxValue(), and processParsedValue() for out of Long range values. #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garydgregory merged 1 commit into from
Jun 13, 2026
+55 −3
Merged

Fix BigIntegerValidator minValue(), maxValue(), and processParsedValue() for out of Long range values. #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/main/java/org/apache/commons/validator/routines/BigIntegerValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.commons.validator.routines;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.Format;
import java.text.NumberFormat;
Expand Down Expand Up @@ -120,7 +121,7 @@ public BigIntegerValidator(final boolean strict, final int formatType) {
* specified range.
*/
public boolean isInRange(final BigInteger value, final long min, final long max) {
return value.longValue() >= min && value.longValue() <= max;
return value.compareTo(BigInteger.valueOf(min)) >= 0 && value.compareTo(BigInteger.valueOf(max)) <= 0;
}

/**
Expand All @@ -132,7 +133,7 @@ public boolean isInRange(final BigInteger value, final long min, final long max)
* or equal to the maximum.
*/
public boolean maxValue(final BigInteger value, final long max) {
return value.longValue() <= max;
return value.compareTo(BigInteger.valueOf(max)) <= 0;
}

/**
Expand All @@ -157,7 +158,14 @@ public boolean minValue(final BigInteger value, final long min) {
*/
@Override
protected Object processParsedValue(final Object value, final Format formatter) {
return BigInteger.valueOf(((Number) value).longValue());
if (value instanceof Long) {
return BigInteger.valueOf(((Long) value).longValue());
}
if (value instanceof Double) {
// No need to roundtrip with a string.
return BigDecimal.valueOf(((Double) value).doubleValue()).toBigInteger();
}
return new BigDecimal(value.toString()).toBigInteger();
}

/**
Expand Down
44 changes: 44 additions & 0 deletions src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,50 @@ protected void setUp() {

}

/**
* Test a value larger than {@link Long#MAX_VALUE} keeps its magnitude instead of being clamped to {@link Long#MAX_VALUE}.
*/
@Test
void testBigIntegerAboveLongMaxValue() {
// One past Long.MAX_VALUE, so NumberFormat parses it as a Double rather than a Long.
final BigInteger aboveLong = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE);
final String aboveLongStr = aboveLong.toString();
final BigIntegerValidator instance = BigIntegerValidator.getInstance();
final BigInteger resultAboveLong = instance.validate(aboveLongStr, "#");
assertTrue(resultAboveLong.compareTo(BigInteger.valueOf(Long.MIN_VALUE)) > 0);
assertTrue(resultAboveLong.compareTo(BigInteger.ZERO) > 0);
assertTrue(resultAboveLong.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0);
assertTrue(instance.minValue(resultAboveLong, Long.MIN_VALUE));
assertFalse(instance.minValue(resultAboveLong, Long.MAX_VALUE));
assertFalse(instance.maxValue(resultAboveLong, Long.MIN_VALUE));
assertFalse(instance.maxValue(resultAboveLong, Long.MAX_VALUE));
assertFalse(instance.isInRange(resultAboveLong, Long.MIN_VALUE, Long.MAX_VALUE));
// BigDecimalValidator already preserves the magnitude, so the two must agree
assertEquals(BigDecimalValidator.getInstance().validate(aboveLongStr, "#").toBigInteger(), resultAboveLong);
}

/**
* Test a value larger than {@link Long#MAX_VALUE} keeps its magnitude instead of being clamped to {@link Long#MAX_VALUE}.
*/
@Test
void testBigIntegerBelowLongMinValue() {
// One past Long.MAX_VALUE, so NumberFormat parses it as a Double rather than a Long.
final BigInteger belowLong = BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE);
final String belowLongStr = belowLong.toString();
final BigIntegerValidator instance = BigIntegerValidator.getInstance();
final BigInteger resultBelowLong = instance.validate(belowLongStr, "#");
assertTrue(resultBelowLong.compareTo(BigInteger.valueOf(Long.MIN_VALUE)) < 0);
assertTrue(resultBelowLong.compareTo(BigInteger.ZERO) < 0);
assertTrue(resultBelowLong.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) < 0);
assertTrue(instance.minValue(resultBelowLong, Long.MIN_VALUE));
assertFalse(instance.minValue(resultBelowLong, Long.MAX_VALUE));
assertTrue(instance.maxValue(resultBelowLong, Long.MIN_VALUE));
assertTrue(instance.maxValue(resultBelowLong, Long.MAX_VALUE));
assertFalse(instance.isInRange(resultBelowLong, Long.MIN_VALUE, Long.MAX_VALUE));
// BigDecimalValidator already preserves the magnitude, so the two must agree
assertEquals(BigDecimalValidator.getInstance().validate(belowLongStr, "#").toBigInteger(), resultBelowLong);
}

/**
* Test BigInteger Range/Min/Max
*/
Expand Down
Loading