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.

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

Add serializer support for required members #8595

Merged
merged 1 commit into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions src/Orleans.CodeGenerator/Model/SerializableTypeDescription.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,21 @@ public bool IsEmptyConstructable
return true;
}

// Types which have required members are not empty constructable for Orleans, at least not yet.
var t = Type;
while (t != null)
{
foreach (var member in t.GetMembers())
{
if (member is IPropertySymbol { IsRequired: true } or IFieldSymbol { IsRequired: true })
{
return false;
}
}

t = t.BaseType;
}

foreach (var ctor in Type.Constructors)
{
if (ctor.Parameters.Length != 0)
Expand Down
2 changes: 1 addition & 1 deletion src/Orleans.Runtime/Catalog/GrainTypeSharedContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private TimeSpan GetCollectionAgeLimit(GrainType grainType, Type grainClass, Gra
}
}

if (collectionOptions.ClassSpecificCollectionAge.TryGetValue(grainClass.FullName, out var specified))
if (collectionOptions.ClassSpecificCollectionAge.TryGetValue(grainClass.FullName!, out var specified))
{
return specified;
}
Expand Down
28 changes: 28 additions & 0 deletions test/Orleans.Serialization.UnitTests/GeneratedSerializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,34 @@ public void GeneratedRecordWithPCtorSerializersRoundTripThroughCodec()
Assert.Equal(original.StarSign, result.StarSign);
}

#if NET6_0_OR_GREATER
[Fact]
public void RequiredMembersAreSupported()
{
var original = new ClassWithRequiredMembers
{
IntProperty = 1,
StringField = "foo",
};

var result = RoundTripThroughCodec(original);

Assert.Equal(original.IntProperty, result.IntProperty);
Assert.Equal(original.StringField, result.StringField);

var subOriginal = new SubClassWithRequiredMembersInBase
{
IntProperty = 1,
StringField = "foo",
};

var subResult = RoundTripThroughCodec(subOriginal);

Assert.Equal(subOriginal.IntProperty, subResult.IntProperty);
Assert.Equal(subOriginal.StringField, subResult.StringField);
}
#endif

[Fact]
public void GeneratedRecordWithExcludedPCtorSerializersRoundTripThroughCodec()
{
Expand Down
17 changes: 17 additions & 0 deletions test/Orleans.Serialization.UnitTests/Models.cs
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,23 @@ public class SerializableClassWithCompiledBase : List<int>
public int IntProperty { get; set; }
}

#if NET6_0_OR_GREATER
[GenerateSerializer]
public class ClassWithRequiredMembers
{
[Id(0)]
public required int IntProperty { get; set; }

[Id(1)]
public required string StringField;
}

[GenerateSerializer]
public class SubClassWithRequiredMembersInBase : ClassWithRequiredMembers
{
}
#endif

[GenerateSerializer]
public sealed class DerivedFromDictionary<TKey, TValue> : Dictionary<TKey, TValue>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace System.Runtime.CompilerServices
namespace System.Runtime.CompilerServices
{
internal static class IsExternalInit {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute { }
}
Loading