-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use default encoder when body type is text/plain
- Loading branch information
1 parent
b5e33b6
commit fc1ff16
Showing
3 changed files
with
137 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright 2016 Palantir Technologies, Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package feign; | ||
|
|
||
| import com.google.common.collect.ImmutableSet; | ||
| import com.google.common.collect.Iterables; | ||
| import com.google.common.net.HttpHeaders; | ||
| import feign.codec.EncodeException; | ||
| import feign.codec.Encoder; | ||
| import java.lang.reflect.Type; | ||
| import java.util.Collection; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| /** | ||
| * Delegates to a {@link Encoder.Default} if the response has a Content-Type of text/plain, or falls back to the given | ||
| * delegate otherwise. | ||
| */ | ||
| public final class TextDelegateEncoder implements Encoder { | ||
| private static final Encoder defaultEncoder = new Encoder.Default(); | ||
|
|
||
| private final Encoder delegate; | ||
|
|
||
| public TextDelegateEncoder(Encoder delegate) { | ||
| this.delegate = delegate; | ||
| } | ||
|
|
||
| @Override | ||
| public void encode(Object object, Type bodyType, RequestTemplate template) throws EncodeException { | ||
| Collection<String> contentTypes = template.headers().get(HttpHeaders.CONTENT_TYPE); | ||
| if (contentTypes == null) { | ||
| contentTypes = ImmutableSet.of(); | ||
| } | ||
|
|
||
| // In the case of multiple content types, or an unknown content type, we'll use the delegate instead. | ||
| if (contentTypes.size() == 1 && Iterables.getOnlyElement(contentTypes, "").equals(MediaType.TEXT_PLAIN)) { | ||
| defaultEncoder.encode(object, bodyType, template); | ||
| } else { | ||
| delegate.encode(object, bodyType, template); | ||
| } | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
http-clients/src/test/java/com/palantir/remoting/http/TextEncoderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright 2016 Palantir Technologies, Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.remoting.http; | ||
|
|
||
| import static org.hamcrest.Matchers.is; | ||
| import static org.junit.Assert.assertThat; | ||
|
|
||
| import com.google.common.base.Optional; | ||
| import com.squareup.okhttp.mockwebserver.MockResponse; | ||
| import com.squareup.okhttp.mockwebserver.MockWebServer; | ||
| import com.squareup.okhttp.mockwebserver.RecordedRequest; | ||
| import javax.net.ssl.SSLSocketFactory; | ||
| import javax.ws.rs.Consumes; | ||
| import javax.ws.rs.POST; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.core.MediaType; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
|
|
||
| public final class TextEncoderTest { | ||
|
|
||
| @Rule | ||
| public final MockWebServer server = new MockWebServer(); | ||
|
|
||
| private TextEncoderService service; | ||
|
|
||
| @Before | ||
| public void before() { | ||
| String endpointUri = "http://localhost:" + server.getPort(); | ||
|
|
||
| service = FeignClients.standard().createProxy( | ||
| Optional.<SSLSocketFactory>absent(), | ||
| endpointUri, | ||
| TextEncoderService.class); | ||
|
|
||
| server.enqueue(new MockResponse().setBody("{}")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testTextEncoder_doesNotEscapeAsJson() throws InterruptedException { | ||
| String testString = "{\"key\": \"value\"}"; | ||
| service.post(testString); | ||
|
|
||
| RecordedRequest request = server.takeRequest(); | ||
| assertThat(request.getBody().readUtf8(), is(testString)); | ||
| } | ||
|
|
||
| @Path("/") | ||
| public interface TextEncoderService { | ||
| @POST | ||
| @Consumes(MediaType.TEXT_PLAIN) | ||
| Object post(String test); | ||
| } | ||
|
|
||
| } |