From 848fee05c75eb01ce11ba9719e072adf685f3253 Mon Sep 17 00:00:00 2001 From: Jens Kristian Villadsen Date: Fri, 24 May 2024 19:35:57 +0200 Subject: [PATCH] Removed the use of Accept-Charset when using the HAPI client (#5961) * Removed the use of Accept-Charset when using the HAPI client * Added changelog * Update 5962-remove-use-of-deprecated-accept-charset-header.yaml --- .../java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java | 5 ----- .../java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java | 1 - .../5962-remove-use-of-deprecated-accept-charset-header.yaml | 4 ++++ .../main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5962-remove-use-of-deprecated-accept-charset-header.yaml diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java index 48b5a224503..f55aa7b79f4 100644 --- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java +++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java @@ -136,7 +136,6 @@ public class OkHttpRestfulClient implements IHttpClient { } addUserAgentHeader(theHttpRequest, theContext); - addAcceptCharsetHeader(theHttpRequest); MethodUtil.addAcceptHeaderToRequest(theEncoding, theHttpRequest, theContext); addIfNoneExistHeader(theHttpRequest); } @@ -145,10 +144,6 @@ public class OkHttpRestfulClient implements IHttpClient { theHttpRequest.addHeader("User-Agent", HttpClientUtil.createUserAgentString(theContext, "okhttp")); } - private void addAcceptCharsetHeader(OkHttpRestfulRequest theHttpRequest) { - theHttpRequest.addHeader("Accept-Charset", "utf-8"); - } - private void addIfNoneExistHeader(IHttpRequest result) { if (myIfNoneExistParams != null) { addIfNoneExistHeaderFromParams(result, myIfNoneExistParams); diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java index 542dca878c6..c7c51dcf8f7 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java @@ -81,7 +81,6 @@ public abstract class BaseHttpClient implements IHttpClient { } theHttpRequest.addHeader("User-Agent", HttpClientUtil.createUserAgentString(theContext, "apache")); - theHttpRequest.addHeader("Accept-Charset", "utf-8"); theHttpRequest.addHeader("Accept-Encoding", "gzip"); addHeaderIfNoneExist(theHttpRequest); diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5962-remove-use-of-deprecated-accept-charset-header.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5962-remove-use-of-deprecated-accept-charset-header.yaml new file mode 100644 index 00000000000..a8437587798 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5962-remove-use-of-deprecated-accept-charset-header.yaml @@ -0,0 +1,4 @@ +--- +type: fix +issue: 5962 +title: "The default use of the Accept-Charset header has been removed as its use is deprecated. Thanks to Jens Villadsen for the suggestion and pull request!" diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java index a296c000f67..a929560c2a5 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java @@ -119,7 +119,6 @@ public class JaxRsHttpClient implements IHttpClient { } theHttpRequest.addHeader("User-Agent", HttpClientUtil.createUserAgentString(theContext, "jax-rs")); - theHttpRequest.addHeader("Accept-Charset", "utf-8"); Builder request = theHttpRequest.getRequest(); request.acceptEncoding("gzip");