Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public static <T extends Number> T parseNumber(
* {@code Integer.valueOf}, etc.
*/
private static boolean isHexNumber(String value) {
int index = (value.startsWith("-") ? 1 : 0);
int index = (value.startsWith("-") || value.startsWith("+") ? 1 : 0);
return (value.startsWith("0x", index) || value.startsWith("0X", index) || value.startsWith("#", index));
}

Expand All @@ -290,9 +290,9 @@ private static BigInteger decodeBigInteger(String value) {
int index = 0;
boolean negative = false;

// Handle minus sign, if present.
if (value.startsWith("-")) {
negative = true;
// Handle sign, if present.
if (value.startsWith("-") || value.startsWith("+")) {
negative = value.startsWith("-");
index++;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,16 @@ void parseNumberAsHex() {
assertThat(NumberUtils.parseNumber("0x" + aReallyBigInt, BigInteger.class)).as("BigInteger did not parse").isEqualTo(new BigInteger(aReallyBigInt, 16));
}

@Test
void parseNumberAsPositiveHex() {
assertThat(NumberUtils.parseNumber("+0x7f", Byte.class)).isEqualTo((byte) 127);
assertThat(NumberUtils.parseNumber("+0X7fff", Short.class)).isEqualTo((short) 32767);
assertThat(NumberUtils.parseNumber("+#2a", Integer.class)).isEqualTo(42);
assertThat(NumberUtils.parseNumber("+0x2a", Long.class)).isEqualTo(42L);
assertThat(NumberUtils.parseNumber("+0xFEBD4E677898DFEBFFEE44", BigInteger.class))
.isEqualTo(new BigInteger("FEBD4E677898DFEBFFEE44", 16));
}

@Test
void parseNumberAsNegativeHex() {
String aByte = "-0x80";
Expand Down