Added support to add literals directly to the header #2028
Closed
Conversation
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
schaoukicoveo
commented
Apr 27, 2023
| @@ -15,13 +15,10 @@ | |||
|
|
|||
| import static feign.assertj.FeignAssertions.assertThat; | |||
| import static java.util.Arrays.asList; | |||
| import static org.assertj.core.api.Assertions.assertThat; | |||
schaoukicoveo
commented
Apr 27, 2023
Comment on lines
+245
to
+256
| @Test | ||
| public void shouldNotResolveTemplateWithHeaderWithJsonLiteral() { | ||
| String json = "{ \"foo\": \"bar\", \"hello\": \"world\"}"; | ||
| RequestTemplate template = new RequestTemplate().method(HttpMethod.GET) | ||
| .headerLiteral("A-Header", "{aHeader}"); | ||
|
|
||
| template = template.resolve(mapOf("aHeader", json)); | ||
|
|
||
| assertThat(template) | ||
| .hasHeaders(entry("A-Header", Collections.singletonList("{aHeader}"))); | ||
| } | ||
|
|
There was a problem hiding this comment.
Makes sure that if a expression that is added as a literal will not be evaluated as an expression when trying to resolve.
schaoukicoveo
commented
Apr 27, 2023
Comment on lines
+806
to
+820
| /** | ||
| * Validates that both the name and values are valid | ||
| * | ||
| * @param name of the header. | ||
| * @param values for this header. | ||
| * @return an Iterable of strings | ||
| */ | ||
| private Iterable<String> validateHeaderValues(String name, Iterable<String> values) { | ||
| if (name == null || name.isEmpty()) { | ||
| throw new IllegalArgumentException("name is required."); | ||
| } | ||
|
|
||
| return values == null ? Collections.emptyList() : values; | ||
| } | ||
|
|
There was a problem hiding this comment.
Provide a private method that will contain the necessary validation for headers
schaoukicoveo
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added support to add literals directly to the header.
In short, I exposed a public method that will provide a way to add literals directly to the header. Beforehand, a literal would never be evaluated/seen as one up until we try to create the
Templateobject., it would be beneficial to have such a method call as it will prevent extra processing with trying to match a complex regex expression with something that wishes to be processed as literal and not an expression. This will provide a clearer and simpler way for end users to send literals, especially for json strings.Properly fixes #1464