fix: convert media type with charset

Author: bomgar

riptide-httpclient/src/main/java/org/zalando/riptide/httpclient/BufferingApacheClientHttpRequest.java

@@ -78,8 +78,7 @@ public ClientHttpResponse execute() throws IOException {
     @Nullable
     private ContentType toContentType(@Nullable MediaType mediaType) {
         return Optional.ofNullable(mediaType)
-                .map(MediaType::toString)
-                .map(ContentType::create)
+                .map(ContentTypeConverter::toContentType)
                 .orElse(null);
     }
 

riptide-httpclient/src/main/java/org/zalando/riptide/httpclient/ContentTypeConverter.java

@@ -0,0 +1,11 @@
+package org.zalando.riptide.httpclient;
+
+import org.apache.hc.core5.http.ContentType;
+import org.springframework.http.MediaType;
+
+public class ContentTypeConverter {
+
+    public static ContentType toContentType(MediaType mediaType) {
+        return ContentType.create(mediaType.getType() + "/" + mediaType.getSubtype(), mediaType.getCharset());
+    }
+}

riptide-httpclient/src/test/java/org/zalando/riptide/httpclient/ContentTypeConverterTest.java

@@ -0,0 +1,28 @@
+package org.zalando.riptide.httpclient;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.MediaType;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+class ContentTypeConverterTest {
+
+    @Test
+    void shouldConvertMediaTypeWithCharset() {
+        var contentType = ContentTypeConverter.toContentType(new MediaType(MediaType.TEXT_XML, StandardCharsets.UTF_8));
+        assertThat(contentType.getCharset(), is(StandardCharsets.UTF_8));
+        assertThat(contentType.getMimeType(), is("text/xml"));
+    }
+
+    @Test
+    void shouldConvertMediaTypeWithoutCharset() {
+        var contentType = ContentTypeConverter.toContentType(MediaType.TEXT_XML);
+        assertThat(contentType.getCharset(), is(nullValue()));
+        assertThat(contentType.getMimeType(), is("text/xml"));
+    }
+
+}