Merge remote-tracking branch 'upstream/master' into deprecated-and-since

Author: dwalluck

pom.xml

@@ -128,7 +128,7 @@
     <maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>
     <versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
     <!-- Maven build plugins for quality checks -->
-    <error.prone.core.version>2.36.0</error.prone.core.version>
+    <error.prone.core.version>2.37.0</error.prone.core.version>
     <jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
     <palantir.java.format.version>2.58.0</palantir.java.format.version>
     <spotbugs.maven.plugin.version>4.9.3.0</spotbugs.maven.plugin.version>

src/main/java/com/github/packageurl/PackageURL.java

@@ -565,7 +565,7 @@ private static boolean isLowerCase(int c) {
     }
 
     private static int toLowerCase(int c) {
-        return (c ^ 0x20);
+        return isUpperCase(c) ? (c ^ 0x20) : c;
     }
 
     private static String toLowerCase(String s) {
@@ -579,9 +579,7 @@ private static String toLowerCase(String s) {
         int length = chars.length;
 
         for (int i = pos; i < length; i++) {
-            if (isUpperCase(chars[i])) {
-                chars[i] = (char) toLowerCase(chars[i]);
-            }
+            chars[i] = (char) toLowerCase(chars[i]);
         }
 
         return new String(chars);
@@ -634,37 +632,27 @@ static String percentDecode(final String 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);
@@ -687,51 +675,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};
-    }
-
     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;
     }
 
     /**
@@ -948,7 +915,7 @@ public String getCoordinates() {
      * @since 1.2.0
      */
     public boolean isCanonicalEquals(final PackageURL purl) {
-        return (this.canonicalize().equals(purl.canonicalize()));
+        return this.canonicalize().equals(purl.canonicalize());
     }
 
     private static boolean isEmpty(@Nullable String value) {