avrotize 2.22.0__tar.gz → 2.22.2__tar.gz

{avrotize-2.22.0 → avrotize-2.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avrotize
-Version: 2.22.0
+Version: 2.22.2
 Summary: Tools to convert from and to Avro Schema from various other schema languages.
 Author-email: Clemens Vasters <clemensv@microsoft.com>
 Requires-Python: >=3.10

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.22.0'
-__version_tuple__ = version_tuple = (2, 22, 0)
+__version__ = version = '2.22.2'
+__version_tuple__ = version_tuple = (2, 22, 2)
 
-__commit_id__ = commit_id = 'g5d3e04df0'
+__commit_id__ = commit_id = 'g25efcf5da'

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/avrotocsharp/class_test.cs.jinja

@@ -166,7 +166,18 @@ public class {{ test_class_name }}
         Assert.That(newInstance, Is.EqualTo(_instance));
     }
     {%- endif %}
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or msgpack_annotation or protobuf_net_annotation %}
+    {%- if cbor_annotation %}
+    /// <summary> Testing CBOR serializer </summary>
+    [Test]
+    public void Test_ToByteArray_FromData_Cbor()
+    {
+        var mediaType = "application/cbor";
+        var bytes = _instance.ToByteArray(mediaType);
+        var newInstance = {{ class_base_name }}.FromData(bytes, mediaType);
+        Assert.That(newInstance, Is.EqualTo(_instance));
+    }
+    {%- endif %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or msgpack_annotation or cbor_annotation or protobuf_net_annotation %}
 
     /// <summary> Testing FromData with edge cases </summary>
     [Test]
@@ -188,6 +199,9 @@ public class {{ test_class_name }}
         {%- elif msgpack_annotation %}
         // Test null data - FromData returns null for null input
         Assert.That({{ class_base_name }}.FromData((byte[])null!, "application/msgpack"), Is.Null);
+        {%- elif cbor_annotation %}
+        // Test null data - FromData returns null for null input
+        Assert.That({{ class_base_name }}.FromData((byte[])null!, "application/cbor"), Is.Null);
         {%- elif protobuf_net_annotation %}
         // Test null data - FromData returns null for null input
         Assert.That({{ class_base_name }}.FromData((byte[])null!, "application/x-protobuf"), Is.Null);
@@ -242,7 +256,24 @@ public class {{ test_class_name }}
         Assert.That(newInstance, Is.EqualTo(_instance));
     }
     {%- endif %}
-    {%- if protobuf_net_annotation and not (system_text_json_annotation or newtonsoft_json_annotation or msgpack_annotation) %}
+    {%- if cbor_annotation and not (system_text_json_annotation or newtonsoft_json_annotation or msgpack_annotation) %}
+
+    /// <summary> Testing Gzip compression with CBOR </summary>
+    [Test]
+    public void Test_ToByteArray_Gzip_Cbor()
+    {
+        var mediaType = "application/cbor";
+        var gzipMediaType = "application/cbor+gzip";
+        var plainBytes = _instance.ToByteArray(mediaType);
+        var gzipBytes = _instance.ToByteArray(gzipMediaType);
+        // Gzip compressed data should start with magic bytes 0x1f 0x8b
+        Assert.That(gzipBytes.Length >= 2 && gzipBytes[0] == 0x1f && gzipBytes[1] == 0x8b, Is.True,
+            "Gzip compressed data should have correct magic bytes");
+        var newInstance = {{ class_base_name }}.FromData(gzipBytes, gzipMediaType);
+        Assert.That(newInstance, Is.EqualTo(_instance));
+    }
+    {%- endif %}
+    {%- if protobuf_net_annotation and not (system_text_json_annotation or newtonsoft_json_annotation or msgpack_annotation or cbor_annotation) %}
 
     /// <summary> Testing Gzip compression with Protobuf </summary>
     [Test]

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/avrotocsharp/dataclass_core.jinja

@@ -1,4 +1,4 @@
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation or cbor_annotation %}
     /// <summary>
     /// Creates an object from the data
     /// </summary>
@@ -11,7 +11,7 @@
         if ( data is {{ class_name }}) return ({{ class_name }})data;
         if ( contentTypeString == null ) contentTypeString = System.Net.Mime.MediaTypeNames.Application.Octet;
         var contentType = new System.Net.Mime.ContentType(contentTypeString);
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation or cbor_annotation %}
         if ( contentType.MediaType.EndsWith("+gzip"))
         {
             var stream = data switch
@@ -149,12 +149,25 @@
             };
             return MessagePack.MessagePackSerializer.Deserialize<{{ class_name }}>(bytes);
         }
+    {%- endif %}
+    {%- if cbor_annotation %}
+        if (contentType.MediaType.StartsWith("application/cbor"))
+        {
+            var bytes = data switch
+            {
+                byte[] b => b,
+                System.IO.Stream s => ReadStreamToBytes(s),
+                System.BinaryData bd => bd.ToArray(),
+                _ => throw new NotSupportedException("Data type not supported for CBOR")
+            };
+            return Dahomey.Cbor.Cbor.Deserialize<{{ class_name }}>(new ReadOnlySpan<byte>(bytes));
+        }
     {%- endif %}
         throw new System.NotSupportedException($"Unsupported media type {contentType.MediaType}");
     }
     {%- endif %}
 
-    {%- if msgpack_annotation %}
+    {%- if msgpack_annotation or cbor_annotation %}
     private static byte[] ReadStreamToBytes(System.IO.Stream stream)
     {
         using (var memoryStream = new System.IO.MemoryStream())
@@ -190,7 +203,7 @@
     {%- if avro_annotation %}
     {%- endif%}
 
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation or cbor_annotation %}
     /// <summary>
     /// Converts the object to a byte array
     /// </summary>
@@ -263,7 +276,15 @@
             result = MessagePack.MessagePackSerializer.Serialize(this);
         }
     {%- endif %}
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation %}
+    {%- if cbor_annotation %}
+        if (contentType.MediaType.StartsWith("application/cbor"))
+        {
+            var bufferWriter = new System.Buffers.ArrayBufferWriter<byte>();
+            Dahomey.Cbor.Cbor.Serialize(this, bufferWriter);
+            result = bufferWriter.WrittenSpan.ToArray();
+        }
+    {%- endif %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation or cbor_annotation %}
     if (result != null && contentType.MediaType.EndsWith("+gzip"))
         {
             var stream = new System.IO.MemoryStream();

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/avrotocsharp/project.csproj.jinja

@@ -20,6 +20,9 @@
         {%- if msgpack_annotation %}
         <PackageReference Include="MessagePack" Version="{{ MSGPACK_VERSION }}" />
         {%- endif %}
+        {%- if cbor_annotation %}
+        <PackageReference Include="Dahomey.Cbor" Version="{{ CBOR_VERSION }}" />
+        {%- endif %}
         <PackageReference Include="System.Memory.Data" Version="{{ SYSTEM_MEMORY_DATA_VERSION }}" />
     </ItemGroup>
     <ItemGroup>

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/avrotocsharp.py

@@ -16,6 +16,7 @@ from avrotize.constants import (
     SYSTEM_MEMORY_DATA_VERSION,
     PROTOBUF_NET_VERSION,
     MSGPACK_VERSION,
+    CBOR_VERSION,
     NUNIT_VERSION,
     NUNIT_ADAPTER_VERSION,
     MSTEST_SDK_VERSION,
@@ -53,6 +54,7 @@ class AvroToCSharp:
         self.newtonsoft_json_annotation = False
         self.system_xml_annotation = False
         self.msgpack_annotation = False
+        self.cbor_annotation = False
         self.avro_annotation = False
         self.protobuf_net_annotation = False
         self.generated_types: Dict[str,str] = {}
@@ -267,6 +269,7 @@ class AvroToCSharp:
             newtonsoft_json_annotation=self.newtonsoft_json_annotation,
             system_xml_annotation=self.system_xml_annotation,
             msgpack_annotation=self.msgpack_annotation,
+            cbor_annotation=self.cbor_annotation,
             json_match_clauses=self.create_is_json_match_clauses(avro_schema, avro_namespace, class_name)
         )
 
@@ -768,6 +771,10 @@ class AvroToCSharp:
         if self.msgpack_annotation:
             prop += f"{INDENT}[Key({field_index})]\n"
 
+        # Add CBOR serialization attribute if enabled
+        if self.cbor_annotation:
+            prop += f"{INDENT}[Dahomey.Cbor.Attributes.CborProperty(\"{annotation_name}\")]\n"
+
         if self.system_text_json_annotation:
             prop += f"{INDENT}[System.Text.Json.Serialization.JsonPropertyName(\"{annotation_name}\")]\n"
             if is_enum_type:
@@ -831,6 +838,8 @@ class AvroToCSharp:
                 file_content += "using System.Xml.Serialization;\n"
             if self.msgpack_annotation:  # Add MessagePack serialization using directive
                 file_content += "using MessagePack;\n"
+            if self.cbor_annotation:  # Add CBOR serialization using directive
+                file_content += "using Dahomey.Cbor.Attributes;\n"
 
             if namespace:
                 # Namespace declaration with correct indentation for the definition
@@ -874,7 +883,8 @@ class AvroToCSharp:
                 system_text_json_annotation=self.system_text_json_annotation,
                 newtonsoft_json_annotation=self.newtonsoft_json_annotation,
                 protobuf_net_annotation=self.protobuf_net_annotation,
-                msgpack_annotation=self.msgpack_annotation
+                msgpack_annotation=self.msgpack_annotation,
+                cbor_annotation=self.cbor_annotation
             )
         elif type_kind == "enum":
             test_class_definition = process_template(
@@ -1028,12 +1038,14 @@ class AvroToCSharp:
                         newtonsoft_json_annotation=self.newtonsoft_json_annotation,
                         protobuf_net_annotation=self.protobuf_net_annotation,
                         msgpack_annotation=self.msgpack_annotation,
+                        cbor_annotation=self.cbor_annotation,
                         CSHARP_AVRO_VERSION=CSHARP_AVRO_VERSION,
                         NEWTONSOFT_JSON_VERSION=NEWTONSOFT_JSON_VERSION,
                         SYSTEM_TEXT_JSON_VERSION=SYSTEM_TEXT_JSON_VERSION,
                         SYSTEM_MEMORY_DATA_VERSION=SYSTEM_MEMORY_DATA_VERSION,
                         PROTOBUF_NET_VERSION=PROTOBUF_NET_VERSION,
                         MSGPACK_VERSION=MSGPACK_VERSION,
+                        CBOR_VERSION=CBOR_VERSION,
                         NUNIT_VERSION=NUNIT_VERSION,
                         NUNIT_ADAPTER_VERSION=NUNIT_ADAPTER_VERSION,
                         MSTEST_SDK_VERSION=MSTEST_SDK_VERSION))
@@ -1107,6 +1119,7 @@ def convert_avro_to_csharp(
     newtonsoft_json_annotation=False, 
     system_xml_annotation=False,
     msgpack_annotation=False,
+    cbor_annotation=False,
     avro_annotation=False,
     protobuf_net_annotation=False
 ):
@@ -1122,6 +1135,7 @@ def convert_avro_to_csharp(
         newtonsoft_json_annotation (bool, optional): Use Newtonsoft.Json annotations. Defaults to False.
         system_xml_annotation (bool, optional): Use System.Xml.Serialization annotations. Defaults to False.
         msgpack_annotation (bool, optional): Use MessagePack annotations. Defaults to False.
+        cbor_annotation (bool, optional): Use Dahomey.Cbor annotations. Defaults to False.
         avro_annotation (bool, optional): Use Avro annotations. Defaults to False.
         protobuf_net_annotation (bool, optional): Use protobuf-net annotations. Defaults to False.
     """
@@ -1135,6 +1149,7 @@ def convert_avro_to_csharp(
     avrotocs.newtonsoft_json_annotation = newtonsoft_json_annotation
     avrotocs.system_xml_annotation = system_xml_annotation
     avrotocs.msgpack_annotation = msgpack_annotation
+    avrotocs.cbor_annotation = cbor_annotation
     avrotocs.avro_annotation = avro_annotation
     avrotocs.protobuf_net_annotation = protobuf_net_annotation
     avrotocs.convert(avro_schema_path, cs_file_path)
@@ -1150,6 +1165,7 @@ def convert_avro_schema_to_csharp(
     newtonsoft_json_annotation: bool = False, 
     system_xml_annotation: bool = False,
     msgpack_annotation: bool = False,
+    cbor_annotation: bool = False,
     avro_annotation: bool = False,
     protobuf_net_annotation: bool = False
 ):
@@ -1165,6 +1181,7 @@ def convert_avro_schema_to_csharp(
         newtonsoft_json_annotation (bool, optional): Use Newtonsoft.Json annotations. Defaults to False.
         system_xml_annotation (bool, optional): Use System.Xml.Serialization annotations. Defaults to False.
         msgpack_annotation (bool, optional): Use MessagePack annotations. Defaults to False.
+        cbor_annotation (bool, optional): Use Dahomey.Cbor annotations. Defaults to False.
         avro_annotation (bool, optional): Use Avro annotations. Defaults to False.
         protobuf_net_annotation (bool, optional): Use protobuf-net annotations. Defaults to False.
     """
@@ -1175,6 +1192,7 @@ def convert_avro_schema_to_csharp(
     avrotocs.newtonsoft_json_annotation = newtonsoft_json_annotation
     avrotocs.system_xml_annotation = system_xml_annotation
     avrotocs.msgpack_annotation = msgpack_annotation
+    avrotocs.cbor_annotation = cbor_annotation
     avrotocs.avro_annotation = avro_annotation
     avrotocs.protobuf_net_annotation = protobuf_net_annotation
     avrotocs.convert_schema(avro_schema, output_dir)

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/avrotojsons.py

@@ -184,16 +184,38 @@ class AvroToJsonSchemaConverter:
     def handle_type_union(self, types: List[Union[str, Dict[str, Any]]]) -> Dict[str, Any] | List[Dict[str, Any]| str] | str:
         """
         Handle Avro type unions, returning a JSON schema that validates against any of the types.
+        Preserves nullability from Avro unions containing 'null'.
         """
+        is_nullable = 'null' in types
         non_null_types = [t for t in types if t != 'null']
+        
         if len(non_null_types) == 1:
-            # Single non-null type
-            return self.parse_avro_schema(non_null_types[0])
+            # Single non-null type - check if it's a primitive that can use type array
+            single_type = non_null_types[0]
+            json_schema = self.parse_avro_schema(single_type)
+            
+            if is_nullable and isinstance(json_schema, dict):
+                # For primitives with a simple 'type' field, we can use type array notation
+                if 'type' in json_schema and isinstance(json_schema['type'], str) and '$ref' not in json_schema:
+                    # Primitive type - add null to type array
+                    json_schema = copy.deepcopy(json_schema)
+                    json_schema['type'] = [json_schema['type'], 'null']
+                elif '$ref' in json_schema:
+                    # Reference type - use oneOf with null
+                    json_schema = {
+                        'oneOf': [
+                            {'type': 'null'},
+                            json_schema
+                        ]
+                    }
+            return json_schema
         else:
             # Multiple non-null types
-            union_types = [self.convert_reference(t) if isinstance(t,str) and t in self.defined_types else self.avro_primitive_to_json_type(t)
+            union_types = [self.convert_reference(t) if isinstance(t, str) and t in self.defined_types else self.avro_primitive_to_json_type(t)
                             if isinstance(t, str) else self.parse_avro_schema(t)
                                 for t in non_null_types]
+            if is_nullable:
+                union_types.insert(0, {'type': 'null'})
             return {
                 'oneOf': union_types
             }

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/commands.json

@@ -1255,6 +1255,8 @@
         "system_text_json_annotation": "args.system_text_json_annotation",
         "newtonsoft_json_annotation": "args.newtonsoft_json_annotation",
         "system_xml_annotation": "args.system_xml_annotation",
+        "msgpack_annotation": "args.msgpack_annotation",
+        "cbor_annotation": "args.cbor_annotation",
         "pascal_properties": "args.pascal_properties",
         "base_namespace": "args.namespace"
       }
@@ -1323,6 +1325,20 @@
         "default": false,
         "required": false
       },
+      {
+        "name": "--msgpack-annotation",
+        "type": "bool",
+        "help": "Use MessagePack annotations",
+        "default": false,
+        "required": false
+      },
+      {
+        "name": "--cbor-annotation",
+        "type": "bool",
+        "help": "Use Dahomey.Cbor annotations",
+        "default": false,
+        "required": false
+      },
       {
         "name": "--pascal-properties",
         "type": "bool",
@@ -1375,6 +1391,7 @@
         "system_text_json_annotation": "args.system_text_json_annotation",
         "newtonsoft_json_annotation": "args.newtonsoft_json_annotation",
         "system_xml_annotation": "args.system_xml_annotation",
+        "avro_annotation": "args.avro_annotation",
         "pascal_properties": "args.pascal_properties",
         "base_namespace": "args.namespace",
         "project_name": "args.project_name"
@@ -1437,6 +1454,13 @@
         "default": false,
         "required": false
       },
+      {
+        "name": "--avro-annotation",
+        "type": "bool",
+        "help": "Use Avro annotations",
+        "default": false,
+        "required": false
+      },
       {
         "name": "--pascal-properties",
         "type": "bool",
@@ -1468,6 +1492,13 @@
         "default": false,
         "required": false
       },
+      {
+        "name": "--avro-annotation",
+        "message": "Use Avro annotations?",
+        "type": "bool",
+        "default": false,
+        "required": false
+      },
       {
         "name": "--pascal-properties",
         "message": "Use PascalCase properties?",

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/constants.py

@@ -70,6 +70,11 @@ try:
 except ValueError:
     MSGPACK_VERSION = '2.5.187'
 
+try:
+    CBOR_VERSION = get_dependency_version('cs', 'net90', 'Dahomey.Cbor')
+except ValueError:
+    CBOR_VERSION = '1.25.1'
+
 # Java test dependencies
 try:
     JUNIT_VERSION = get_dependency_version('java', 'jdk21', 'org.junit.jupiter:junit-jupiter-api')

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/dependencies/cs/net90/dependencies.csproj

@@ -18,6 +18,7 @@
         <PackageReference Include="System.Memory.Data" Version="9.0.3" />
         <PackageReference Include="protobuf-net" Version="3.2.30" />
         <PackageReference Include="MessagePack" Version="3.1.4" />
+        <PackageReference Include="Dahomey.Cbor" Version="1.25.1" />
     </ItemGroup>
 
     <!-- Testing -->

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/structuretocsharp/dataclass_core.jinja

@@ -1,4 +1,11 @@
-    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation %}
+    {%- if avro_annotation %}
+    /// <summary>
+    /// The Avro schema for this class
+    /// </summary>
+    private static readonly Avro.Schema AvroSchema = Avro.Schema.Parse("{{ avro_schema_json }}");
+    {%- endif %}
+
+    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or avro_annotation %}
     /// <summary>
     /// Creates an object from the data
     /// </summary>
@@ -11,7 +18,7 @@
         if ( data is {{ class_name }}) return ({{ class_name }})data;
         if ( contentTypeString == null ) contentTypeString = System.Net.Mime.MediaTypeNames.Application.Octet;
         var contentType = new System.Net.Mime.ContentType(contentTypeString);
-    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation %}
+    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or avro_annotation %}
         if ( contentType.MediaType.EndsWith("+gzip"))
         {
             var stream = data switch
@@ -92,12 +99,72 @@
                 return ({{ class_name }}?)serializer.Deserialize(memoryStream);
             }
         }
+    {%- endif %}
+    {%- if avro_annotation %}
+        if ( contentType.MediaType == "avro/binary" || contentType.MediaType == "application/vnd.apache.avro+avro")
+        {
+            if (data is byte[])
+            {
+                using (var stream = new System.IO.MemoryStream((byte[])data))
+                {
+                    var reader = new Avro.Generic.GenericDatumReader<Avro.Generic.GenericRecord>(AvroSchema, AvroSchema);
+                    var decoder = new Avro.IO.BinaryDecoder(stream);
+                    var record = reader.Read(null, decoder);
+                    return FromAvroRecord(record);
+                }
+            }
+            else if (data is System.IO.Stream)
+            {
+                var reader = new Avro.Generic.GenericDatumReader<Avro.Generic.GenericRecord>(AvroSchema, AvroSchema);
+                var decoder = new Avro.IO.BinaryDecoder((System.IO.Stream)data);
+                var record = reader.Read(null, decoder);
+                return FromAvroRecord(record);
+            }
+            else if (data is System.BinaryData)
+            {
+                using (var stream = new System.IO.MemoryStream(((System.BinaryData)data).ToArray()))
+                {
+                    var reader = new Avro.Generic.GenericDatumReader<Avro.Generic.GenericRecord>(AvroSchema, AvroSchema);
+                    var decoder = new Avro.IO.BinaryDecoder(stream);
+                    var record = reader.Read(null, decoder);
+                    return FromAvroRecord(record);
+                }
+            }
+        }
     {%- endif %}
         throw new System.NotSupportedException($"Unsupported media type {contentType.MediaType}");
     }
     {%- endif %}
 
-    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation %}
+    {%- if avro_annotation %}
+    /// <summary>
+    /// Creates an instance from an Avro GenericRecord
+    /// </summary>
+    /// <param name="record">The Avro record</param>
+    /// <returns>The converted object</returns>
+    /// <remarks>
+    /// This method uses JSON as an intermediate format for conversion. This approach works well
+    /// for simple types but may have limitations with complex Avro union types that use 
+    /// different JSON encoding than System.Text.Json. For complex schemas with unions,
+    /// consider implementing custom mapping logic directly from GenericRecord properties.
+    /// </remarks>
+    private static {{ class_name }}? FromAvroRecord(Avro.Generic.GenericRecord record)
+    {
+        // Convert Avro record to JSON and then deserialize
+        // This approach works for simple cases; for complex types, you may need custom mapping
+        using (var jsonStream = new System.IO.MemoryStream())
+        {
+            var jsonEncoder = new Avro.IO.JsonEncoder(AvroSchema, jsonStream);
+            var writer = new Avro.Generic.GenericDatumWriter<Avro.Generic.GenericRecord>(AvroSchema);
+            writer.Write(record, jsonEncoder);
+            jsonEncoder.Flush();
+            jsonStream.Position = 0;
+            return System.Text.Json.JsonSerializer.Deserialize<{{ class_name }}>(jsonStream);
+        }
+    }
+    {%- endif %}
+
+    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or avro_annotation %}
     /// <summary>
     /// Converts the object to a byte array
     /// </summary>
@@ -138,6 +205,20 @@
                 }
             }
         }
+    {%- endif %}
+    {%- if avro_annotation %}
+        if (contentType.MediaType == "avro/binary" || contentType.MediaType == "application/vnd.apache.avro+avro")
+        {
+            using (var stream = new System.IO.MemoryStream())
+            {
+                var record = ToAvroRecord();
+                var writer = new Avro.Generic.GenericDatumWriter<Avro.Generic.GenericRecord>(AvroSchema);
+                var encoder = new Avro.IO.BinaryEncoder(stream);
+                writer.Write(record, encoder);
+                encoder.Flush();
+                result = stream.ToArray();
+            }
+        }
     {%- endif %}
         if ( result == null ) throw new System.NotSupportedException($"Unsupported media type {contentType.MediaType}");
         if ( contentType.MediaType.EndsWith("+gzip"))
@@ -154,3 +235,29 @@
         return result;
     }
     {%- endif %}
+
+    {%- if avro_annotation %}
+    /// <summary>
+    /// Converts this object to an Avro GenericRecord
+    /// </summary>
+    /// <returns>The Avro record</returns>
+    /// <remarks>
+    /// This method uses JSON as an intermediate format for conversion. This approach works well
+    /// for simple types but may have limitations with complex types containing unions, as
+    /// Avro's JSON encoding for unions differs from System.Text.Json's encoding. For complex
+    /// schemas with unions or other advanced Avro features, consider implementing custom
+    /// mapping logic directly to GenericRecord properties.
+    /// </remarks>
+    private Avro.Generic.GenericRecord ToAvroRecord()
+    {
+        // Convert to JSON first, then use Avro's JSON decoder
+        // This approach works for simple cases; for complex types, you may need custom mapping
+        var jsonBytes = System.Text.Json.JsonSerializer.SerializeToUtf8Bytes(this, this.GetType());
+        using (var jsonStream = new System.IO.MemoryStream(jsonBytes))
+        {
+            var decoder = new Avro.IO.JsonDecoder(AvroSchema, jsonStream);
+            var reader = new Avro.Generic.GenericDatumReader<Avro.Generic.GenericRecord>(AvroSchema, AvroSchema);
+            return reader.Read(reuse: null, decoder);
+        }
+    }
+    {%- endif %}

{avrotize-2.22.0 → avrotize-2.22.2}/avrotize/structuretocsharp/project.csproj.jinja

@@ -11,6 +11,9 @@
         {%- if system_text_json_annotation %}
         <PackageReference Include="System.Text.Json" Version="{{ SYSTEM_TEXT_JSON_VERSION }}" />
         {%- endif %}
+        {%- if avro_annotation %}
+        <PackageReference Include="Apache.Avro" Version="{{ CSHARP_AVRO_VERSION }}" />
+        {%- endif %}
         <PackageReference Include="System.Memory.Data" Version="{{ SYSTEM_MEMORY_DATA_VERSION }}" />
     </ItemGroup>
 </Project>