Add ability to inject and read additional properties for IJsonModels

sdk/core/Azure.Core/tests/common/ModelReaderWriter/Models/DiscriminatorSet/BaseModel.cs

@@ -12,11 +12,11 @@ namespace Azure.Core.Tests.ModelReaderWriterTests.Models
     [PersistableModelProxy(typeof(UnknownBaseModel))]
     public abstract class BaseModel : IUtf8JsonSerializable, IJsonModel<BaseModel>
     {
-        private Dictionary<string, BinaryData> _rawData;
+        private Dictionary<string, BinaryData> _serializedAdditionalRawData;
 
         protected internal BaseModel(Dictionary<string, BinaryData> rawData)
         {
-            _rawData = rawData ?? new Dictionary<string, BinaryData>();
+            _serializedAdditionalRawData = rawData ?? new Dictionary<string, BinaryData>();
         }
 
         public string Kind { get; internal set; }
@@ -25,7 +25,7 @@ protected internal BaseModel(Dictionary<string, BinaryData> rawData)
         protected internal void SerializeRawData(Utf8JsonWriter writer)
         {
             //write out the raw data
-            foreach (var property in _rawData)
+            foreach (var property in _serializedAdditionalRawData)
             {
                 writer.WritePropertyName(property.Key);
 #if NET6_0_OR_GREATER

sdk/core/Azure.Core/tests/common/ModelReaderWriter/Models/ModelAsStruct.cs

@@ -14,7 +14,7 @@ namespace Azure.Core.Tests.ModelReaderWriterTests.Models
     /// <summary> The InputAdditionalPropertiesModelStruct. </summary>
     public readonly partial struct ModelAsStruct : IUtf8JsonSerializable, IJsonModel<ModelAsStruct>, IJsonModel<object>
     {
-        private readonly Dictionary<string, BinaryData> _rawData;
+        private readonly Dictionary<string, BinaryData> _serializedAdditionalRawData;
 
         /// <summary> Initializes a new instance of InputAdditionalPropertiesModelStruct. </summary>
         /// <param name="id"></param>
@@ -24,7 +24,7 @@ namespace Azure.Core.Tests.ModelReaderWriterTests.Models
         public ModelAsStruct(int id, Dictionary<string, BinaryData> rawData)
         {
             Id = id;
-            _rawData = rawData;
+            _serializedAdditionalRawData = rawData;
         }
 
         /// <summary> Gets the id. </summary>
@@ -41,9 +41,9 @@ private void Serialize(Utf8JsonWriter writer, ModelReaderWriterOptions options)
             writer.WriteStartObject();
             writer.WritePropertyName("id"u8);
             writer.WriteNumberValue(Id);
-            if (_rawData is not null && options.Format == "J")
+            if (_serializedAdditionalRawData is not null && options.Format == "J")
             {
-                foreach (var property in _rawData)
+                foreach (var property in _serializedAdditionalRawData)
                 {
                     writer.WritePropertyName(property.Key);
 #if NET6_0_OR_GREATER

sdk/core/Azure.Core/tests/public/ModelReaderWriterTests/ModelTests.cs

@@ -117,7 +117,7 @@ internal static Dictionary<string, BinaryData> GetRawData(object model)
             {
                 modelType = modelType.BaseType;
             }
-            var propertyInfo = modelType.GetField("_rawData", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            var propertyInfo = modelType.GetField("_serializedAdditionalRawData", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
             return propertyInfo.GetValue(model) as Dictionary<string, BinaryData>;
         }