Skip to content
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

Jump to bottom

[Java] Make AsciiEncoding throw exceptions similar to JDK parseInt/parseLong #214

Merged
merged 1 commit into from
Jul 20, 2020
Merged

[Java] Make AsciiEncoding throw exceptions similar to JDK parseInt/parseLong #214

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
46 changes: 30 additions & 16 deletions agrona/src/main/java/org/agrona/AsciiEncoding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,21 +127,20 @@ public static int getDigit(final int index, final char value)
* @param index at which the number begins.
* @param length of the encoded number in characters.
* @throws AsciiNumberFormatException if <code>cs</code> is not an int value
* @throws IndexOutOfBoundsException if <code>cs</code> is empty
* @throws IndexOutOfBoundsException if parsing results in access outside string boundaries, or length is negative
* @return the parsed value.
*/
public static int parseIntAscii(final CharSequence cs, final int index, final int length)
{
final int endExclusive = index + length;
final int first = cs.charAt(index);
int i = index;
final boolean hasSign = first == MINUS_SIGN;

if (hasSign && length > 1)
if (length <= 1)
{
i++;
return parseSingleDigit(cs, index, length);
}

final boolean hasSign = cs.charAt(index) == MINUS_SIGN;
final int endExclusive = index + length;
int i = hasSign ? index + 1 : index;

if (length >= 10)
{
checkIntLimits(cs, index, length, i, hasSign);
Expand All @@ -168,21 +167,20 @@ public static int parseIntAscii(final CharSequence cs, final int index, final in
* @param index at which the number begins.
* @param length of the encoded number in characters.
* @throws AsciiNumberFormatException if <code>cs</code> is not a long value
* @throws IndexOutOfBoundsException if <code>cs</code> is empty
* @throws IndexOutOfBoundsException if parsing results in access outside string boundaries, or length is negative
* @return the parsed value.
*/
public static long parseLongAscii(final CharSequence cs, final int index, final int length)
{
final int endExclusive = index + length;
final int first = cs.charAt(index);
int i = index;
final boolean hasSign = first == MINUS_SIGN;

if (hasSign && length > 1)
if (length <= 1)
{
i++;
return parseSingleDigit(cs, index, length);
}

final boolean hasSign = cs.charAt(index) == MINUS_SIGN;
final int endExclusive = index + length;
int i = hasSign ? index + 1 : index;

if (length >= 19)
{
checkLongLimits(cs, index, length, i, hasSign);
Expand All @@ -202,6 +200,22 @@ public static long parseLongAscii(final CharSequence cs, final int index, final
return tally;
}

private static int parseSingleDigit(final CharSequence cs, final int index, final int length)
{
if (length == 1)
{
return AsciiEncoding.getDigit(index, cs.charAt(index));
}
else if (length == 0)
{
throw new AsciiNumberFormatException("'' is not a valid int @ " + index);
}
else
{
throw new IndexOutOfBoundsException("length=" + length);
}
}

private static void checkIntLimits(
final CharSequence cs, final int index, final int length, final int i, final boolean hasSign)
{
Expand Down
4 changes: 2 additions & 2 deletions agrona/src/test/java/org/agrona/AsciiEncodingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,12 @@ public void shouldThrowExceptionWhenParsingLongContainingLonePlusSign()
@Test
public void shouldThrowExceptionWhenParsingEmptyInteger()
{
assertThrows(IndexOutOfBoundsException.class, () -> parseIntAscii("", 0, 0));
assertThrows(AsciiNumberFormatException.class, () -> parseIntAscii("", 0, 0));
}

@Test
public void shouldThrowExceptionWhenParsingEmptyLong()
{
assertThrows(IndexOutOfBoundsException.class, () -> parseLongAscii("", 0, 0));
assertThrows(AsciiNumberFormatException.class, () -> parseLongAscii("", 0, 0));
}
}