diff --git a/src/main/java/com/github/packageurl/PackageURL.java b/src/main/java/com/github/packageurl/PackageURL.java index ab31adc..ac6c5e7 100644 --- a/src/main/java/com/github/packageurl/PackageURL.java +++ b/src/main/java/com/github/packageurl/PackageURL.java @@ -589,20 +589,13 @@ private static String toLowerCase(String s) { return new String(chars); } - private static int indexOfPercentChar(final byte[] bytes, final int start) { - return IntStream.range(start, bytes.length) + private static int indexOfFirstPercentChar(final byte[] bytes) { + return IntStream.range(0, bytes.length) .filter(i -> isPercent(bytes[i])) .findFirst() .orElse(-1); } - private static int indexOfUnsafeChar(final byte[] bytes, final int start) { - return IntStream.range(start, bytes.length) - .filter(i -> shouldEncode(bytes[i])) - .findFirst() - .orElse(-1); - } - private static byte percentDecode(final byte[] bytes, final int start) { if (start + 2 >= bytes.length) { throw new ValidationException("Incomplete percent encoding at offset " + start + " with value '" @@ -636,7 +629,7 @@ private static String percentDecode(final String source) { } byte[] bytes = source.getBytes(StandardCharsets.UTF_8); - int i = indexOfPercentChar(bytes, 0); + int i = indexOfFirstPercentChar(bytes); if (i == -1) { return source;