Skip to content

Support request content-type with charset #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codefromthecrypt merged 4 commits into from
Sep 8, 2016
Merged

Support request content-type with charset #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e66d0bb
Support request content-type with charset
Sep 2, 2016
e4cd7a3
Support request content-type with charset. Improve unit test
Sep 5, 2016
855d974
Support request content-type with charset. Avoid catching
Sep 7, 2016
f8da3a7
Support request content-type with charset. Request charset should not…
Sep 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions core/src/test/java/feign/client/AbstractClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import feign.Param;
import feign.RequestLine;
import feign.Response;
import feign.Util;
import feign.assertj.MockWebServerAssertions;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
Expand Down Expand Up @@ -218,6 +219,30 @@ public void testResponseLength() throws Exception {
assertEquals(expected, actual);
}

@Test
public void testContentTypeWithCharset() throws Exception {
server.enqueue(new MockResponse()
.setBody("AAAAAAAA"));
TestInterface api = newBuilder()
.target(TestInterface.class, "http://localhost:" + server.getPort());

Response response = api.postWithContentType("foo", "text/plain;charset=utf-8");
// Response length should not be null
assertEquals("AAAAAAAA", Util.toString(response.body().asReader()));
}

@Test
public void testContentTypeWithoutCharset() throws Exception {
server.enqueue(new MockResponse()
.setBody("AAAAAAAA"));
TestInterface api = newBuilder()
.target(TestInterface.class, "http://localhost:" + server.getPort());

Response response = api.postWithContentType("foo", "text/plain");
// Response length should not be null
assertEquals("AAAAAAAA", Util.toString(response.body().asReader()));
}

public interface TestInterface {

@RequestLine("POST /?foo=bar&foo=baz&qux=")
Expand All @@ -241,6 +266,10 @@ public interface TestInterface {

@RequestLine("PUT")
String noPutBody();

@RequestLine("POST /?foo=bar&foo=baz&qux=")
@Headers({"Foo: Bar", "Foo: Baz", "Qux: ", "Content-Type: {contentType}"})
Response postWithContentType(String body, @Param("contentType") String contentType);
}

}
12 changes: 6 additions & 6 deletions httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@ HttpUriRequest toHttpUriRequest(Request request, Request.Options options) throws
private ContentType getContentType(Request request) {
ContentType contentType = ContentType.DEFAULT_TEXT;
for (Map.Entry<String, Collection<String>> entry : request.headers().entrySet())
if (entry.getKey().equalsIgnoreCase("Content-Type")) {
Collection values = entry.getValue();
if (values != null && !values.isEmpty()) {
contentType = ContentType.create(entry.getValue().iterator().next(), request.charset());
break;
if (entry.getKey().equalsIgnoreCase("Content-Type")) {
Collection<String> values = entry.getValue();
if (values != null && !values.isEmpty()) {
contentType = ContentType.parse(values.iterator().next());
break;
}
}
}
return contentType;
}

Expand Down