Merge pull request #1010 from cocytus/fix_netstd21_write_main

Fixes issue #952 - did not write everything to output stream
reactiveui · Nov 26, 2020 · 4c2b17e · 4c2b17e
2 parents f99fa3a + f01a96b
commit 4c2b17e
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 6 deletions.
diff --git a/Refit.Tests/RefitStubs.Net46.cs b/Refit.Tests/RefitStubs.Net46.cs
@@ -2542,6 +2542,14 @@ Task IRequestBin.PostGeneric<T>(T param)
             var func = requestBuilder.BuildRestResultFuncForMethod("PostGeneric", new Type[] { typeof(T) }, new Type[] { typeof(T) });
             return (Task)func(Client, arguments);
         }
+
+        /// <inheritdoc />
+        Task IRequestBin.PostBig(BigObject big)
+        {
+            var arguments = new object[] { big };
+            var func = requestBuilder.BuildRestResultFuncForMethod("PostBig", new Type[] { typeof(BigObject) });
+            return (Task)func(Client, arguments);
+        }
     }
 }
 

diff --git a/Refit.Tests/RefitStubs.Net5.cs b/Refit.Tests/RefitStubs.Net5.cs
@@ -2542,6 +2542,14 @@ Task IRequestBin.PostGeneric<T>(T param)
             var func = requestBuilder.BuildRestResultFuncForMethod("PostGeneric", new Type[] { typeof(T) }, new Type[] { typeof(T) });
             return (Task)func(Client, arguments);
         }
+
+        /// <inheritdoc />
+        Task IRequestBin.PostBig(BigObject big)
+        {
+            var arguments = new object[] { big };
+            var func = requestBuilder.BuildRestResultFuncForMethod("PostBig", new Type[] { typeof(BigObject) });
+            return (Task)func(Client, arguments);
+        }
     }
 }
 

diff --git a/Refit.Tests/RefitStubs.NetCore2.cs b/Refit.Tests/RefitStubs.NetCore2.cs
@@ -2542,6 +2542,14 @@ Task IRequestBin.PostGeneric<T>(T param)
             var func = requestBuilder.BuildRestResultFuncForMethod("PostGeneric", new Type[] { typeof(T) }, new Type[] { typeof(T) });
             return (Task)func(Client, arguments);
         }
+
+        /// <inheritdoc />
+        Task IRequestBin.PostBig(BigObject big)
+        {
+            var arguments = new object[] { big };
+            var func = requestBuilder.BuildRestResultFuncForMethod("PostBig", new Type[] { typeof(BigObject) });
+            return (Task)func(Client, arguments);
+        }
     }
 }
 

diff --git a/Refit.Tests/RefitStubs.NetCore3.cs b/Refit.Tests/RefitStubs.NetCore3.cs
@@ -2542,6 +2542,14 @@ Task IRequestBin.PostGeneric<T>(T param)
             var func = requestBuilder.BuildRestResultFuncForMethod("PostGeneric", new Type[] { typeof(T) }, new Type[] { typeof(T) });
             return (Task)func(Client, arguments);
         }
+
+        /// <inheritdoc />
+        Task IRequestBin.PostBig(BigObject big)
+        {
+            var arguments = new object[] { big };
+            var func = requestBuilder.BuildRestResultFuncForMethod("PostBig", new Type[] { typeof(BigObject) });
+            return (Task)func(Client, arguments);
+        }
     }
 }
 

diff --git a/Refit.Tests/RestService.cs b/Refit.Tests/RestService.cs
@@ -27,6 +27,11 @@ public class RootObject
     }
 #pragma warning restore IDE1006 // Naming Styles
 
+    public class BigObject
+    {
+        public byte[] BigData { get; set; }
+    }
+
     [Headers("User-Agent: Refit Integration Tests")]
     public interface INpmJs
     {
@@ -50,7 +55,11 @@ public interface IRequestBin
 
         [Post("/1h3a5jm1")]
         Task PostGeneric<T>(T param);
+
+        [Post("/big")]
+        Task PostBig(BigObject big);
     }
+
     public interface IApiBindPathToObject
     {
         [Get("/foos/{request.someProperty}/bar/{request.someProperty2}")]
@@ -1312,6 +1321,42 @@ public async Task CanGetDataOutOfErrorResponses()
             }
         }
 
+        [Fact]
+        public async Task CanSerializeBigData()
+        {
+            var mockHttp = new MockHttpMessageHandler();
+
+            var settings = new RefitSettings
+            {
+                HttpMessageHandlerFactory = () => mockHttp,
+                ContentSerializer = new SystemTextJsonContentSerializer()
+            };
+
+            var bigObject = new BigObject
+            {
+                BigData = Enumerable.Range(0, 800000).Select(x => (byte)(x % 256)).ToArray()
+            };
+
+            mockHttp.Expect(HttpMethod.Post, "http://httpbin.org/big")
+                    .With(m =>
+                    {
+                        async Task<bool> T()
+                        {
+                            using var s = await m.Content.ReadAsStreamAsync();
+                            var it = await System.Text.Json.JsonSerializer.DeserializeAsync<BigObject>(s, new System.Text.Json.JsonSerializerOptions { PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase });
+                            return it.BigData.SequenceEqual(bigObject.BigData);
+                        }
+
+                        return T().Result;
+                    })
+                    .Respond(HttpStatusCode.OK);
+
+            var fixture = RestService.For<IRequestBin>("http://httpbin.org/", settings);
+
+            await fixture.PostBig(bigObject);
+
+            mockHttp.VerifyNoOutstandingExpectation();
+        }
 
         [Fact]
         public async Task ErrorsFromApiReturnErrorContent()

diff --git a/Refit/Buffers/PooledBufferWriter.Stream.NETStandard21.cs b/Refit/Buffers/PooledBufferWriter.Stream.NETStandard21.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET5_0
 
 using System;
 using System.IO;
@@ -14,18 +14,17 @@ internal sealed partial class PooledBufferWriter
         private sealed partial class PooledMemoryStream : Stream
         {
             /// <inheritdoc/>
-            public override void CopyTo(Stream destination, int bufferSize)
+            public Task CopyToInternalAsync(Stream destination, CancellationToken cancellationToken)
             {
                 if (pooledBuffer is null) ThrowObjectDisposedException();
 
                 var bytesAvailable = length - position;
-                var spanLength = Math.Min(bytesAvailable, bufferSize);
 
-                var source = pooledBuffer.AsSpan(position, spanLength);
+                var source = pooledBuffer.AsMemory(position, bytesAvailable);
 
                 position += source.Length;
 
-                destination.Write(source);
+                return destination.WriteAsync(source, cancellationToken).AsTask();
             }
 
             /// <inheritdoc/>

diff --git a/Refit/Buffers/PooledBufferWriter.Stream.cs b/Refit/Buffers/PooledBufferWriter.Stream.cs
@@ -91,9 +91,12 @@ public override Task CopyToAsync(Stream destination, int bufferSize, Cancellatio
 
                 try
                 {
+#if NETSTANDARD2_1 || NET5_0
+                    return CopyToInternalAsync(destination, cancellationToken);
+#else
                     CopyTo(destination, bufferSize);
-
                     return Task.CompletedTask;
+#endif
                 }
                 catch (OperationCanceledException e)
                 {