Fix unexpected merging of media types #3026
Open
Conversation
This file contains hidden or 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
…y media type that is defined on the class level
| @@ -478,7 +497,7 @@ public void setWithResponseBodySchemaDoc(boolean withResponseBodySchemaDoc) { | |||
| public void calculateHeadersForClass(Class<?> declaringClass) { | |||
| RequestMapping reqMappingClass = AnnotatedElementUtils.findMergedAnnotation(declaringClass, RequestMapping.class); | |||
| if (reqMappingClass != null) { | |||
| fillMethods(reqMappingClass.produces(), reqMappingClass.consumes(), reqMappingClass.headers()); | |||
| setHeaders(reqMappingClass.headers()); | |||
There was a problem hiding this comment.
The fillMethods triggered a media type recalculation that made the types become incorrectly assigned as the class media types. Given the name of the method, I removed the call to fillMethods and instead simply invoked setHeaders which is invoked lastly in the fillMethods method.
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.
Fixes #3023
A minimal suggested fix. Given the description provided in the issue, I do not see how
mergeArraysshould ever be involved with any media type processing, but due to the lack of descriptive testing together with values been set upon class instantiation and then later changed with a method invocation, I am hesitant to do too much of a change.Feel free to use and contribute with the unit tests in this PR if you implement a change, since they add a lot of information with regard to what is an implicit/explicit behavior.