Address review feedback

Author: bioball

pkl-core/src/main/java/org/pkl/core/http/RequestRewritingClient.java

@@ -115,33 +115,32 @@ private <T> HttpResponse<T> doSend(
     while (true) {
       httpRequestChecker.check(currentRequestUri);
       var response = delegate.send(currentRequest, responseBodyHandler, httpRequestChecker);
-      if (HttpUtils.isRedirectStatusCode(response.statusCode())) {
-        if (redirectCount >= MAX_HTTP_REDIRECTS) {
-          throw new HttpClientException(ErrorMessages.create("httpTooManyRedirects"));
-        }
-        var location =
-            response
-                .headers()
-                .firstValue("Location")
-                .orElseThrow(
-                    () -> new HttpClientException(ErrorMessages.create("httpRedirectNoLocation")));
-        URI redirectUri;
-        try {
-          redirectUri = currentRequestUri.resolve(location);
-        } catch (IllegalArgumentException e) {
-          throw new HttpClientException(ErrorMessages.create("httpRedirectInvalidUri", location));
-        }
-        if (currentRequestUri.getScheme().equals("https")
-            && redirectUri.getScheme().equals("http")) {
-          throw new HttpClientException(
-              ErrorMessages.create("httpRedirectCannotDowngrade", currentRequestUri, redirectUri));
-        }
-        currentRequestUri = rewriteUri(redirectUri);
-        currentRequest = rewriteRequest(request, currentRequestUri);
-        redirectCount++;
-      } else {
+      if (!HttpUtils.isRedirectStatusCode(response.statusCode())) {
         return response;
       }
+      if (redirectCount >= MAX_HTTP_REDIRECTS) {
+        throw new HttpClientException(
+            ErrorMessages.create("httpTooManyRedirects", MAX_HTTP_REDIRECTS));
+      }
+      var location = response.headers().firstValue("Location");
+      if (location.isEmpty()) {
+        throw new HttpClientException(
+            ErrorMessages.create("httpRedirectNoLocation", currentRequestUri));
+      }
+      URI redirectUri;
+      try {
+        redirectUri = currentRequestUri.resolve(location.get());
+      } catch (IllegalArgumentException e) {
+        throw new HttpClientException(
+            ErrorMessages.create("httpRedirectInvalidUri", currentRequestUri, location.get()));
+      }
+      if (currentRequestUri.getScheme().equals("https") && redirectUri.getScheme().equals("http")) {
+        throw new HttpClientException(
+            ErrorMessages.create("httpRedirectCannotDowngrade", currentRequestUri, redirectUri));
+      }
+      currentRequestUri = rewriteUri(redirectUri);
+      currentRequest = rewriteRequest(request, currentRequestUri);
+      redirectCount++;
     }
   }
 

pkl-core/src/main/resources/org/pkl/core/errorMessages.properties

@@ -1150,18 +1150,21 @@ HTTP Header value is invalid because it is longer than 4096 characters. \
 Value: `{0}`
 
 httpTooManyRedirects=\
-Too many redirects. Possible redirect loop?
+Too many redirects, exceeded the redirect threshold ({0}).
 
 httpRedirectNoLocation=\
-Cannot follow HTTP redirect because no 'Location' header was found
+Cannot follow HTTP redirect because no 'Location' header was found.\n\
+\n\
+HTTP Request: `GET {0}`
 
 httpRedirectInvalidUri=\
 Cannot follow HTTP redirect because the response 'Location' header has a malformed URI.\n\
 \n\
-Location header: `{0}`
+HTTP Request: `GET {0}`\n\
+Location header: `{1}`
 
 httpRedirectCannotDowngrade=\
 Cannot follow redirect from ''https:'' URL to ''http:'' URL.\
 \n\
-Original Request URL: `{0}`\n\
+HTTP Request: `GET {0}`\n\
 Redirected to: `{1}`

stdlib/EvaluatorSettings.pkl

@@ -149,7 +149,7 @@ class Http {
   /// In the following example, an original request for `https://pkg.pkl-lang.org/my/pkg@1.0.0` is
   /// replaced with `https://my.internal.mirror/my/pkg@1.0.0`.
   ///
-  /// This does not affect `3XX` status code redirect following.
+  /// This also affects `3XX` status code redirect following.
   ///
   /// Example:
   ///