提高JsonContentAttribute的性能

Author: xljiulang

WebApiClientCore/Attributes/ParameterAttributes/JsonContentAttribute.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 using WebApiClientCore.HttpContents;
@@ -36,9 +37,29 @@ public string CharSet
         [UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
         protected override Task SetHttpContentAsync(ApiParameterContext context)
         {
-            var options = context.HttpContext.HttpApiOptions.JsonSerializeOptions;
-            context.HttpContext.RequestMessage.Content = new JsonContent(context.ParameterValue, options, this.encoding);
+            context.HttpContext.RequestMessage.Content = this.CreateContent(context);
             return Task.CompletedTask;
         }
+
+        [RequiresDynamicCode("JSON serialization and deserialization might require types that cannot be statically analyzed and might need runtime code generation. Use System.Text.Json source generation for native AOT applications.")]
+        [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.")]
+#if NET5_0_OR_GREATER
+        private System.Net.Http.Json.JsonContent CreateContent(ApiParameterContext context)
+        {
+            var value = context.ParameterValue;
+            var options = context.HttpContext.HttpApiOptions.JsonSerializeOptions;
+            var valueType = value == null ? context.Parameter.ParameterType : value.GetType();
+            var mediaType = Encoding.UTF8.Equals(this.encoding) ? defaultMediaType : new MediaTypeHeaderValue(JsonContent.MediaType) { CharSet = this.CharSet };
+            return System.Net.Http.Json.JsonContent.Create(value, valueType, mediaType, options);
+        }
+        private static readonly MediaTypeHeaderValue defaultMediaType = new(JsonContent.MediaType);
+#else
+        private JsonContent CreateContent(ApiParameterContext context)
+        {
+            var value = context.ParameterValue;
+            var options = context.HttpContext.HttpApiOptions.JsonSerializeOptions;
+            return new JsonContent(value, options, this.encoding);
+        }
+#endif
     }
 }

WebApiClientCore/HttpContents/BufferContent.cs

@@ -10,7 +10,7 @@
 namespace WebApiClientCore.HttpContents
 {
     /// <summary>
-    /// 表示 utf8 的BufferContent
+    /// 表示缓冲的 Http 内容
     /// </summary>
     public class BufferContent : HttpContent, IBufferWriter<byte>
     {
@@ -20,21 +20,28 @@ public class BufferContent : HttpContent, IBufferWriter<byte>
         private readonly RecyclableBufferWriter<byte> bufferWriter = new();
 
         /// <summary>
-        /// utf8的BufferContent
+        /// 缓冲的 Http 内容
         /// </summary> 
         public BufferContent(string mediaType)
             : this(new MediaTypeHeaderValue(mediaType))
         {
         }
 
         /// <summary>
-        /// utf8的BufferContent
+        /// 缓冲的 Http 内容
         /// </summary> 
         public BufferContent(MediaTypeHeaderValue mediaType)
         {
             this.Headers.ContentType = mediaType;
         }
 
+        /// <summary>
+        /// 缓冲的 Http 内容
+        /// </summary>
+        protected BufferContent()
+        {
+        }
+
         /// <summary>
         /// 设置向前推进实际写入的数据长度
         /// </summary>

WebApiClientCore/HttpContents/JsonContent.cs

@@ -13,7 +13,7 @@ namespace WebApiClientCore.HttpContents
     public class JsonContent : BufferContent
     {
         private const string mediaType = "application/json";
-        private static readonly MediaTypeHeaderValue mediaTypeHeaderValue = new(mediaType);
+        private static readonly MediaTypeHeaderValue defaultMediaType = new(mediaType);
 
         /// <summary>
         /// 获取对应的ContentType
@@ -24,7 +24,7 @@ public class JsonContent : BufferContent
         /// uft8 的 json 内容
         /// </summary> 
         public JsonContent()
-            : base(mediaTypeHeaderValue)
+            : base(defaultMediaType)
         {
         }
 
@@ -49,19 +49,18 @@ public JsonContent(object? value, JsonSerializerOptions? jsonSerializerOptions)
         [RequiresDynamicCode("JSON serialization and deserialization might require types that cannot be statically analyzed and might need runtime code generation. Use System.Text.Json source generation for native AOT applications.")]
         [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.")]
         public JsonContent(object? value, JsonSerializerOptions? jsonSerializerOptions, Encoding? encoding)
-            : base(mediaTypeHeaderValue)
         {
             if (encoding == null || Encoding.UTF8.Equals(encoding))
             {
+                this.Headers.ContentType = defaultMediaType;
                 JsonBufferSerializer.Serialize(this, value, jsonSerializerOptions);
             }
             else
             {
+                this.Headers.ContentType = new MediaTypeHeaderValue(mediaType) { CharSet = encoding.WebName };
                 using var utf8Writer = new RecyclableBufferWriter<byte>();
                 JsonBufferSerializer.Serialize(utf8Writer, value, jsonSerializerOptions);
-
                 Encoding.UTF8.Convert(encoding, utf8Writer.WrittenSpan, this);
-                this.Headers.ContentType = new MediaTypeHeaderValue(mediaType) { CharSet = encoding.WebName };
             }
         }
     }