From 436d58dbfe49570b97e28318aa0f827eb89e2056 Mon Sep 17 00:00:00 2001 From: David Walluck Date: Thu, 20 Mar 2025 16:02:18 -0400 Subject: [PATCH 1/2] fix: remove unused method `indexOfUnsafeChar` --- src/main/java/com/github/packageurl/PackageURL.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/com/github/packageurl/PackageURL.java b/src/main/java/com/github/packageurl/PackageURL.java index ab31adc..bbd8c71 100644 --- a/src/main/java/com/github/packageurl/PackageURL.java +++ b/src/main/java/com/github/packageurl/PackageURL.java @@ -596,13 +596,6 @@ private static int indexOfPercentChar(final byte[] bytes, final int start) { .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 '" From 8fa5b1a89a93059da6a7dd6a93afb28f760c30a0 Mon Sep 17 00:00:00 2001 From: David Walluck Date: Thu, 20 Mar 2025 16:11:13 -0400 Subject: [PATCH 2/2] Inline second argument of `indexOfFirstPercentChar` --- src/main/java/com/github/packageurl/PackageURL.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/packageurl/PackageURL.java b/src/main/java/com/github/packageurl/PackageURL.java index bbd8c71..ac6c5e7 100644 --- a/src/main/java/com/github/packageurl/PackageURL.java +++ b/src/main/java/com/github/packageurl/PackageURL.java @@ -589,8 +589,8 @@ 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); @@ -629,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;