Skip to content
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
5 changes: 4 additions & 1 deletion src/Protobuf.System.Text.Json/ProtobufConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@ public ProtobufConverter(JsonSerializerOptions jsonSerializerOptions, JsonProtob

_fields = messageDescriptor.Fields.InDeclarationOrder().Select(fieldDescriptor =>
{
var enumType = jsonProtobufSerializerOptions.UseStringProtoEnumValueNames && fieldDescriptor.FieldType == FieldType.Enum
? fieldDescriptor.EnumType
: null;
var fieldInfo = new FieldInfo
{
Accessor = fieldDescriptor.Accessor,
IsRepeated = fieldDescriptor.IsRepeated,
EnumType = jsonProtobufSerializerOptions.UseStringProtoEnumValueNames ? fieldDescriptor.EnumType : null,
EnumType = enumType,
IsMap = fieldDescriptor.IsMap,
FieldType = FieldTypeResolver.ResolverFieldType(fieldDescriptor, propertyTypeLookup),
JsonName = convertNameFunc(fieldDescriptor),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"enumField": 99
"enumField": 99,
"regularField": 0
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"enumField": "FIRST_OPTION"
"enumField": "FIRST_OPTION",
"regularField": 0
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"enumField": 1
"enumField": 1,
"regularField": 0
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ option csharp_namespace = "System.Text.Json.Protobuf.Tests";

message MessageWithEnum {
TestEnum enum_field = 1;
int32 regular_field = 2;
}

enum TestEnum {
Expand Down