Add Cbor request and structure marshallers generators

Author: muhammad-othman

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

@@ -12,16 +12,10 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-using Amazon.Util;
+
 using System;
-using System.Collections.Generic;
 using System.Formats.Cbor;
-using System.IO;
-using System.Text.RegularExpressions;
+using Amazon.Util;
 
 namespace AWSSDK.Extensions.CborProtocol
 {
@@ -47,57 +41,82 @@ public static void WriteOptimizedNumber(this CborWriter writer, double value)
         {
             if (double.IsNaN(value) || double.IsInfinity(value))
             {
-                writer.WriteDouble(value);
+                writer.WriteDouble(value); // Write NaN or Infinity as a double.
                 return;
             }
 
+            // If the value is an integer (without fractional part), write it as Int64 or UInt64.
             if (value % 1 == 0)
             {
                 if (value >= long.MinValue && value <= long.MaxValue)
                 {
+                    // If the value fits within the signed 64-bit integer (long) range,
+                    // WriteInt64 serializes it into the smallest CBOR type representation
+                    // that can contain its value without loss of precision.
                     writer.WriteInt64((long)value);
                     return;
                 }
 
                 if (value >= 0 && value <= ulong.MaxValue)
                 {
+                    // If the value is non-negative and fits within the unsigned 64-bit range,
+                    // WriteUInt64 serializes it into the smallest possible CBOR type representation.
                     writer.WriteUInt64((ulong)value);
                     return;
                 }
             }
 
+            // Check if value can safely be represented as float32
+            float floatCandidate = (float)value;
+            if ((double)floatCandidate == value)
+            {
+                WriteOptimizedNumber(writer, floatCandidate);
+                return;
+            }
+
+            // If none of the above conditions are satisfied, write the value as a double.
             writer.WriteDouble(value);
         }
 
         /// <summary>
         /// Writes a float using the smallest CBOR representation that preserves value and precision.
+        /// This method uses manual encoding to avoid writing as a half-precision float.
         /// </summary>
         /// <param name="writer">The CBOR writer to use.</param>
         /// <param name="value">The float value to write.</param>
         public static void WriteOptimizedNumber(this CborWriter writer, float value)
         {
-            if (float.IsNaN(value) || float.IsInfinity(value))
-            {
-                writer.WriteSingle(value);
-                return;
-            }
-
+            // If the value is an integer (without fractional part), write it as Int64 or UInt64.
             if (value % 1 == 0)
             {
                 if (value >= long.MinValue && value <= long.MaxValue)
                 {
+                    // If the value fits within the signed 64-bit integer (long) range,
+                    // WriteInt64 serializes it into the smallest CBOR type representation
+                    // that can contain its value without loss of precision.
                     writer.WriteInt64((long)value);
                     return;
                 }
 
                 if (value >= 0 && value <= ulong.MaxValue)
                 {
+                    // If the value is non-negative and fits within the unsigned 64-bit range,
+                    // WriteUInt64 serializes it into the smallest possible CBOR type representation.
                     writer.WriteUInt64((ulong)value);
                     return;
                 }
             }
 
-            writer.WriteSingle(value);
+            // Manual encoding to avoid half-precision floats
+            var bytes = new byte[5];
+            bytes[0] = 0xFA; // CBOR float32 marker
+            BitConverter.GetBytes(value).CopyTo(bytes, 1);
+
+            // Ensure the bytes are in the correct endian order for CBOR.
+            if (BitConverter.IsLittleEndian)
+                Array.Reverse(bytes, 1, 4);
+
+            writer.WriteEncodedValue(bytes);
         }
     }
 }

generator/ServiceClientGeneratorLib/GeneratorDriver.cs

@@ -1355,7 +1355,7 @@ internal static bool WriteFile(string baseOutputDir,
         /// Sets the marshaller of the generator based on the service type
         /// </summary>
         /// <param name="marshaller">The marshaller to be set</param>
-        /// <param name="normalizeMarshallers">If the service type is a type of json then normalizeMarshallers is set to true, false otherwise</param>
+        /// <param name="normalizeMarshallers">If the service type is using structure marshallers then normalizeMarshallers is set to true, false otherwise</param>
         void GetRequestMarshaller(out BaseRequestMarshaller marshaller, out bool normalizeMarshallers)
         {
             normalizeMarshallers = false;
@@ -1366,6 +1366,10 @@ void GetRequestMarshaller(out BaseRequestMarshaller marshaller, out bool normali
                     marshaller = new JsonRPCRequestMarshaller();
                     normalizeMarshallers = true;
                     break;
+                case ServiceType.Cbor:
+                    marshaller = new CborRequestMarshaller();
+                    normalizeMarshallers = true;
+                    break;
                 case ServiceType.Query:
                     marshaller = new AWSQueryRequestMarshaller();
                     break;
@@ -1388,6 +1392,8 @@ BaseRequestMarshaller GetStructureMarshaller()
                 case ServiceType.Rest_Json:
                 case ServiceType.Json:
                     return new JsonRPCStructureMarshaller();
+                case ServiceType.Cbor:
+                    return new CborStructureMarshaller();
                 default:
                     throw new Exception("No structure marshaller for service type: " + this.Configuration.ServiceModel.Type);
             }
@@ -1409,6 +1415,8 @@ BaseResponseUnmarshaller GetResponseUnmarshaller()
                     return new AWSQueryResponseUnmarshaller();
                 case ServiceType.Rest_Xml:
                     return new RestXmlResponseUnmarshaller();
+                case ServiceType.Cbor:
+                    return new CborResponseUnmarshaller();
                 default:
                     throw new Exception("No response unmarshaller for service type: " + this.Configuration.ServiceModel.Type);
             }
@@ -1429,6 +1437,8 @@ BaseResponseUnmarshaller GetStructureUnmarshaller()
                     return new AWSQueryStructureUnmarshaller();
                 case ServiceType.Rest_Xml:
                     return new RestXmlStructureUnmarshaller();
+                case ServiceType.Cbor:
+                    return new CborStructureUnmarshaller();
                 default:
                     throw new Exception("No structure unmarshaller for service type: " + this.Configuration.ServiceModel.Type);
             }
@@ -1448,6 +1458,8 @@ BaseResponseUnmarshaller GetExceptionUnmarshaller()
                     return new AWSQueryExceptionUnmarshaller();
                 case ServiceType.Rest_Xml:
                     return new RestXmlExceptionUnmarshaller();
+                case ServiceType.Cbor:
+                    return new CborExceptionUnmarshaller();
                 default:
                     throw new Exception("No structure unmarshaller for service type: " + this.Configuration.ServiceModel.Type);
             }