Support all primitive types

Author: Havret

src/System.Text.Json.Protobuf/ProtobufConverter.cs

@@ -21,7 +21,7 @@ public ProtobufConverter()
             {
                 Accessor = fieldDescriptor.Accessor,
                 IsRepeated = fieldDescriptor.IsRepeated,
-                FieldType = GetFieldType(fieldDescriptor),
+                FieldType = GetFieldType(fieldDescriptor.FieldType),
                 JsonName = fieldDescriptor.JsonName,
             };
             _fieldsLookup.Add(fieldDescriptor.JsonName, fieldInfo);
@@ -90,16 +90,34 @@ public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOption
         writer.WriteEndObject();
     }
 
-    private Type GetFieldType(FieldDescriptor fieldDescriptor)
+    private Type GetFieldType(FieldType fieldType)
     {
-        switch (fieldDescriptor.FieldType)
+        switch (fieldType)
         {
+            case FieldType.Double:
+                return typeof(double);
+            case FieldType.Float:
+                return typeof(float);
             case FieldType.Int32:
+            case FieldType.SInt32:
+            case FieldType.SFixed32:
                 return typeof(int);
             case FieldType.Int64:
+            case FieldType.SInt64:
+            case FieldType.SFixed64:
                 return typeof(long);
+            case FieldType.UInt32:
+            case FieldType.Fixed32:
+                return typeof(uint);
+            case FieldType.UInt64:
+            case FieldType.Fixed64:
+                return typeof(ulong);
+            case FieldType.Bool:
+                return typeof(bool);
+            case FieldType.String:
+                return typeof(string);
             default:
-                throw new ArgumentOutOfRangeException();
+                throw new ArgumentOutOfRangeException(nameof(fieldType), $"FieldType: '{fieldType}' is not supported.");
         }
     }
 }

test/System.Text.Json.Protobuf.Tests/Protos/simple_message.proto

@@ -3,7 +3,34 @@ syntax = "proto3";
 option csharp_namespace = "System.Text.Json.Protobuf.Tests";
 
 message SimpleMessage {
-  int32 int_32_property = 1;
+  double double_property = 1;
+
+  float float_property = 2;
+
+  int32 int_32_property = 3;
+
+  int64 int_64_property = 4;
+
+  uint32 uint_32_property = 5;
+
+  uint32 uint_64_property = 6;
+
+  sint32 sint_32_property = 7;
+
+  sint64 sint_64_property = 8;
+
+  fixed32 fixed_32_property = 9;
+
+  fixed64 fixed_64_property = 10;
+
+  sfixed32 sfixed_32_property = 11;
+  
+  sfixed64 sfixed_64_property = 12;
+  
+  bool bool_property = 13;
+  
+  string string_property = 14;
 
-  int64 int_64_property = 2;
+  // TODO: Support bytes property
+  // bytes bytes_property = 15;
 }

test/System.Text.Json.Protobuf.Tests/SimpleMessageTests.Should_serialize_message_with_primitive_types.approved.json

@@ -1,4 +1,16 @@
 {
+  "doubleProperty": 2.5,
+  "floatProperty": 3.5,
   "int32Property": 1,
-  "int64Property": 2
+  "int64Property": 2,
+  "uint32Property": 3,
+  "uint64Property": 4,
+  "sint32Property": 5,
+  "sint64Property": 6,
+  "fixed32Property": 7,
+  "fixed64Property": 8,
+  "sfixed32Property": 9,
+  "sfixed64Property": 10,
+  "boolProperty": true,
+  "stringProperty": "hello"
 }

test/System.Text.Json.Protobuf.Tests/SimpleMessageTests.cs

@@ -13,8 +13,22 @@ public void Should_serialize_message_with_primitive_types()
         // Arrange
         var msg = new SimpleMessage
         {
+            DoubleProperty = 2.5d,
+            FloatProperty = 3.5f,
             Int32Property = 1,
             Int64Property = 2,
+            Uint32Property = 3,
+            Uint64Property = 4,
+            Sint32Property = 5,
+            Sint64Property = 6,
+            Fixed32Property = 7,
+            Fixed64Property = 8,
+            Sfixed32Property = 9,
+            Sfixed64Property = 10,
+            BoolProperty = true,
+            StringProperty = "hello"
+            // TODO: Support bytes property
+            // BytesProperty = ByteString.CopyFromUtf8("abc")
         };
         var jsonSerializerOptions = TestHelper.CreateJsonSerializerOptions();
 
@@ -32,8 +46,22 @@ public void Should_deserialize_message_with_primitive_types()
         // Arrange
         var msg = new SimpleMessage
         {
+            DoubleProperty = 2.5d,
+            FloatProperty = 3.5f,
             Int32Property = 1,
             Int64Property = 2,
+            Uint32Property = 3,
+            Uint64Property = 4,
+            Sint32Property = 5,
+            Sint64Property = 6,
+            Fixed32Property = 7,
+            Fixed64Property = 8,
+            Sfixed32Property = 9,
+            Sfixed64Property = 10,
+            BoolProperty = true,
+            StringProperty = "hello"
+            // TODO: Support bytes property
+            // BytesProperty = ByteString.CopyFromUtf8("abc")
         };
         var jsonSerializerOptions = TestHelper.CreateJsonSerializerOptions();