Ensure request content-type is preserved over the entity. (#24)

gradle.properties

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=2.0.6
+version=2.0.7
 group=com.budjb
 githubHttpsUrl=https://github.com/budjb/http-requests
 githubGitUrl=git@github.com:budjb/http-request.git

http-requests-core/src/main/java/com/budjb/httprequests/reference/ReferenceHttpClient.java

@@ -86,7 +86,7 @@ protected HttpResponse execute(HttpContext context, HttpEntity httpEntity, HttpC
             }
 
             connection.setDoOutput(true);
-            connection.setRequestProperty("Content-Type", httpEntity.getFullContentType());
+            connection.setRequestProperty("Content-Type", request.getHeaders().containsKey("Content-Type") ? request.getHeaders().getFlat("Content-Type") : httpEntity.getFullContentType());
 
             OutputStream outputStream = filterProcessor.filterOutputStream(connection.getOutputStream());
             StreamUtils.shovel(httpEntity.getInputStream(), outputStream);

http-requests-documentation/src/docs/changelog.adoc

@@ -2,6 +2,12 @@
 
 The changelog will be updated with release notes for each release of the library.
 
+2.0.7::
+
+* Ensure that a Content-Type specified in the request is preferred over the one provided
+  in the HTTP entity. This ensures that any Content-Type provided by a converter will not take
+  precedence over a user-specified one.
+
 2.0.6::
 
 * Make the build compatible with JDK 8.

http-requests-functional-test/src/main/groovy/com/budjb/httprequests/HttpIntegrationTestSuiteSpec.groovy

@@ -605,6 +605,18 @@ abstract class HttpIntegrationTestSuiteSpec extends AbstractIntegrationSpec {
         !((List) response.get('x-foo'))[0]
     }
 
+    def 'A Content-Type contained in the request is preferred over the one in the entity'() {
+        setup:
+        HttpRequest request = new HttpRequest("${baseUrl}/echo")
+        request.setHeader('content-type', 'foo/bar')
+
+        when:
+        def response = httpClientFactory.createHttpClient().post(request, 'foo')
+
+        then:
+        response.getHeader('content-type') == 'foo/bar'
+    }
+
     static class CloseableFilter implements HttpClientFilter, Closeable {
         boolean closed = false
 

http-requests-jersey1/src/main/java/com/budjb/httprequests/jersey1/JerseyHttpClient.java

@@ -65,7 +65,7 @@ protected HttpResponse execute(HttpContext context, HttpEntity entity, HttpClien
 
         builder = applyHeaders(builder, request.getHeaders());
 
-        if (entity != null && entity.getFullContentType() != null) {
+        if (!request.getHeaders().containsKey("Content-Type") && entity != null && entity.getFullContentType() != null) {
             builder = builder.type(entity.getFullContentType());
         }
 

http-requests-jersey2/src/main/java/com/budjb/httprequests/jersey2/JerseyHttpClient.java

@@ -68,7 +68,9 @@ protected HttpResponse execute(HttpContext context, HttpEntity httpEntity, HttpC
 
         Entity<InputStream> entity = null;
         if (httpEntity != null) {
-            entity = Entity.entity(httpEntity.getInputStream(), MediaType.valueOf(httpEntity.getFullContentType()));
+            entity = Entity.entity(httpEntity.getInputStream(), MediaType.valueOf(
+                request.getHeaders().containsKey("Content-Type") ? request.getHeaders().getFlat("Content-Type") : httpEntity.getFullContentType()
+            ));
         }
 
         Response clientResponse;