Skip to content

Fix ISIN country-code check using untrimmed input #399

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 3 commits into from
Jun 19, 2026
+16 −6
Merged

Fix ISIN country-code check using untrimmed input #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49ec507
fix ISIN country-code check using untrimmed input
sahvx655-wq Jun 15, 2026
652fbb0
Cover trailing and surrounding whitespace in ISIN country-code test
sahvx655-wq Jun 16, 2026
b9c1179
Use @ParameterizedTest for whitespace country-code test
sahvx655-wq Jun 17, 2026
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
8 changes: 2 additions & 6 deletions src/main/java/org/apache/commons/validator/routines/ISINValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,11 +460,7 @@ private boolean checkCode(final String code) {
* code, otherwise {@code false}.
*/
public boolean isValid(final String code) {
final boolean valid = VALIDATOR.isValid(code);
if (valid && checkCountryCode) {
return checkCode(code.substring(0, 2));
}
return valid;
return validate(code) != null;
}

/**
Expand All @@ -476,7 +472,7 @@ public boolean isValid(final String code) {
public Object validate(final String code) {
final Object validate = VALIDATOR.validate(code);
if (validate != null && checkCountryCode) {
return checkCode(code.substring(0, 2)) ? validate : null;
return checkCode(validate.toString().substring(0, 2)) ? validate : null;
}
return validate;
}
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/org/apache/commons/validator/routines/ISINValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@
*/
package org.apache.commons.validator.routines;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

/**
* Tests {@link ISINValidator}.
Expand Down Expand Up @@ -110,4 +113,15 @@ void testIsValidTrue() {
}
}

@ParameterizedTest
@ValueSource(strings = { " US0378331005", "US0378331005 ", " US0378331005 " })
void testValidWithSurroundingWhitespaceCountryCode(final String code) {
// The underlying CodeValidator trims the input, so the country code must be
// derived from the trimmed code. Otherwise a valid ISIN with surrounding whitespace
// is accepted without the country check but rejected with it.
assertTrue(VALIDATOR_FALSE.isValid(code), code);
assertTrue(VALIDATOR_TRUE.isValid(code), code);
assertEquals("US0378331005", VALIDATOR_TRUE.validate(code), code);
}

}
Loading