Improved DeserializeWithHeaders when the input is null (#247)

masesgroup · Oct 5, 2023 · c555eec · c555eec
1 parent b8324e5
commit c555eec
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/src/net/KNet.Serialization.Avro/AvroSerDes.cs b/src/net/KNet.Serialization.Avro/AvroSerDes.cs
@@ -17,7 +17,6 @@
 */
 
 using Org.Apache.Kafka.Common.Header;
-using static System.Net.WebRequestMethods;
 
 namespace MASES.KNet.Serialization.Avro
 {
@@ -31,14 +30,25 @@ public class AvroSerDes<T> : KNetSerDes<T>
         /// The extension uses <see cref="Headers"/>
         /// </summary>
         public override bool UseHeaders => true;
+        /// <inheritdoc cref="KNetSerDes{T}.Serialize(string, T)"/>
+        public override byte[] Serialize(string topic, T data)
+        {
+            return SerializeWithHeaders(topic, null, data);
+        }
         /// <inheritdoc cref="KNetSerDes{T}.SerializeWithHeaders(string, Headers, T)"/>
         public override byte[] SerializeWithHeaders(string topic, Headers headers, T data)
         {
             throw new System.NotImplementedException();
         }
+        /// <inheritdoc cref="KNetSerDes{T}.Deserialize(string, byte[])"/>
+        public override T Deserialize(string topic, byte[] data)
+        {
+            return DeserializeWithHeaders(topic, null, data);
+        }
         /// <inheritdoc cref="KNetSerDes{T}.DeserializeWithHeaders(string, Headers, byte[])"/>
         public override T DeserializeWithHeaders(string topic, Headers headers, byte[] data)
         {
+            if (data == null) return default;
             throw new System.NotImplementedException();
         }
     }

diff --git a/src/net/KNet.Serialization.Json/JsonSerDes.cs b/src/net/KNet.Serialization.Json/JsonSerDes.cs
@@ -31,6 +31,11 @@ public class JsonSerDes<T> : KNetSerDes<T>
         /// The extension uses <see cref="Headers"/>
         /// </summary>
         public override bool UseHeaders => true;
+        /// <inheritdoc cref="KNetSerDes{T}.Serialize(string, T)"/>
+        public override byte[] Serialize(string topic, T data)
+        {
+            return SerializeWithHeaders(topic, null, data);
+        }
         /// <inheritdoc cref="KNetSerDes{T}.SerializeWithHeaders(string, Headers, T)"/>
         public override byte[] SerializeWithHeaders(string topic, Headers headers, T data)
         {
@@ -42,9 +47,15 @@ public override byte[] SerializeWithHeaders(string topic, Headers headers, T dat
             return Encoding.UTF8.GetBytes(jsonStr);
 #endif
         }
+        /// <inheritdoc cref="KNetSerDes{T}.Deserialize(string, byte[])"/>
+        public override T Deserialize(string topic, byte[] data)
+        {
+            return DeserializeWithHeaders(topic, null, data);
+        }
         /// <inheritdoc cref="KNetSerDes{T}.DeserializeWithHeaders(string, Headers, byte[])"/>
         public override T DeserializeWithHeaders(string topic, Headers headers, byte[] data)
         {
+            if (data == null) return default;
 #if NET462_OR_GREATER
             var jsonStr = Encoding.UTF8.GetString(data);
             return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(jsonStr);

diff --git a/src/net/KNet.Serialization.MessagePack/MessagePackSerDes.cs b/src/net/KNet.Serialization.MessagePack/MessagePackSerDes.cs
@@ -32,14 +32,25 @@ public class MessagePackSerDes<T> : KNetSerDes<T>
         /// The extension uses <see cref="Headers"/>
         /// </summary>
         public override bool UseHeaders => true;
+        /// <inheritdoc cref="KNetSerDes{T}.Serialize(string, T)"/>
+        public override byte[] Serialize(string topic, T data)
+        {
+            return SerializeWithHeaders(topic, null, data);
+        }
         /// <inheritdoc cref="KNetSerDes{T}.SerializeWithHeaders(string, Headers, T)"/>
         public override byte[] SerializeWithHeaders(string topic, Headers headers, T data)
         {
             return MessagePackSerializer.Serialize(data);
         }
+        /// <inheritdoc cref="KNetSerDes{T}.Deserialize(string, byte[])"/>
+        public override T Deserialize(string topic, byte[] data)
+        {
+            return DeserializeWithHeaders(topic, null, data);
+        }
         /// <inheritdoc cref="KNetSerDes{T}.DeserializeWithHeaders(string, Headers, byte[])"/>
         public override T DeserializeWithHeaders(string topic, Headers headers, byte[] data)
         {
+            if (data == null) return default;
             using (MemoryStream stream = new MemoryStream(data))
             {
                 return MessagePackSerializer.Deserialize<T>(stream);

diff --git a/src/net/KNet.Serialization.Protobuf/ProtobufSerDes.cs b/src/net/KNet.Serialization.Protobuf/ProtobufSerDes.cs
@@ -34,6 +34,11 @@ public class ProtobufSerDes<T> : KNetSerDes<T>
         /// The extension uses <see cref="Headers"/>
         /// </summary>
         public override bool UseHeaders => true;
+        /// <inheritdoc cref="KNetSerDes{T}.Serialize(string, T)"/>
+        public override byte[] Serialize(string topic, T data)
+        {
+            return SerializeWithHeaders(topic, null, data);
+        }
         /// <inheritdoc cref="KNetSerDes{T}.SerializeWithHeaders(string, Headers, T)"/>
         public override byte[] SerializeWithHeaders(string topic, Headers headers, T data)
         {
@@ -43,9 +48,15 @@ public override byte[] SerializeWithHeaders(string topic, Headers headers, T dat
                 return stream.ToArray();
             }
         }
+        /// <inheritdoc cref="KNetSerDes{T}.Deserialize(string, byte[])"/>
+        public override T Deserialize(string topic, byte[] data)
+        {
+            return DeserializeWithHeaders(topic, null, data);
+        }
         /// <inheritdoc cref="KNetSerDes{T}.DeserializeWithHeaders(string, Headers, byte[])"/>
         public override T DeserializeWithHeaders(string topic, Headers headers, byte[] data)
         {
+            if (data == null) return default;
             return _parser.ParseFrom(data);
         }
     }