Add ability to inject and read additional properties for IJsonModels

.vscode/cspell.json

@@ -151,6 +151,7 @@
     "referer",
     "renormalize",
     "retriable",
+    "SCME",
     "Serp",
     "Servfail",
     "setsas",

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>;
         }
 

sdk/core/System.ClientModel/api/System.ClientModel.net8.0.cs

@@ -263,6 +263,130 @@ public JsonModelConverter(System.ClientModel.Primitives.ModelReaderWriterOptions
         public override System.ClientModel.Primitives.IJsonModel<object>? Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options) { throw null; }
         public override void Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.IJsonModel<object> value, System.Text.Json.JsonSerializerOptions options) { }
     }
+    [System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0001")]
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public partial struct JsonPatch
+    {
+        private object _dummy;
+        private int _dummyPrimitive;
+        public JsonPatch(System.ReadOnlyMemory<byte> utf8Json) { throw null; }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, System.BinaryData utf8Json) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, bool value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, byte value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, byte[] utf8Json) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, System.DateTime value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, System.DateTimeOffset value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, decimal value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, double value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, System.Guid value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, short value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, int value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, long value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, System.ReadOnlySpan<byte> utf8Json) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, sbyte value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, float value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, string value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, System.TimeSpan value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, ushort value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, uint value) { }
+        public void Append(System.ReadOnlySpan<byte> arrayPath, ulong value) { }
+        public void AppendNull(System.ReadOnlySpan<byte> arrayPath) { }
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public bool Contains(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public bool Contains(System.ReadOnlySpan<byte> prefix, System.ReadOnlySpan<byte> property) { throw null; }
+        public bool GetBoolean(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public byte GetByte(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public System.DateTime GetDateTime(System.ReadOnlySpan<byte> jsonPath, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; }
+        public System.DateTimeOffset GetDateTimeOffset(System.ReadOnlySpan<byte> jsonPath, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; }
+        public decimal GetDecimal(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public double GetDouble(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public float GetFloat(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public System.Guid GetGuid(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public short GetInt16(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public int GetInt32(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public long GetInt64(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public sbyte GetInt8(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public System.BinaryData GetJson(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public T? GetNullableValue<T>(System.ReadOnlySpan<byte> jsonPath) where T : struct { throw null; }
+        public string? GetString(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public System.TimeSpan GetTimeSpan(System.ReadOnlySpan<byte> jsonPath, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; }
+        public ushort GetUInt16(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public uint GetUInt32(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public ulong GetUInt64(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public bool IsRemoved(System.ReadOnlySpan<byte> jsonPath) { throw null; }
+        public void Remove(System.ReadOnlySpan<byte> jsonPath) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, System.BinaryData utf8Json) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, bool value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, byte value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, byte[] utf8Json) { }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public void Set(System.ReadOnlySpan<byte> jsonPath, System.ClientModel.Primitives.JsonPatch.EncodedValue value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, System.DateTime value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, System.DateTimeOffset value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, decimal value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, double value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, System.Guid value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, short value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, int value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, long value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, System.ReadOnlySpan<byte> utf8Json) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, sbyte value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, float value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, string value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, System.TimeSpan value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, ushort value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, uint value) { }
+        public void Set(System.ReadOnlySpan<byte> jsonPath, ulong value) { }
+        public void SetNull(System.ReadOnlySpan<byte> jsonPath) { }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public void SetPropagators(System.ClientModel.Primitives.JsonPatch.PropagatorSetter setter, System.ClientModel.Primitives.JsonPatch.PropagatorGetter getter, System.ClientModel.Primitives.JsonPatch.PropagatorIsFlattened? isFlattened) { }
+        public override string ToString() { throw null; }
+        public string ToString(string format) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public bool TryGetEncodedValue(System.ReadOnlySpan<byte> jsonPath, out System.ClientModel.Primitives.JsonPatch.EncodedValue value) { throw null; }
+        public bool TryGetJson(System.ReadOnlySpan<byte> jsonPath, out System.ReadOnlyMemory<byte> value) { throw null; }
+        public bool TryGetNullableValue<T>(System.ReadOnlySpan<byte> jsonPath, out T? value) where T : struct { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out bool value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out byte value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out System.DateTime value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out System.DateTimeOffset value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out decimal value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out double value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out System.Guid value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out short value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out int value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out long value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out sbyte value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out float value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out string? value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out System.TimeSpan value, System.Buffers.StandardFormat format = default(System.Buffers.StandardFormat)) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out ushort value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out uint value) { throw null; }
+        public bool TryGetValue(System.ReadOnlySpan<byte> jsonPath, out ulong value) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public void WriteTo(System.Text.Json.Utf8JsonWriter writer) { }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public void WriteTo(System.Text.Json.Utf8JsonWriter writer, System.ReadOnlySpan<byte> jsonPath) { }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+        public readonly partial struct EncodedValue
+        {
+            private readonly object _dummy;
+            private readonly int _dummyPrimitive;
+        }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public delegate bool PropagatorGetter(System.ReadOnlySpan<byte> jsonPath, out System.ClientModel.Primitives.JsonPatch.EncodedValue value);
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public delegate bool PropagatorIsFlattened(System.ReadOnlySpan<byte> jsonPath);
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public delegate bool PropagatorSetter(System.ReadOnlySpan<byte> jsonPath, System.ClientModel.Primitives.JsonPatch.EncodedValue value);
+    }
+    [System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0001")]
+    public static partial class JsonPatchExtensions
+    {
+        public static void Append<T>(this ref System.ClientModel.Primitives.JsonPatch jsonPatch, System.ReadOnlySpan<byte> jsonPath, T value) where T : System.ClientModel.Primitives.IJsonModel<T> { }
+        public static void Set<T>(this ref System.ClientModel.Primitives.JsonPatch jsonPatch, System.ReadOnlySpan<byte> jsonPath, T value) where T : System.ClientModel.Primitives.IJsonModel<T> { }
+    }
     public partial class MessageLoggingPolicy : System.ClientModel.Primitives.PipelinePolicy
     {
         public MessageLoggingPolicy(System.ClientModel.Primitives.ClientLoggingOptions? options = null) { }