From dc4cdb81ea15c8d0195a6e2f8928a51ece461608 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 13 Sep 2024 11:07:49 +0200 Subject: [PATCH 1/2] Use correct HEAD request when fetching HTTP headers --- .../java/org/opentripplanner/framework/io/OtpHttpClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java index 678eb4754bd..9999853d615 100644 --- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java @@ -18,6 +18,7 @@ import java.util.Optional; import java.util.stream.Collectors; import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpHead; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; import org.apache.hc.client5.http.config.RequestConfig; @@ -76,7 +77,7 @@ public List
getHeaders( Map requestHeaderValues ) { return executeAndMapWithResponseHandler( - new HttpGet(uri), + new HttpHead(uri), timeout, requestHeaderValues, response -> { From 60d98e48a4afa8f56e3070499a1d5e904d136e50 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 13 Sep 2024 11:21:23 +0200 Subject: [PATCH 2/2] Remove check for content --- .../java/org/opentripplanner/framework/io/OtpHttpClient.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java index 9999853d615..ebfeb3ff496 100644 --- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java @@ -91,9 +91,6 @@ public List
getHeaders( return Collections.emptyList(); } - if (response.getEntity() == null || response.getEntity().getContent() == null) { - throw new OtpHttpClientException("HTTP request failed: empty response"); - } return Arrays.stream(response.getHeaders()).toList(); } );