Small adjustment to FlexibleObjectJsonConverter.

houseofcat · Apr 14, 2024 · 89508fb · 89508fb
1 parent feb6e66
commit 89508fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/HouseofCat.RabbitMQ/Consumer/Consumer.cs b/src/HouseofCat.RabbitMQ/Consumer/Consumer.cs
@@ -84,7 +84,7 @@ public class Consumer : IConsumer<IReceivedMessage>, IDisposable
             PropertyNameCaseInsensitive = true,
         };
 
-        _defaultOptions.Converters.Add(new FlexibleObjectReaderConverter());
+        _defaultOptions.Converters.Add(new FlexibleObjectJsonConverter());
     }
 
     public async Task StartConsumerAsync()

diff --git a/src/HouseofCat.Utilities/Json/FlexibleObjectConverter.cs b/src/HouseofCat.Utilities/Json/FlexibleObjectConverter.cs
@@ -4,18 +4,18 @@
 
 namespace HouseofCat.Utilities.Json;
 
-public class FlexibleObjectReaderConverter : JsonConverter<object>
+public class FlexibleObjectJsonConverter : JsonConverter<object>
 {
-    public override object Read(ref Utf8JsonReader reader, Type _, JsonSerializerOptions options)
+    public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         return reader.TokenType switch
         {
-            JsonTokenType.StartObject => JsonSerializer.Deserialize<object>(ref reader, options),
-            JsonTokenType.StartArray => JsonSerializer.Deserialize<object>(ref reader, options),
+            JsonTokenType.StartObject => JsonSerializer.Deserialize(ref reader, typeToConvert, options),
+            JsonTokenType.StartArray => JsonSerializer.Deserialize(ref reader, typeToConvert, options),
             JsonTokenType.True => true,
             JsonTokenType.False => false,
             JsonTokenType.Number => reader.TryGetInt64(out long l) ? l : reader.GetDouble(),
-            JsonTokenType.String => reader.TryGetDateTime(out DateTime datetime) ? datetime : reader.GetString(),
+            JsonTokenType.String => reader.GetString(),
             _ => GetObjectFromJsonDocument(ref reader)
         };
     }