Fix nested types nullable context check #3043
Merged
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
src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/MemberInfoExtensions.cs
Outdated
Show resolved
Hide resolved
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## master #3043 +/- ##
==========================================
+ Coverage 90.46% 90.49% +0.02%
==========================================
Files 74 74
Lines 2980 2987 +7
Branches 470 471 +1
==========================================
+ Hits 2696 2703 +7
Misses 284 284
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
patrikwlund
added a commit
to patrikwlund/Swashbuckle.AspNetCore
that referenced
this pull request
Aug 26, 2024
Add-on to domaindrivendev#3043 (should be no conflict) Very similar to my previous PR: domaindrivendev#3041 In his PR, @VladimirTyrin surgically fixes a specific problem for all platforms. I suggest we use the new and fancy NET6+ toys when available, to avoid nullable logic completely in the future. I tested it with the same added test as in @VladimirTyrin's original PR.
|
Great fix! I think we see this in our swagger files as well. I created a sister PR here #3046, that adds some NET6+ specifics on top of this. |
martincostello
approved these changes
Aug 26, 2024
renovate bot
referenced
this pull request
in orso-co/Orso.Arpa.Api
Aug 29, 2024
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [Swashbuckle.AspNetCore](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore) | `6.7.2` -> `6.7.3` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>domaindrivendev/Swashbuckle.AspNetCore (Swashbuckle.AspNetCore)</summary> ### [`v6.7.3`](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/releases/tag/v6.7.3) ##### What's Changed - Fix nested types nullable context check by [@​VladimirTyrin](https://togithub.com/VladimirTyrin) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3043](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3043) - Use NullabilityInfoContext to determine if member is nullable by [@​patrikwlund](https://togithub.com/patrikwlund) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3046](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3046) ##### New Contributors - [@​VladimirTyrin](https://togithub.com/VladimirTyrin) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3043](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3043) **Full Changelog**: domaindrivendev/Swashbuckle.AspNetCore@v6.7.2...v6.7.3 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 10pm every weekday,every weekend,before 5am every weekday" in timezone Europe/Berlin, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/orso-co/Orso.Arpa.Api). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41Ni4wIiwidXBkYXRlZEluVmVyIjoiMzguNTYuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOltdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot
referenced
this pull request
in smartive/cas-fee-adv-mumble-api
Sep 5, 2024
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [Swashbuckle.AspNetCore](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore) | `6.6.2` -> `6.7.3` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [Swashbuckle.AspNetCore.Annotations](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore) | `6.6.2` -> `6.7.3` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>domaindrivendev/Swashbuckle.AspNetCore (Swashbuckle.AspNetCore)</summary> ### [`v6.7.3`](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/releases/tag/v6.7.3) ##### What's Changed - Fix nested types nullable context check by [@​VladimirTyrin](https://togithub.com/VladimirTyrin) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3043](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3043) - Use NullabilityInfoContext to determine if member is nullable by [@​patrikwlund](https://togithub.com/patrikwlund) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3046](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3046) ##### New Contributors - [@​VladimirTyrin](https://togithub.com/VladimirTyrin) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3043](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3043) **Full Changelog**: domaindrivendev/Swashbuckle.AspNetCore@v6.7.2...v6.7.3 ### [`v6.7.2`](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/releases/tag/v6.7.2) #### What's Changed - Use NullabilityInfoContext to determine dictionary value nullability by [@​patrikwlund](https://togithub.com/patrikwlund) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3041](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3041) **Full Changelog**: domaindrivendev/Swashbuckle.AspNetCore@v6.7.1...v6.7.2 ### [`v6.7.1`](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/releases/tag/v6.7.1) #### What's Changed - docs: Update README.md by [@​WeihanLi](https://togithub.com/WeihanLi) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3002](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3002) - Support `[DataMember]` `IsRequired` in `NewtonsoftDataContractResolver` by [@​ouvreboite](https://togithub.com/ouvreboite) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2644](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2644) - Add API analysers by [@​martincostello](https://togithub.com/martincostello) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3003](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3003) - Update README by [@​martincostello](https://togithub.com/martincostello) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3004](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3004) - docs: fix example code formatting by [@​WeihanLi](https://togithub.com/WeihanLi) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3010](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3010) - Fixes nullability problems with dictionaries by [@​ozziepeeps](https://togithub.com/ozziepeeps) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3023](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3023) - Fix handling of nullable structs by [@​martincostello](https://togithub.com/martincostello) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3015](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3015) - Fix missing form parameter XML documentation by [@​martincostello](https://togithub.com/martincostello) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3020](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/3020) #### New Contributors - [@​ouvreboite](https://togithub.com/ouvreboite) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2644](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2644) **Full Changelog**: domaindrivendev/Swashbuckle.AspNetCore@v6.7.0...v6.7.1 ### [`v6.7.0`](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/releases/tag/v6.7.0) #### What's Changed - Allow Swagger UI CSS and JS paths to be configurable by [@​mag1art](https://togithub.com/mag1art) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2908](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2908) - Add `IncludeXmlCommentsForAssembly()` convience overload by [@​leotsarev](https://togithub.com/leotsarev) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2909](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2909) - Add snapshot tests using Verify by [@​keahpeters](https://togithub.com/keahpeters) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2929](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2929) - Add posibility to ignore properties in `[FromForm]` with `[SwaggerIgnore]` by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2928](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2928) - Adding check for existing directory and creating if doesn't exist by [@​matt-lethargic](https://togithub.com/matt-lethargic) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2927](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2927) - Default null value on nullable types caused errors by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2941](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2941) - Add additional Verify tests by [@​keahpeters](https://togithub.com/keahpeters) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2950](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2950) - Only apply a SchemaFilter to create the description on SwaggerUI by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2943](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2943) - Add support for async filters by [@​mauve](https://togithub.com/mauve) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2938](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2938) - Fix package validation by [@​martincostello](https://togithub.com/martincostello) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2926](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2926) - Adding support for .NET 8 Model State attributes by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2958](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2958) - Only set Exclusive Range when they are by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2960](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2960) - `[AsParameters]` throwing error on cast when showing the description with `EnableAnnotations()` by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2962](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2962) - Fix `RequestBodyFilterAnnotation` and `MultipleFromForm` for Minimal APIs by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2963](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2963) - Swagger UI refactoring by [@​martincostello](https://togithub.com/martincostello) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2942](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2942) - Add help wanted badge by [@​martincostello](https://togithub.com/martincostello) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2911](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2911) - Move inline css and js to external files for SwaggerUI and ReDoc by [@​junior-santana](https://togithub.com/junior-santana) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2965](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2965) - Missing properties section when generating `IFomFile`/`IFormFileCollection` by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2972](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2972) - Missing Encoding and RequiredProperties when `IFormFile` with OpenAPI by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2979](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2979) - Use `ApiParameter.Type` by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2980](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2980) - Document arrays of generic parameters with XML comments and support overload methods by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2982](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2982) - Take into account \[JsonRequired] for System.Text.Json by [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2988](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2988) - Configure non-nullable types as required by [@​AntiGuideAkquinet](https://togithub.com/AntiGuideAkquinet) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2803](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2803) - Use `HttpMethods.IsGet()` by [@​martincostello](https://togithub.com/martincostello) in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2971](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2971) #### New Contributors - [@​mag1art](https://togithub.com/mag1art) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2908](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2908) - [@​jgarciadelanoceda](https://togithub.com/jgarciadelanoceda) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2928](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2928) - [@​matt-lethargic](https://togithub.com/matt-lethargic) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2927](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2927) - [@​mauve](https://togithub.com/mauve) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2938](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2938) - [@​junior-santana](https://togithub.com/junior-santana) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2965](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2965) - [@​AntiGuideAkquinet](https://togithub.com/AntiGuideAkquinet) made their first contribution in [https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2803](https://togithub.com/domaindrivendev/Swashbuckle.AspNetCore/pull/2803) **Full Changelog**: domaindrivendev/Swashbuckle.AspNetCore@v6.6.2...v6.7.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 9pm,before 6am" in timezone Europe/Zurich, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/smartive/cas-fee-adv-mumble-api). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM4LjU2LjAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 task
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.
Pull Request
The issue or feature being addressed
Fixes #3040
Details on the issue fix or feature implementation
We have to address the case when model type is nested-within-nested. In this case for nullable context analysis we have to traverse the whole declaring type chain
In issue example NullableContextAttribute is on the outer class
Sharplab example: https://sharplab.io/#v2:D4AQTAjAsAUCDMACciDCiDetE+UkALIgLIAUAlJtrgL6x0ywKIBOApgMYD2LAJogC0uXCKSEiAdOLCIAMmwBubADYQANMggAGOYpUQAygBcWASwB2AcwAKLLgAdysLDFx5WnHv2ljhYKcJI8krKYBog2rohYMZmVrYOTq64Lm5uzOzcfIKBpBE6wSrwsRY2do4A3NQ4DDRAA