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 the union deserializer code generation in Go #5618

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Fixes the union deserializer code generation in Go #5618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
319a2cd
fixes union model deserialization
nickfloyd Oct 16, 2024
2ff51c1
adds changelog for the update.
nickfloyd Oct 16, 2024
e5f0bd2
Merge branch 'main' into fix-union-deserializer-go
nickfloyd Oct 16, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Fixed an issue where when generating Go code the deserializer for unions was using `CodeClass` as a filter and not `CodeInterface`. [#4844](https://github.com/microsoft/kiota/issues/4844)
- Fixes mapping of `int16` format to the `integer` type rather than `double` when the type is `integer` or `number` [#5611](https://github.com/microsoft/kiota/issues/5611)

## [1.19.1] - 2024-10-11
Expand Down
2 changes: 1 addition & 1 deletion src/Kiota.Builder/Writers/Go/CodeMethodWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ private static void WriteDeserializerBodyForUnionModel(CodeMethod method, CodeCl
var otherPropGetters = parentClass
.GetPropertiesOfKind(CodePropertyKind.Custom)
.Where(static x => !x.ExistsInBaseType && x.Getter != null)
.Where(static x => x.Type is CodeType propertyType && !propertyType.IsCollection && propertyType.TypeDefinition is CodeClass)
.Where(static x => x.Type is CodeType propertyType && !propertyType.IsCollection && propertyType.TypeDefinition is CodeInterface)
.OrderBy(static x => x, CodePropertyTypeForwardComparer)
.ThenBy(static x => x.Name)
.Select(static x => x.Getter!.Name.ToFirstCharacterUpperCase())
Expand Down
12 changes: 8 additions & 4 deletions tests/Kiota.Builder.Tests/Writers/Go/CodeMethodWriterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,16 +291,20 @@ private void AddSerializationBackingStoreMethods()
}
private CodeClass AddUnionTypeWrapper()
{
var complexType1 = root.AddClass(new CodeClass
var complexType1 = root.AddInterface(new CodeInterface
{
Name = "ComplexType1",
Kind = CodeClassKind.Model,
Kind = CodeInterfaceKind.Model,
OriginalClass = new CodeClass { Name = "ComplexType1", Kind = CodeClassKind.Model }
baywet marked this conversation as resolved.
Show resolved Hide resolved
}).First();
var complexType2 = root.AddClass(new CodeClass

var complexType2 = root.AddInterface(new CodeInterface
{
Name = "ComplexType2",
Kind = CodeClassKind.Model,
Kind = CodeInterfaceKind.Model,
OriginalClass = new CodeClass { Name = "ComplexType2", Kind = CodeClassKind.Model }
}).First();

var unionTypeWrapper = root.AddClass(new CodeClass
{
Name = "UnionTypeWrapper",
Expand Down
Loading