Remove unnecessary stream; directly use serializetobytes

dapr · Aug 21, 2023 · 4c2cd18 · 4c2cd18
1 parent 2479f5d
commit 4c2cd18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/src/Dapr.Actors/Communication/ActorMessageBodyJsonConverter.cs b/src/Dapr.Actors/Communication/ActorMessageBodyJsonConverter.cs
@@ -36,11 +36,6 @@ public ActorMessageBodyJsonConverter(
             {
                 this.wrapperMessageType = this.wrappedRequestMessageTypes[0];
             }
-
-            // If T is of WrappedMessageBody, then get the 'Value' property.
-            if (typeof(T).IsAssignableFrom(typeof(WrappedMessageBody)))
-            {
-            }
         }
 
         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -77,7 +72,7 @@ public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerial
 
                 // Coerce the type to T; required because WrappedMessageBody inherits from two separate interfaces, which
                 // cannot both be used as generic constraints
-                return (T)((object)wrapper);
+                return (T)(object)wrapper;
             }
 
             return JsonSerializer.Deserialize<T>(ref reader, options);

diff --git a/src/Dapr.Actors/Communication/ActorMessageBodyJsonSerializationProvider.cs b/src/Dapr.Actors/Communication/ActorMessageBodyJsonSerializationProvider.cs
@@ -123,12 +123,7 @@ byte[] IActorRequestMessageBodySerializer.Serialize(IActorRequestMessageBody act
                     return null;
                 }
 
-                using var stream = new MemoryStream();
-                using var writer = new Utf8JsonWriter(stream);
-                JsonSerializer.Serialize<object>(writer, actorRequestMessageBody, this.serializerOptions);
-                writer.Flush();
-
-                return stream.ToArray();
+                return JsonSerializer.SerializeToUtf8Bytes<object>(actorRequestMessageBody, this.serializerOptions);
             }
 
             async ValueTask<IActorRequestMessageBody> IActorRequestMessageBodySerializer.DeserializeAsync(Stream stream)
@@ -154,12 +149,7 @@ byte[] IActorResponseMessageBodySerializer.Serialize(IActorResponseMessageBody a
                     return null;
                 }
 
-                using var stream = new MemoryStream();
-                using var writer = new Utf8JsonWriter(stream);
-                JsonSerializer.Serialize<object>(writer, actorResponseMessageBody, this.serializerOptions);
-                writer.Flush();
-
-                return stream.ToArray();
+                return JsonSerializer.SerializeToUtf8Bytes<object>(actorResponseMessageBody, this.serializerOptions);
             }
 
             async ValueTask<IActorResponseMessageBody> IActorResponseMessageBodySerializer.DeserializeAsync(Stream messageBody)