Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- fixes a bug where multiple allOf entries type would not get merged if they were part of a discriminator #4381

Merged
merged 17 commits into from
May 14, 2024
Merged

- fixes a bug where multiple allOf entries type would not get merged if they were part of a discriminator #4381

merged 17 commits into from
May 14, 2024

Conversation

baywet
Copy link
Member

@baywet baywet commented Mar 21, 2024 •
edited by andrueastman
Loading

fixes #4325
fixes #4346
fixes #4074
fixes #4428

@baywet baywet self-assigned this Mar 21, 2024
This was referenced Mar 21, 2024
Closed
Closed
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Mar 21, 2024

Quality Gate Passed Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
80.2% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@andrueastman andrueastman mentioned this pull request Apr 5, 2024
Closed
@baywet baywet force-pushed the feature/intersection-types branch 3 times, most recently from 98cf129 to 127d16d Compare May 7, 2024 17:28
@baywet baywet mentioned this pull request May 7, 2024
Closed
@baywet baywet force-pushed the feature/intersection-types branch from 6a545fd to 4426166 Compare May 10, 2024 14:39
@baywet baywet marked this pull request as ready for review May 10, 2024 17:29
@baywet baywet requested a review from a team as a code owner May 10, 2024 17:29
@baywet baywet marked this pull request as draft May 10, 2024 18:11
@baywet
Copy link
Member Author

baywet commented May 10, 2024

smoke generation reveals a new problem with inheritance https://microsoftgraph.visualstudio.com/Graph%20Developer%20Experiences/_build/results?buildId=148044&view=logs&j=0c914960-8b50-5299-c9aa-dd3c9595168e&t=3b0ef9b7-0b0d-5874-6c1c-de7c5a8ae365

bisect would indicate the problem was introduced with 6c2be72

More investigation required

baywet added 14 commits May 13, 2024 15:01
@baywet
- fixes a bug where multiple allOf entries type would not get merged …
eb2a353 
…if they were part of a discriminator
@baywet
- fixes a bug where allOf structure with one entry and properties wou…
ce1cec9 
…ld not be considered as inheritance case

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- fixes formatting
596073b 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- moves changelog entry to the right level
3d164a4 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- fixes inheritance trimming
c1e20a9 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- fixes inheritance from intersection type
bd7e3ea 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- fixes #4074 a bug where allof would miss properties without object …
860abd8 
…type

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- fixes support for nested intersection types
e479bb9
@baywet
- code linting
5df039a 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- fixes wrong inheritance warnings for non-inherited models
f24a8cf 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- avoids multiple enumerations
5a8a187 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- code linting
13b2d7d 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- code linting
c63434d 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet
- refactors inheritance routing logic
0e39159 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet baywet force-pushed the feature/intersection-types branch from e0a7f92 to 0e39159 Compare May 13, 2024 19:02
@baywet
- code linting
f2b0fa3 
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
@baywet baywet marked this pull request as ready for review May 13, 2024 19:14
@baywet
Copy link
Member Author

baywet commented May 13, 2024

Test generation running at, https://microsoftgraph.visualstudio.com/Graph%20Developer%20Experiences/_build/results?buildId=148369&view=results
But local runs demonstrate the impact on inheritance has been fixed with the latest changes
image

@baywet baywet mentioned this pull request May 13, 2024
Closed
@andrueastman
Copy link
Member

andrueastman commented May 14, 2024 •
edited
Loading

This also looks to be fixing #4428 (updated the description)

andrueastman
andrueastman reviewed May 14, 2024
View reviewed changes
src/Kiota.Builder/KiotaBuilder.cs Outdated Show resolved Hide resolved
src/Kiota.Builder/KiotaBuilder.cs Outdated Show resolved Hide resolved
src/Kiota.Builder/KiotaBuilder.cs Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
@baywet @andrueastman
Apply suggestions from code review
75d86bb 
Co-authored-by: Andrew Omondi <andrueastman@users.noreply.github.com>
@baywet baywet requested a review from andrueastman May 14, 2024 12:11
@baywet
Copy link
Member Author

baywet commented May 14, 2024

Last smoke test confirms no impact to inheritance microsoftgraph/msgraph-sdk-dotnet#2484

@baywet baywet enabled auto-merge May 14, 2024 13:00
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented May 14, 2024

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
90.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

auto-merge was automatically disabled May 14, 2024 16:16

Pull Request is not mergeable

@andrueastman andrueastman merged commit f54bbda into main May 14, 2024
207 checks passed
@andrueastman andrueastman deleted the feature/intersection-types branch May 14, 2024 16:17
This was referenced May 17, 2024
Closed
Open
Open
Open
Closed
Open
Closed
@baywet baywet linked an issue May 17, 2024 that may be closed by this pull request
Multiple identical classes are generated for a component schema with allOf inheritance #4191
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrueastman andrueastman andrueastman approved these changes

Assignees

@baywet baywet

Labels
None yet
Projects
Kiota
Archived in project
Milestone
No milestone
2 participants
@baywet @andrueastman