Merge method-level and class-level @ApiResponses annotations. #1474
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
| @@ -52,8 +53,16 @@ private Annotations() { | |||
| return fromNullable(findAnnotation(annotated, ApiOperation.class)); | |||
| } | |||
|
|
|||
| public static Optional<ApiResponses> findApiResponsesAnnotations(Method annotated) { | |||
| return fromNullable(findAnnotation(annotated, ApiResponses.class)); | |||
| public static List<Optional<ApiResponses>> findApiResponsesAnnotations(AnnotatedElement annotated) { | |||
There was a problem hiding this comment.
List is monadic in itself, so just a returning a list of ApiResponses would suffice. i.e. don't add it to the list of the getAnnotation method returns a null. makes sense?
It'll make consumption in downstream processes easier, for e.g. we won't need a if (apiResponses.isPresent()) {...} block.
|
👍 looks good except for a minor nit! thanks for the PR! Super appreciated! |
…a list of optional type
|
Okay I've updated the PR to get rid of the |
|
Thanks it looks great! Its in!! 🙇 |
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.
What's this PR do/fix?
Merges
@ApiResponsesannotations from method-level and type-level (at least, when annotated in the same class). Method-level annotations take priority over type-level annotations.Are there unit tests? If not how should this be manually tested?
I have updated
AnnotationsSpecto verify the behavior when the annotations are defined in the same class. I have not tested subclassing behavior. I have also manually tested against the example project I created for #1465 (https://github.com/sworisbreathing/springfox-issues)Any background context you want to provide?
See #1465.
What are the relevant issues?
#1465