Skip to content

fix: improve performance of encode and decode #212

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
jeremylong merged 1 commit into from
Mar 20, 2025
Merged

fix: improve performance of encode and decode #212

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
89 changes: 29 additions & 60 deletions src/main/java/com/github/packageurl/PackageURL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,43 +632,33 @@ private static byte percentDecode(final byte[] bytes, final int start) {
return ((byte) ((c1 << 4) + c2));
}

public static String percentDecode(final String source) {
private static String percentDecode(final String source) {
if (source.isEmpty()) {
return source;
}

byte[] bytes = source.getBytes(StandardCharsets.UTF_8);
int i = indexOfPercentChar(bytes, 0);

int off = 0;
int idx = indexOfPercentChar(bytes, off);

if (idx == -1) {
if (i == -1) {
return source;
}

ByteBuffer buffer = ByteBuffer.wrap(bytes);
buffer.position(i);
int length = buffer.capacity();

while (true) {
int len = idx - off;
while (i < length) {
byte b = bytes[i];

if (len > 0) {
buffer.put(bytes, off, len);
off += len;
if (isPercent(b)) {
buffer.put(percentDecode(bytes, i));
i += 2;
} else {
buffer.put(b);
}

buffer.put(percentDecode(bytes, off));
off += 3;
idx = indexOfPercentChar(bytes, off);

if (idx == -1) {
int rem = bytes.length - off;

if (rem > 0) {
buffer.put(bytes, off, rem);
}

break;
}
i++;
}

return new String(buffer.array(), 0, buffer.position(), StandardCharsets.UTF_8);
Expand All @@ -683,51 +673,30 @@ private static boolean isPercent(int c) {
return (c == PERCENT_CHAR);
}

private static byte[] percentEncode(byte b) {
byte b1 = (byte) Character.toUpperCase(Character.forDigit((b >> 4) & 0xF, 16));
byte b2 = (byte) Character.toUpperCase(Character.forDigit(b & 0xF, 16));
return new byte[] {(byte) PERCENT_CHAR, b1, b2};
}

public static String percentEncode(final String source) {
private static String percentEncode(final String source) {
if (source.isEmpty()) {
return source;
}

byte[] bytes = source.getBytes(StandardCharsets.UTF_8);

int off = 0;
int idx = indexOfUnsafeChar(bytes, off);

if (idx == -1) {
return source;
}

ByteBuffer buffer = ByteBuffer.allocate(bytes.length * 3);

while (true) {
int len = idx - off;

if (len > 0) {
buffer.put(bytes, off, len);
off += len;
}

buffer.put(percentEncode(bytes[off++]));
idx = indexOfUnsafeChar(bytes, off);

if (idx == -1) {
int rem = bytes.length - off;

if (rem > 0) {
buffer.put(bytes, off, rem);
}

break;
int length = bytes.length;
ByteBuffer buffer = ByteBuffer.allocate(length * 3);
boolean changed = false;

for (byte b : bytes) {
if (shouldEncode(b)) {
changed = true;
byte b1 = (byte) Character.toUpperCase(Character.forDigit((b >> 4) & 0xF, 16));
byte b2 = (byte) Character.toUpperCase(Character.forDigit(b & 0xF, 16));
buffer.put((byte) PERCENT_CHAR);
buffer.put(b1);
buffer.put(b2);
} else {
buffer.put(b);
}
}

return new String(buffer.array(), 0, buffer.position(), StandardCharsets.UTF_8);
return changed ? new String(buffer.array(), 0, buffer.position(), StandardCharsets.UTF_8) : source;
}

/**
Expand Down
Loading