Merge pull request #188 from ibi-group/fix-otp-request-charset

fix(HttpUtils): Use UTF-8 when forwarding request bodies to OTP
ibi-group · Oct 10, 2023 · 781aa7d · 781aa7d
2 parents d6ae410 + 7fdc4ae
commit 781aa7d
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/src/main/java/org/opentripplanner/middleware/utils/HttpUtils.java b/src/main/java/org/opentripplanner/middleware/utils/HttpUtils.java
@@ -19,9 +19,9 @@
 
 import javax.ws.rs.core.UriBuilder;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.http.HttpTimeoutException;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.format.DateTimeParseException;
@@ -102,26 +102,16 @@ public static HttpResponseValues httpRequestRawResponse(URI uri, int timeoutInSe
                 httpUriRequest = deleteRequest;
                 break;
             case PUT:
-                try {
-                    HttpPut putRequest = new HttpPut(uri);
-                    putRequest.setEntity(new StringEntity(bodyContent));
-                    putRequest.setConfig(timeoutConfig);
-                    httpUriRequest = putRequest;
-                } catch (UnsupportedEncodingException e) {
-                    LOG.error("Unsupported encoding type", e);
-                    return null;
-                }
+                HttpPut putRequest = new HttpPut(uri);
+                putRequest.setEntity(new StringEntity(bodyContent, StandardCharsets.UTF_8));
+                putRequest.setConfig(timeoutConfig);
+                httpUriRequest = putRequest;
                 break;
             case POST:
-                try {
-                    HttpPost postRequest = new HttpPost(uri);
-                    postRequest.setEntity(new StringEntity(bodyContent));
-                    postRequest.setConfig(timeoutConfig);
-                    httpUriRequest = postRequest;
-                } catch (UnsupportedEncodingException e) {
-                    LOG.error("Unsupported encoding type", e);
-                    return null;
-                }
+                HttpPost postRequest = new HttpPost(uri);
+                postRequest.setEntity(new StringEntity(bodyContent, StandardCharsets.UTF_8));
+                postRequest.setConfig(timeoutConfig);
+                httpUriRequest = postRequest;
                 break;
             case HEAD:
             case OPTIONS: