Minor Fix

Author: arturobernalg

httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java

@@ -1118,15 +1118,89 @@ public URIBuilder normalizeSyntax() {
      * @since 5.3
      */
     public URIBuilder optimize() {
+        final String currentScheme = this.scheme;
+        if (currentScheme != null) {
+            this.scheme = TextUtils.toLowerCase(currentScheme);
+        }
+        // Preserve historical behavior: do not canonicalize rootless / opaque references.
+        if (this.pathRootless) {
+            return this;
+        }
         final String raw = this.toString();
         try {
             final Rfc3986Uri u = Rfc3986Uri.parse(raw).optimize();
-            return new URIBuilder(u.toString());
-        } catch (final IllegalArgumentException | URISyntaxException ex) {
+            digestRfc3986Uri(u);
+            return this;
+        } catch (final IllegalArgumentException ex) {
             return this;
         }
     }
 
+    private void digestRfc3986Uri(final Rfc3986Uri uri) {
+        this.scheme = uri.getScheme();
+        this.encodedUserInfo = uri.getUserInfo();
+        this.userInfo = PercentCodec.decode(uri.getUserInfo(), this.charset);
+
+        final String rawHost = uri.getHost();
+        this.host = toInternalHost(rawHost);
+        this.port = uri.getPort();
+        this.encodedAuthority = rawHost != null ? buildRawAuthority(uri.getUserInfo(), rawHost, uri.getPort()) : null;
+
+        this.encodedPath = uri.getPath();
+        this.pathSegments = parsePath(uri.getPath(), this.charset);
+        this.pathRootless = uri.getPath() == null || !uri.getPath().startsWith("/");
+
+        this.encodedQuery = uri.getQuery();
+        this.queryParams = parseQuery(uri.getQuery(), this.charset, this.plusAsBlank);
+        this.query = null;
+
+        this.encodedFragment = uri.getFragment();
+        this.fragment = PercentCodec.decode(uri.getFragment(), this.charset);
+
+        this.encodedSchemeSpecificPart = this.scheme != null
+                ? buildRawSchemeSpecificPart(this.encodedAuthority, this.encodedPath, this.encodedQuery)
+                : null;
+    }
+
+    private static String toInternalHost(final String rawHost) {
+        if (rawHost == null) {
+            return null;
+        }
+        if (!rawHost.isEmpty() && rawHost.charAt(0) == '[' && rawHost.charAt(rawHost.length() - 1) == ']') {
+            return ZoneIdSupport.decodeZoneId(rawHost.substring(1, rawHost.length() - 1));
+        }
+        return rawHost;
+    }
+
+    private static String buildRawAuthority(final String rawUserInfo, final String rawHost, final int port) {
+        final StringBuilder sb = new StringBuilder();
+        if (rawUserInfo != null) {
+            sb.append(rawUserInfo).append('@');
+        }
+        sb.append(rawHost);
+        if (port >= 0) {
+            sb.append(':').append(port);
+        }
+        return sb.toString();
+    }
+
+    private static String buildRawSchemeSpecificPart(
+            final String rawAuthority,
+            final String rawPath,
+            final String rawQuery) {
+        final StringBuilder sb = new StringBuilder();
+        if (rawAuthority != null) {
+            sb.append("//").append(rawAuthority);
+        }
+        if (rawPath != null) {
+            sb.append(rawPath);
+        }
+        if (rawQuery != null) {
+            sb.append('?').append(rawQuery);
+        }
+        return sb.toString();
+    }
+
 
     /**
      * Converts this instance to a URI string.

httpcore5/src/main/java/org/apache/hc/core5/net/uri/internal/uris/Rfc3986Parser.java

@@ -32,6 +32,7 @@
 import org.apache.hc.core5.annotation.Contract;
 import org.apache.hc.core5.annotation.Internal;
 import org.apache.hc.core5.annotation.ThreadingBehavior;
+import org.apache.hc.core5.net.InetAddressUtils;
 import org.apache.hc.core5.net.uri.Rfc3986Uri;
 import org.apache.hc.core5.net.uri.internal.authorities.Ports;
 import org.apache.hc.core5.net.uri.internal.utils.Ascii;
@@ -349,24 +350,9 @@ private static void validateIpvFuture(final String s) {
     }
 
     private static void validateIpv6Address(final String s) {
-        if (s.indexOf(":::") >= 0) {
+        if (!InetAddressUtils.isIPv6(s)) {
             throw new IllegalArgumentException("Invalid IPv6 literal");
         }
-        final int dbl = s.indexOf("::");
-        if (dbl >= 0 && s.indexOf("::", dbl + 2) >= 0) {
-            throw new IllegalArgumentException("Invalid IPv6 literal");
-        }
-        for (int i = 0; i < s.length(); i++) {
-            final char c = s.charAt(i);
-            if (c > 0x7F) {
-                throw new IllegalArgumentException("Non-ASCII character in IPv6 literal");
-            }
-            if (!(isHex(c) || c == ':' || c == '.')) {
-                throw new IllegalArgumentException("Illegal character in IPv6 literal");
-            }
-        }
-        // This is "strict enough" for RFC 3986 IP-literal validation without pulling in InetAddress.
-        // It rejects obvious junk and enforces the '::' compression constraint.
     }
 
     private static boolean isUnreserved(final char c) {
@@ -413,7 +399,6 @@ private static int scanScheme(final char[] a, final int from, final int toExcl)
     }
 
     private static int scanUntil(final char[] a, final int from, final int toExcl, final char... stops) {
-        outer:
         for (int i = from; i < toExcl; i++) {
             final char c = a[i];
             for (final char s : stops) {

httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java

@@ -880,6 +880,30 @@ void testOptimize() throws Exception {
         Assertions.assertThrows(URISyntaxException.class, () -> new URIBuilder("http:///../../.././").optimize().build().toASCIIString());
     }
 
+    @Test
+    void testOptimizeMutatesSameInstance() throws Exception {
+        final URIBuilder builder = new URIBuilder("HTTP://www.EXAMPLE.com/a/./b/../c");
+        final URIBuilder optimized = builder.optimize();
+        Assertions.assertSame(builder, optimized);
+        Assertions.assertEquals("http://www.example.com/a/c", builder.build().toASCIIString());
+    }
+
+    @Test
+    void testOptimizeRootlessOpaquePathUnchangedExceptSchemeCase() throws Exception {
+        final URIBuilder builder = new URIBuilder("MAILTO:John.Doe@example.com");
+        builder.optimize();
+        Assertions.assertEquals("mailto:John.Doe@example.com", builder.build().toString());
+    }
+
+    @Test
+    void testOptimizeIpvFutureAuthorityWithoutJdkUriRoundTrip() {
+        final URIBuilder builder = new URIBuilder()
+                .setScheme("http")
+                .setSchemeSpecificPart("//[v1.fe80]/a/./b");
+        builder.optimize();
+        Assertions.assertEquals("http://[v1.fe80]/a/b", builder.toString());
+    }
+
     @Test
     void testIpv6Host() throws Exception {
         final URIBuilder builder = new URIBuilder("https://[::1]:432/path");

httpcore5/src/test/java/org/apache/hc/core5/net/uri/Rfc3986UriTest.java

@@ -28,6 +28,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.hc.core5.net.uri.internal.paths.DotSegments;
@@ -71,6 +72,11 @@ void parseIpv6Literal() {
         assertEquals("/a", u.getPath());
     }
 
+    @Test
+    void rejectInvalidIpv6Literal() {
+        assertThrows(IllegalArgumentException.class, () -> Rfc3986Uri.parse("http://[2001:::1]/a"));
+    }
+
     @Test
     void parseAuthorityLessRelative() {
         final Rfc3986Uri u = Rfc3986Uri.parse("a/b?c#d");