make value type a ref

specklesystems · Nov 15, 2024 · b95129f · b95129f
1 parent 1793ab1
commit b95129f
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/Speckle.Sdk/Serialisation/V2/Receive/ObjectDeserializer2.cs b/src/Speckle.Sdk/Serialisation/V2/Receive/ObjectDeserializer2.cs
@@ -33,7 +33,7 @@ public Base Deserialize(string objectJson)
     try
     {
       reader.Read();
-      converted = (Base)ReadObject(reader).NotNull();
+      converted = (Base)ReadObject(ref reader).NotNull();
     }
     catch (Exception ex) when (!ex.IsFatal() && ex is not OperationCanceledException)
     {
@@ -43,13 +43,13 @@ public Base Deserialize(string objectJson)
     return converted;
   }
 
-  private List<object?> ReadArrayAsync(Utf8JsonReader reader)
+  private List<object?> ReadArrayAsync(ref Utf8JsonReader reader)
   {
     reader.Read();
     List<object?> retList = new();
     while (reader.TokenType != JsonTokenType.EndArray)
     {
-      object? convertedValue = ReadProperty(reader);
+      object? convertedValue = ReadProperty(ref reader);
       if (convertedValue is DataChunk chunk)
       {
         retList.AddRange(chunk.data);
@@ -63,7 +63,7 @@ public Base Deserialize(string objectJson)
     return retList;
   }
 
-  private object? ReadObject(Utf8JsonReader reader)
+  private object? ReadObject(ref Utf8JsonReader reader)
   {
     reader.Read();
     Dictionary<string, object?> dict = Pools.ObjectDictionaries.Get();
@@ -75,13 +75,15 @@ public Base Deserialize(string objectJson)
           {
             var propName = reader.GetString().NotNull();
             reader.Read(); //goes prop value
-            object? convertedValue = ReadProperty(reader);
+            object? convertedValue = ReadProperty(ref reader);
             dict[propName] = convertedValue;
             reader.Read(); //goes to next
           }
           break;
         default:
-          throw new InvalidOperationException($"Unknown {reader.TokenType} with {reader.GetString()}");
+          throw new InvalidOperationException(
+            $"Unknown {reader.TokenType} with {Encoding.UTF8.GetString(reader.ValueSpan)}"
+          );
       }
     }
 
@@ -111,7 +113,7 @@ public Base Deserialize(string objectJson)
     return b;
   }
 
-  private object? ReadProperty(Utf8JsonReader reader)
+  private object? ReadProperty(ref Utf8JsonReader reader)
   {
     switch (reader.TokenType)
     {
@@ -144,9 +146,9 @@ public Base Deserialize(string objectJson)
         }
         return reader.GetString();
       case JsonTokenType.StartArray:
-        return ReadArrayAsync(reader);
+        return ReadArrayAsync(ref reader);
       case JsonTokenType.StartObject:
-        var dict = ReadObject(reader);
+        var dict = ReadObject(ref reader);
         return dict;
 
       default: