Skip to content

C# oneOf wrappers: preserve payload data when discriminator is absent #7998

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

C# oneOf wrappers: preserve payload data when discriminator is absent #7998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a286f8
Initial plan
Copilot Jul 27, 2026
ad830f4
Fix C# composed wrapper fallback with AdditionalData
Copilot Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Kiota.Builder/Refiners/CSharpRefiner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public override Task RefineAsync(CodeNamespace generatedCode, CancellationToken
SerializationNamespaceName,
"IComposedTypeWrapper"
);
AddAdditionalDataPropertiesToComposedTypeWrappers(generatedCode, _configuration.UsesBackingStore);
cancellationToken.ThrowIfCancellationRequested();
AddDefaultImports(generatedCode, defaultUsingEvaluators);
AddPropertiesAndMethodTypesImports(generatedCode, false, false, false);
Expand Down Expand Up @@ -140,6 +141,14 @@ protected static void MakeEnumPropertiesNullable(CodeElement currentElement)
.ForEach(x => x.Type.IsNullable = true);
CrawlTree(currentElement, MakeEnumPropertiesNullable);
}
private static void AddAdditionalDataPropertiesToComposedTypeWrappers(CodeElement currentElement, bool usesBackingStore)
{
if (currentElement is CodeClass currentClass &&
currentClass.IsOfKind(CodeClassKind.Model) &&
currentClass.OriginalComposedType is not null)
KiotaBuilder.AddSerializationMembers(currentClass, true, usesBackingStore, static s => s);
CrawlTree(currentElement, x => AddAdditionalDataPropertiesToComposedTypeWrappers(x, usesBackingStore));
}
private const string AbstractionsNamespaceName = "Microsoft.Kiota.Abstractions";
private const string SerializationNamespaceName = $"{AbstractionsNamespaceName}.Serialization";
private const string StoreNamespaceName = $"{AbstractionsNamespaceName}.Store";
Expand Down
2 changes: 2 additions & 0 deletions tests/Kiota.Builder.Tests/Refiners/CSharpLanguageRefinerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,9 @@ public async Task ConvertsUnionTypesToWrapperAsync()
var resultingWrapper = root.FindChildByName<CodeClass>("union");
Assert.NotNull(resultingWrapper);
Assert.NotNull(resultingWrapper.OriginalComposedType);
Assert.NotNull(resultingWrapper.GetPropertyOfKind(CodePropertyKind.AdditionalData));
Assert.Contains("IComposedTypeWrapper", resultingWrapper.StartBlock.Implements.Select(static x => x.Name));
Assert.Contains("IAdditionalDataHolder", resultingWrapper.StartBlock.Implements.Select(static x => x.Name));
Assert.Null(resultingWrapper.Methods.SingleOrDefault(static x => x.IsOfKind(CodeMethodKind.ComposedTypeMarker)));
}
[Fact]
Expand Down
Loading