diff --git a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/ClientUtils.java b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/ClientUtils.java
index 439d946d1..c5cc2ba3c 100644
--- a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/ClientUtils.java
+++ b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/ClientUtils.java
@@ -307,7 +307,6 @@ public class ClientUtils {
request.addHeader("Accept", format);
request.addHeader("Content-Type", format + ";charset=" + DEFAULT_CHARSET);
}
- request.addHeader("Accept-Charset", DEFAULT_CHARSET);
if (headers != null) {
for (Header header : headers) {
request.addHeader(header);
diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/client/ClientUtils.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/client/ClientUtils.java
index 93ead03ff..8ad3be73b 100644
--- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/client/ClientUtils.java
+++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/client/ClientUtils.java
@@ -263,7 +263,6 @@ public class ClientUtils {
request.addHeader("Accept", format);
request.addHeader("Content-Type", format + ";charset=" + DEFAULT_CHARSET);
}
- request.addHeader("Accept-Charset", DEFAULT_CHARSET);
if (headers != null) {
for (Header header : headers) {
request.addHeader(header);
diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilder.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilder.java
index fbf47168f..006cf6bd8 100644
--- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilder.java
+++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilder.java
@@ -84,7 +84,6 @@ public class FhirRequestBuilder {
/**
* Adds necessary headers for all REST requests.
*
User-Agent : hapi-fhir-tooling-client
- * Accept-Charset : {@link FhirRequestBuilder#DEFAULT_CHARSET}
*
* @param request {@link Request.Builder} to add default headers to.
*/
@@ -92,7 +91,6 @@ public class FhirRequestBuilder {
if (headers == null || !headers.names().contains("User-Agent")) {
request.addHeader("User-Agent", "hapi-fhir-tooling-client");
}
- request.addHeader("Accept-Charset", DEFAULT_CHARSET);
}
/**
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/FhirRequestBuilder.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/FhirRequestBuilder.java
index 00c2de377..59c596d08 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/FhirRequestBuilder.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/FhirRequestBuilder.java
@@ -88,7 +88,6 @@ public class FhirRequestBuilder {
/**
* Adds necessary headers for all REST requests.
* User-Agent : hapi-fhir-tooling-client
- * Accept-Charset : {@link FhirRequestBuilder#DEFAULT_CHARSET}
*
* @param request {@link Request.Builder} to add default headers to.
*/
@@ -96,7 +95,6 @@ public class FhirRequestBuilder {
if (headers == null || !headers.names().contains("User-Agent")) {
request.addHeader("User-Agent", "hapi-fhir-tooling-client");
}
- request.addHeader("Accept-Charset", DEFAULT_CHARSET);
}
/**
diff --git a/org.hl7.fhir.r4/src/test/resources/schemas/fhir-xhtml.xsd b/org.hl7.fhir.r4/src/test/resources/schemas/fhir-xhtml.xsd
index 1e442e4ef..f76ea9b51 100644
--- a/org.hl7.fhir.r4/src/test/resources/schemas/fhir-xhtml.xsd
+++ b/org.hl7.fhir.r4/src/test/resources/schemas/fhir-xhtml.xsd
@@ -1558,7 +1558,6 @@
-
diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilder.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilder.java
index 3fc062aab..24a99b2cf 100644
--- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilder.java
+++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilder.java
@@ -78,7 +78,6 @@ public class FhirRequestBuilder {
/**
* Adds necessary headers for all REST requests.
* User-Agent : hapi-fhir-tooling-client
- * Accept-Charset : {@link FhirRequestBuilder#DEFAULT_CHARSET}
*
* @param request {@link Request.Builder} to add default headers to.
*/
@@ -86,7 +85,6 @@ public class FhirRequestBuilder {
if (headers == null || !headers.names().contains("User-Agent")) {
request.addHeader("User-Agent", "hapi-fhir-tooling-client");
}
- request.addHeader("Accept-Charset", DEFAULT_CHARSET);
}
/**
diff --git a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilderTest.java b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilderTest.java
index 95e7f9ff2..8cd65e5d3 100644
--- a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilderTest.java
+++ b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilderTest.java
@@ -26,9 +26,6 @@ class FhirRequestBuilderTest {
Assertions.assertEquals("hapi-fhir-tooling-client", headersMap.get("User-Agent").get(0),
"User-Agent header not populated with expected value \"hapi-fhir-tooling-client\".");
- Assertions.assertNotNull(headersMap.get("Accept-Charset"), "Accept-Charset header null.");
- Assertions.assertEquals(FhirRequestBuilder.DEFAULT_CHARSET, headersMap.get("Accept-Charset").get(0),
- "Accept-Charset header not populated with expected value " + FhirRequestBuilder.DEFAULT_CHARSET);
}
@Test
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilder.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilder.java
index 1edacd331..58e5c9511 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilder.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilder.java
@@ -75,7 +75,6 @@ public class FhirRequestBuilder {
/**
* Adds necessary headers for all REST requests.
* User-Agent : hapi-fhir-tooling-client
- * Accept-Charset : {@link FhirRequestBuilder#DEFAULT_CHARSET}
*
* @param request {@link Request.Builder} to add default headers to.
*/
@@ -83,7 +82,6 @@ public class FhirRequestBuilder {
if (headers == null || !headers.names().contains("User-Agent")) {
request.addHeader("User-Agent", "hapi-fhir-tooling-client");
}
- request.addHeader("Accept-Charset", DEFAULT_CHARSET);
}
/**
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilderTest.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilderTest.java
index b56909bdd..78ab6d45b 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilderTest.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilderTest.java
@@ -23,10 +23,6 @@ class FhirRequestBuilderTest {
Assertions.assertNotNull(headersMap.get("User-Agent"), "User-Agent header null.");
Assertions.assertEquals("hapi-fhir-tooling-client", headersMap.get("User-Agent").get(0),
"User-Agent header not populated with expected value \"hapi-fhir-tooling-client\".");
-
- Assertions.assertNotNull(headersMap.get("Accept-Charset"), "Accept-Charset header null.");
- Assertions.assertEquals(FhirRequestBuilder.DEFAULT_CHARSET, headersMap.get("Accept-Charset").get(0),
- "Accept-Charset header not populated with expected value " + FhirRequestBuilder.DEFAULT_CHARSET);
}
@Test