Generate CBOR response protocol tests

Author: muhammad-othman

extensions/src/AWSSDK.Extensions.CborProtocol/CborWriterExtensions.cs

@@ -17,7 +17,7 @@
 using System.Formats.Cbor;
 using Amazon.Util;
 
-namespace AWSSDK.Extensions.CborProtocol
+namespace Amazon.Extensions.CborProtocol
 {
     public static class CborWriterExtensions
     {

extensions/src/AWSSDK.Extensions.CborProtocol/Internal/CborWriterPool.cs

@@ -17,7 +17,7 @@
 using System.Formats.Cbor;
 using System.Threading;
 
-namespace AWSSDK.Extensions.CborProtocol.Internal
+namespace Amazon.Extensions.CborProtocol.Internal
 {
     public static class CborWriterPool
     {

extensions/src/AWSSDK.Extensions.CborProtocol/Internal/Transform/CborErrorResponseUnmarshaller.cs

@@ -22,7 +22,7 @@
 using System.Formats.Cbor;
 using System.IO;
 
-namespace AWSSDK.Extensions.CborProtocol.Internal.Transform
+namespace Amazon.Extensions.CborProtocol.Internal.Transform
 {
     /// <summary>
     /// Class for unmarshalling CBOR service responses.

extensions/src/AWSSDK.Extensions.CborProtocol/Internal/Transform/CborMarshallerContext.cs

@@ -23,7 +23,7 @@
 using System.Formats.Cbor;
 using System.IO;
 
-namespace AWSSDK.Extensions.CborProtocol.Internal.Transform
+namespace Amazon.Extensions.CborProtocol.Internal.Transform
 {
     public class CborMarshallerContext : MarshallerContext
     {

extensions/src/AWSSDK.Extensions.CborProtocol/Internal/Transform/CborResponseUnmarshaller.cs

@@ -24,7 +24,7 @@
 using System.IO;
 using System.Net;
 
-namespace AWSSDK.Extensions.CborProtocol.Internal.Transform
+namespace Amazon.Extensions.CborProtocol.Internal.Transform
 {
     public abstract class CborResponseUnmarshaller : ResponseUnmarshaller
     {

extensions/src/AWSSDK.Extensions.CborProtocol/Internal/Transform/CborSimpleTypeUnmarshaller.cs

@@ -22,7 +22,7 @@
 using Amazon.Runtime.Internal.Util;
 using Amazon.Util;
 
-namespace AWSSDK.Extensions.CborProtocol.Internal.Transform
+namespace Amazon.Extensions.CborProtocol.Internal.Transform
 {
     static class CborSimpleTypeUnmarshaller<T>
     {
@@ -45,7 +45,7 @@ public static T Unmarshall(CborUnmarshallerContext context)
             )
             {
                 reader.ReadNull();
-                value = null;
+                value = default(T);
             }
             else if (typeof(T) == typeof(string))
                 value = reader.ReadTextString();

extensions/src/AWSSDK.Extensions.CborProtocol/Internal/Transform/CborUnmarshallerContext.cs

@@ -24,10 +24,12 @@
 using Amazon.Runtime.Internal.Transform;
 using Amazon.Runtime.Internal.Util;
 
-namespace AWSSDK.Extensions.CborProtocol.Internal.Transform
+namespace Amazon.Extensions.CborProtocol.Internal.Transform
 {
     public class CborUnmarshallerContext : UnmarshallerContext
     {
+        private bool disposed = false;
+        private byte[] rentedBuffer = null;
         private readonly Stack<string> _pathStack = new Stack<string>();
 
         // There isn't a direct way to check if the reader is at the start of the document,
@@ -119,13 +121,13 @@ out long contentLength
             );
         }
 
-        public static CborReader CreateCborReaderFromStream(Stream stream, long? streamSize = null)
+        private CborReader CreateCborReaderFromStream(Stream stream, long? streamSize = null)
         {
+            int totalRead = 0;
             if (streamSize.HasValue)
             {
                 // If we know the size, we can read directly into a buffer of exact size
                 var buffer = new byte[streamSize.Value];
-                int totalRead = 0;
 
                 while (totalRead < streamSize.Value)
                 {
@@ -143,48 +145,36 @@ public static CborReader CreateCborReaderFromStream(Stream stream, long? streamS
             }
 
             const int InitialBufferSize = 1024 * 8; // 8kb
-            var tempBuffer = ArrayPool<byte>.Shared.Rent(InitialBufferSize);
+            rentedBuffer = ArrayPool<byte>.Shared.Rent(InitialBufferSize);
 
-            try
+            while (true)
             {
-                int totalRead = 0;
-                while (true)
-                {
-                    int read = stream.Read(tempBuffer, totalRead, tempBuffer.Length - totalRead);
-                    if (read == 0)
-                        break;
+                int read = stream.Read(rentedBuffer, totalRead, rentedBuffer.Length - totalRead);
+                if (read == 0)
+                    break;
 
-                    totalRead += read;
+                totalRead += read;
 
-                    if (totalRead == tempBuffer.Length)
+                if (totalRead == rentedBuffer.Length)
+                {
+                    // Expand the buffer size by doubling it
+                    var newBuffer = ArrayPool<byte>.Shared.Rent(rentedBuffer.Length * 2);
+                    try
+                    {
+                        Buffer.BlockCopy(rentedBuffer, 0, newBuffer, 0, totalRead);
+                    }
+                    catch
                     {
-                        // Expand the buffer size by doubling it
-                        var newBuffer = ArrayPool<byte>.Shared.Rent(tempBuffer.Length * 2);
-                        try
-                        {
-                            Buffer.BlockCopy(tempBuffer, 0, newBuffer, 0, totalRead);
-                        }
-                        catch
-                        {
-                            ArrayPool<byte>.Shared.Return(newBuffer);
-                            throw;
-                        }
-                        ArrayPool<byte>.Shared.Return(tempBuffer);
-                        tempBuffer = newBuffer;
+                        ArrayPool<byte>.Shared.Return(newBuffer);
+                        throw;
                     }
+                    ArrayPool<byte>.Shared.Return(rentedBuffer);
+                    rentedBuffer = newBuffer;
                 }
-
-                // Create a new byte array to hold only the read data.
-                var actualBytes = new byte[totalRead];
-                Buffer.BlockCopy(tempBuffer, 0, actualBytes, 0, totalRead);
-
-                return new CborReader(actualBytes);
-            }
-            finally
-            {
-                // Return the buffer to the pool when done
-                ArrayPool<byte>.Shared.Return(tempBuffer);
             }
+
+            var actualBytes = new ReadOnlyMemory<byte>(rentedBuffer, 0, totalRead);
+            return new CborReader(actualBytes);
         }
 
         /// <summary>
@@ -206,5 +196,18 @@ public string PopPathSegment()
         {
             return _pathStack.Pop();
         }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (!this.disposed)
+            {
+                if (disposing && rentedBuffer != null)
+                {
+                    ArrayPool<byte>.Shared.Return(rentedBuffer);
+                }
+                disposed = true;
+            }
+            base.Dispose(disposing);
+        }
     }
 }

extensions/src/AWSSDK.Extensions.CborProtocol/Internal/Transform/ICborErrorResponseUnmarshaller.cs

@@ -15,7 +15,7 @@
 
 using Amazon.Runtime.Internal;
 
-namespace AWSSDK.Extensions.CborProtocol.Internal.Transform
+namespace Amazon.Extensions.CborProtocol.Internal.Transform
 {
     /// <summary>
     /// The interface for unmarshalling a cbor error response.

extensions/src/AWSSDK.Extensions.CborProtocol/Internal/Transform/ICborUnmarshaller.cs

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-namespace AWSSDK.Extensions.CborProtocol.Internal.Transform
+namespace Amazon.Extensions.CborProtocol.Internal.Transform
 {
     /// <summary>
     /// Interface for unmarshallers which unmarshall objects from response data.

extensions/test/CborProtocol.Tests/WriteDateTimeTests.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Formats.Cbor;
 using Xunit;
-using AWSSDK.Extensions.CborProtocol;
+using Amazon.Extensions.CborProtocol;
 
 namespace Amazon.CborProtocol.Tests;