增加IChunkedable接口

xljiulang · xljiulang · commit 8cb84575db7a · 2024-06-21T09:47:29.000+08:00
diff --git a/WebApiClientCore.Test/Attributes/ParameterAttributes/JsonContentAttributeTest.cs b/WebApiClientCore.Test/Attributes/ParameterAttributes/JsonContentAttributeTest.cs
@@ -13,7 +13,7 @@ namespace WebApiClientCore.Test.Attributes.ParameterAttributes
     public class JsonContentAttributeTest
     {
         [Fact]
-        public async Task BeforeRequestAsyncTest()
+        public async Task Utf16ChunkedTest()
         {
             var apiAction = new DefaultApiActionDescriptor(typeof(IMyApi).GetMethod("PostAsync")!);
             var context = new TestRequestContext(apiAction, new
@@ -25,9 +25,32 @@ public async Task BeforeRequestAsyncTest()
             context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");
             context.HttpContext.RequestMessage.Method = HttpMethod.Post;
 
-            var attr = new JsonContentAttribute() { CharSet = "utf-16" };
+            var attr = new JsonContentAttribute() { CharSet = "utf-16", AllowChunked = true };
             await attr.OnRequestAsync(new ApiParameterContext(context, 0));
+            var body = await context.HttpContext.RequestMessage.Content!.ReadAsUtf8ByteArrayAsync();
 
+            var options = context.HttpContext.HttpApiOptions.JsonSerializeOptions;
+            using var buffer = new RecyclableBufferWriter<byte>();
+            JsonBufferSerializer.Serialize(buffer, context.Arguments[0], options);
+            var target = buffer.WrittenSpan.ToArray();
+            Assert.True(body.SequenceEqual(target));
+        }
+
+        [Fact]
+        public async Task Utf8UnChunkedTest()
+        {
+            var apiAction = new DefaultApiActionDescriptor(typeof(IMyApi).GetMethod("PostAsync")!);
+            var context = new TestRequestContext(apiAction, new
+            {
+                name = "laojiu",
+                birthDay = DateTime.Parse("2010-10-10")
+            });
+
+            context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");
+            context.HttpContext.RequestMessage.Method = HttpMethod.Post;
+
+            var attr = new JsonContentAttribute() { CharSet = "utf-8", AllowChunked = false };
+            await attr.OnRequestAsync(new ApiParameterContext(context, 0));
             var body = await context.HttpContext.RequestMessage.Content!.ReadAsUtf8ByteArrayAsync();
 
             var options = context.HttpContext.HttpApiOptions.JsonSerializeOptions;
diff --git a/WebApiClientCore.Test/HttpContents/JsonContentTest.cs b/WebApiClientCore.Test/HttpContents/JsonContentTest.cs
@@ -0,0 +1,31 @@
+﻿using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using WebApiClientCore.HttpContents;
+using Xunit;
+
+namespace WebApiClientCore.Test.HttpContents
+{
+    public class JsonContentTest
+    {
+        [Fact]
+        public async Task Utf8JsonTest()
+        {
+            var options = new WebApiClientCore.HttpApiOptions();
+            var content = new JsonContent("at我", options.JsonSerializeOptions);
+            Assert.Equal(content.GetEncoding(), Encoding.UTF8);
+            var text = await content.ReadAsStringAsync();
+            Assert.Equal("\"at我\"", text);
+        }
+
+        [Fact]
+        public async Task Utf16JsonTest()
+        {
+            var options = new WebApiClientCore.HttpApiOptions();
+            var content = new JsonContent("at我", options.JsonSerializeOptions, Encoding.Unicode);
+            Assert.Equal(content.GetEncoding(), Encoding.Unicode);
+            var text = await content.ReadAsStringAsync();
+            Assert.Equal("\"at我\"", text);
+        }
+    }
+}
diff --git a/WebApiClientCore/Attributes/ParameterAttributes/JsonContentAttribute.cs b/WebApiClientCore/Attributes/ParameterAttributes/JsonContentAttribute.cs
@@ -11,14 +11,20 @@ namespace WebApiClientCore.Attributes
     /// 使用JsonSerializer序列化参数值得到的 json 文本作为 application/json 请求
     /// 每个Api只能注明于其中的一个参数
     /// </summary>
-    public class JsonContentAttribute : HttpContentAttribute, ICharSetable
+    public class JsonContentAttribute : HttpContentAttribute, ICharSetable, IChunkedable
     {
         private const string jsonMediaType = "application/json";
         private static readonly MediaTypeHeaderValue defaultMediaType = new(jsonMediaType);
 
         private MediaTypeHeaderValue mediaType = defaultMediaType;
         private Encoding encoding = Encoding.UTF8;
 
+        /// <summary>
+        /// 获取或设置是否允许 chunked 传输
+        /// 默认为 true
+        /// </summary>
+        public bool AllowChunked { get; set; } = true;
+
         /// <summary>
         /// 获取或设置编码名称
         /// </summary>
@@ -43,9 +49,17 @@ public string CharSet
         protected override Task SetHttpContentAsync(ApiParameterContext context)
         {
             var value = context.ParameterValue;
-            var valueType = value == null ? context.Parameter.ParameterType : value.GetType();
             var options = context.HttpContext.HttpApiOptions.JsonSerializeOptions;
-            context.HttpContext.RequestMessage.Content = JsonContent.Create(value, valueType, this.mediaType, options);
+
+            if (this.AllowChunked)
+            {
+                var valueType = value == null ? context.Parameter.ParameterType : value.GetType();
+                context.HttpContext.RequestMessage.Content = JsonContent.Create(value, valueType, this.mediaType, options);
+            }
+            else
+            {
+                context.HttpContext.RequestMessage.Content = new HttpContents.JsonContent(value, options, this.encoding);
+            }
             return Task.CompletedTask;
         }
     }
diff --git a/WebApiClientCore/HttpContents/JsonContent.cs b/WebApiClientCore/HttpContents/JsonContent.cs
@@ -58,13 +58,17 @@ public JsonContent(object? value, JsonSerializerOptions? jsonSerializerOptions,
             else
             {
                 this.Headers.ContentType = new MediaTypeHeaderValue(mediaType) { CharSet = encoding.WebName };
+                this.ConvertEncoding(encoding);
+            }
+        }
 
-                var utf8Json = this.WrittenSegment;
-                var encodingBuffer = Encoding.Convert(Encoding.UTF8, encoding, utf8Json.Array!, utf8Json.Offset, utf8Json.Count);
+        private void ConvertEncoding(Encoding encoding)
+        {
+            var utf8Json = this.WrittenSegment;
+            var encodingBuffer = Encoding.Convert(Encoding.UTF8, encoding, utf8Json.Array!, utf8Json.Offset, utf8Json.Count);
 
-                this.Clear();
-                this.Write(encodingBuffer);
-            }
+            this.Clear();
+            this.Write(encodingBuffer);
         }
     }
 }
diff --git a/WebApiClientCore/HttpContents/XmlContent.cs b/WebApiClientCore/HttpContents/XmlContent.cs
@@ -26,7 +26,9 @@ public class XmlContent : BufferContent
         public XmlContent(string? xml, Encoding encoding)
         {
             encoding.GetBytes(xml, this);
-            this.Headers.ContentType = encoding == Encoding.UTF8 ? defaultMediaType : new MediaTypeHeaderValue(MediaType) { CharSet = encoding.WebName };
+            this.Headers.ContentType = encoding == Encoding.UTF8
+                ? defaultMediaType :
+                new MediaTypeHeaderValue(MediaType) { CharSet = encoding.WebName };
         }
 
         /// <summary>
@@ -38,8 +40,9 @@ public XmlContent(string? xml, Encoding encoding)
         public XmlContent(object? obj, XmlWriterSettings xmlWriterSettings)
         {
             XmlSerializer.Serialize(this, obj, xmlWriterSettings);
-            var encoding = xmlWriterSettings.Encoding;
-            this.Headers.ContentType = encoding == Encoding.UTF8 ? defaultMediaType : new MediaTypeHeaderValue(MediaType) { CharSet = encoding.WebName };
+            this.Headers.ContentType = xmlWriterSettings.Encoding == Encoding.UTF8
+                ? defaultMediaType
+                : new MediaTypeHeaderValue(MediaType) { CharSet = xmlWriterSettings.Encoding.WebName };
         }
     }
 }
diff --git a/WebApiClientCore/IChunkedable.cs b/WebApiClientCore/IChunkedable.cs
@@ -0,0 +1,13 @@
+﻿namespace WebApiClientCore
+{
+    /// <summary>
+    /// 是否允许chunked传输
+    /// </summary>
+    interface IChunkedable
+    {
+        /// <summary>
+        /// 获取或设置是否允许 chunked 传输
+        /// </summary>
+        bool AllowChunked { get; set; }
+    }
+}
diff --git a/WebApiClientCore/Parameters/JsonPatchDocument.cs b/WebApiClientCore/Parameters/JsonPatchDocument.cs
@@ -15,11 +15,17 @@ namespace WebApiClientCore.Parameters
     /// </summary>
     [DebuggerTypeProxy(typeof(DebugView))]
     [RequiresDynamicCode("JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext.")]
-    public class JsonPatchDocument : IApiParameter
+    public class JsonPatchDocument : IApiParameter, IChunkedable
     {
         private static readonly MediaTypeHeaderValue mediaTypeHeaderValue = new("application/json-patch+json");
         private readonly List<object> operations = [];
 
+        /// <summary>
+        /// 获取或设置是否允许 chunked 传输
+        /// 默认为 true
+        /// </summary>
+        public bool AllowChunked { get; set; } = true;
+
         /// <summary>
         /// Add操作
         /// </summary>
@@ -79,8 +85,14 @@ public Task OnRequestAsync(ApiParameterContext context)
             }
 
             var options = context.HttpContext.HttpApiOptions.JsonSerializeOptions;
-            context.HttpContext.RequestMessage.Content = JsonContent.Create(this.operations, this.operations.GetType(), mediaTypeHeaderValue, options);
-
+            if (this.AllowChunked)
+            {
+                context.HttpContext.RequestMessage.Content = JsonContent.Create(this.operations, this.operations.GetType(), mediaTypeHeaderValue, options);
+            }
+            else
+            {
+                context.HttpContext.RequestMessage.Content = new HttpContents.JsonPatchContent(this.operations, options);
+            }
             return Task.CompletedTask;
         }
 
diff --git a/WebApiClientCore/Serialization/XmlSerializer.cs b/WebApiClientCore/Serialization/XmlSerializer.cs
@@ -33,9 +33,7 @@ public static class XmlSerializer
 
             var settings = options ?? writerSettings;
             using var writer = new EncodingStringWriter(settings.Encoding);
-            using var xmlWriter = XmlWriter.Create(writer, settings);
-            var xmlSerializer = new System.Xml.Serialization.XmlSerializer(obj.GetType());
-            xmlSerializer.Serialize(xmlWriter, obj);
+            SerializeCore(writer, obj, settings);
             return writer.ToString();
         }
 
@@ -55,7 +53,13 @@ public static void Serialize(IBufferWriter<byte> bufferWriter, object? obj, XmlW
 
             var settings = options ?? writerSettings;
             using var writer = new BufferTextWriter(bufferWriter, settings.Encoding);
-            using var xmlWriter = XmlWriter.Create(writer, settings);
+            SerializeCore(writer, obj, settings);
+        }
+
+        [RequiresUnreferencedCode("Members from serialized types may be trimmed if not referenced directly")]
+        private static void SerializeCore(TextWriter textWriter, object obj, XmlWriterSettings settings)
+        {
+            using var xmlWriter = XmlWriter.Create(textWriter, settings);
             var xmlSerializer = new System.Xml.Serialization.XmlSerializer(obj.GetType());
             xmlSerializer.Serialize(xmlWriter, obj);
         }

Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,17 @@ public JsonContent(object? value, JsonSerializerOptions? jsonSerializerOptions,`
`58`	`58`	`else`
`59`	`59`	`{`
`60`	`60`	`this.Headers.ContentType = new MediaTypeHeaderValue(mediaType) { CharSet = encoding.WebName };`
	`61`	`+ this.ConvertEncoding(encoding);`
	`62`	`+ }`
	`63`	`+ }`
`61`	`64`
`62`		`- var utf8Json = this.WrittenSegment;`
`63`		`- var encodingBuffer = Encoding.Convert(Encoding.UTF8, encoding, utf8Json.Array!, utf8Json.Offset, utf8Json.Count);`
	`65`	`+ private void ConvertEncoding(Encoding encoding)`
	`66`	`+ {`
	`67`	`+ var utf8Json = this.WrittenSegment;`
	`68`	`+ var encodingBuffer = Encoding.Convert(Encoding.UTF8, encoding, utf8Json.Array!, utf8Json.Offset, utf8Json.Count);`
`64`	`69`
`65`		`- this.Clear();`
`66`		`- this.Write(encodingBuffer);`
`67`		`- }`
	`70`	`+ this.Clear();`
	`71`	`+ this.Write(encodingBuffer);`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ public class XmlContent : BufferContent`
`26`	`26`	`public XmlContent(string? xml, Encoding encoding)`
`27`	`27`	`{`
`28`	`28`	`encoding.GetBytes(xml, this);`
`29`		`- this.Headers.ContentType = encoding == Encoding.UTF8 ? defaultMediaType : new MediaTypeHeaderValue(MediaType) { CharSet = encoding.WebName };`
	`29`	`+ this.Headers.ContentType = encoding == Encoding.UTF8`
	`30`	`+ ? defaultMediaType :`
	`31`	`+ new MediaTypeHeaderValue(MediaType) { CharSet = encoding.WebName };`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`/// <summary>`
`@@ -38,8 +40,9 @@ public XmlContent(string? xml, Encoding encoding)`
`38`	`40`	`public XmlContent(object? obj, XmlWriterSettings xmlWriterSettings)`
`39`	`41`	`{`
`40`	`42`	`XmlSerializer.Serialize(this, obj, xmlWriterSettings);`
`41`		`- var encoding = xmlWriterSettings.Encoding;`
`42`		`- this.Headers.ContentType = encoding == Encoding.UTF8 ? defaultMediaType : new MediaTypeHeaderValue(MediaType) { CharSet = encoding.WebName };`
	`43`	`+ this.Headers.ContentType = xmlWriterSettings.Encoding == Encoding.UTF8`
	`44`	`+ ? defaultMediaType`
	`45`	`+ : new MediaTypeHeaderValue(MediaType) { CharSet = xmlWriterSettings.Encoding.WebName };`
`43`	`46`	`}`
`44`	`47`	`}`
`45`	`48`	`}`