fix: regression that limited discriminator mapping lookup#7507
Draft
MIchaelMainer wants to merge 3 commits intomainfrom
Draft
fix: regression that limited discriminator mapping lookup#7507MIchaelMainer wants to merge 3 commits intomainfrom
MIchaelMainer wants to merge 3 commits intomainfrom
Conversation
Adds a test verifying that the Value property on a delta response is typed as the concrete Application class, not the base DirectoryObject. This guards against regressions where the value items type could be resolved to an ancestor class instead of the declared schema type. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
4 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Root Cause
GetDiscriminatorMappings in OpenApiSchemaExtensions.cs, when lookupKeyInParentMapping = true (set for oneOf/anyOf members), only looked one level up in the allOf chain for a discriminator mapping:
For a 3-level hierarchy like application → directoryObject (no discriminator) → entity (has discriminator):
It looked at directoryObject → no discriminator → returned null
Fell back to GetAllInheritanceSchemaReferences, returning "microsoft.graph.application" (plain schema name, without
#)
The factory key "microsoft.graph.application" never matched the actual OData @odata.type value
"#microsoft.graph.application" → factory fell back to DirectoryObject
validate with a generation run for all languages
run with 1.30, latest main, and fix branch
Fix
Added FindAncestorSchemaWithDiscriminatorMapping() which recursively traverses the entire allOf ancestry chain to find
the first ancestor with a discriminator mapping. The lookupKeyInParentMapping block now uses this instead of the
single-level lookup, so entity's discriminator (with the correct "#microsoft.graph.application" key) is found even
when directoryObject sits between application and entity.