Skip to content

[Azure.Core] Update options to use Format string #37467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m-nash merged 18 commits into from
Jul 18, 2023
Merged

[Azure.Core] Update options to use Format string #37467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c282e04
wip
nisha-bhatia Jul 6, 2023
8672626
wip
nisha-bhatia Jul 7, 2023
16ae5fa
Update UsingJsonSerializerTests.cs
nisha-bhatia Jul 7, 2023
bbd5d00
wip
nisha-bhatia Jul 7, 2023
459edf0
Update Serialization.md
nisha-bhatia Jul 7, 2023
851f50a
wip
nisha-bhatia Jul 7, 2023
128fac3
wip
nisha-bhatia Jul 11, 2023
7eaa0f8
wip
nisha-bhatia Jul 12, 2023
768c04d
Merge branch 'feature/updateSerializer' into formatString
nisha-bhatia Jul 12, 2023
4e12147
wip
nisha-bhatia Jul 12, 2023
51cf36c
wip
nisha-bhatia Jul 13, 2023
2448542
wip
nisha-bhatia Jul 13, 2023
2a76499
wip
nisha-bhatia Jul 14, 2023
d075c98
wip
nisha-bhatia Jul 14, 2023
a5549be
Update ModelSerializerOptions.cs
nisha-bhatia Jul 17, 2023
266bff2
wip
nisha-bhatia Jul 17, 2023
7d32e06
Update ModelSerializerOptions.cs
nisha-bhatia Jul 17, 2023
1729e63
Update ModelSerializerOptions.cs
nisha-bhatia Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions sdk/core/Azure.Core/api/Azure.Core.net461.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,9 +1131,8 @@ public enum JsonPropertyNames
}
public partial class ModelJsonConverter : System.Text.Json.Serialization.JsonConverter<Azure.Core.Serialization.IModelSerializable>
{
public ModelJsonConverter() { }
public ModelJsonConverter(bool ignoreAdditionalProperties) { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public ModelJsonConverter(string format = "D") { }
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public override bool CanConvert(System.Type typeToConvert) { throw null; }
public override Azure.Core.Serialization.IModelSerializable 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, Azure.Core.Serialization.IModelSerializable value, System.Text.Json.JsonSerializerOptions options) { }
Expand All @@ -1143,11 +1142,29 @@ public static partial class ModelSerializer
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
public static System.BinaryData Serialize<T>(T model, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct ModelSerializerFormat : System.IEquatable<Azure.Core.Serialization.ModelSerializerFormat>
{
private readonly object _dummy;
private readonly int _dummyPrimitive;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Data;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Wire;
public ModelSerializerFormat(string value) { throw null; }
public bool Equals(Azure.Core.Serialization.ModelSerializerFormat other) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals(object obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public static bool operator ==(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public static implicit operator string (Azure.Core.Serialization.ModelSerializerFormat value) { throw null; }
public static implicit operator Azure.Core.Serialization.ModelSerializerFormat (string value) { throw null; }
public static bool operator !=(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public override string ToString() { throw null; }
}
public partial class ModelSerializerOptions
{
public ModelSerializerOptions() { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public bool IgnoreReadOnlyProperties { get { throw null; } set { } }
public Azure.Core.Serialization.ModelSerializerFormat Format;
public ModelSerializerOptions(string format = "D") { }
public System.Collections.Generic.Dictionary<System.Type, Azure.Core.Serialization.ObjectSerializer> Serializers { get { throw null; } }
}
public abstract partial class ObjectSerializer
Expand Down
29 changes: 23 additions & 6 deletions sdk/core/Azure.Core/api/Azure.Core.net5.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,9 +1131,8 @@ public enum JsonPropertyNames
}
public partial class ModelJsonConverter : System.Text.Json.Serialization.JsonConverter<Azure.Core.Serialization.IModelSerializable>
{
public ModelJsonConverter() { }
public ModelJsonConverter(bool ignoreAdditionalProperties) { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public ModelJsonConverter(string format = "D") { }
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public override bool CanConvert(System.Type typeToConvert) { throw null; }
public override Azure.Core.Serialization.IModelSerializable 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, Azure.Core.Serialization.IModelSerializable value, System.Text.Json.JsonSerializerOptions options) { }
Expand All @@ -1143,11 +1142,29 @@ public static partial class ModelSerializer
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
public static System.BinaryData Serialize<T>(T model, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct ModelSerializerFormat : System.IEquatable<Azure.Core.Serialization.ModelSerializerFormat>
{
private readonly object _dummy;
private readonly int _dummyPrimitive;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Data;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Wire;
public ModelSerializerFormat(string value) { throw null; }
public bool Equals(Azure.Core.Serialization.ModelSerializerFormat other) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals([System.Diagnostics.CodeAnalysis.AllowNullAttribute] object obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public static bool operator ==(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public static implicit operator string (Azure.Core.Serialization.ModelSerializerFormat value) { throw null; }
public static implicit operator Azure.Core.Serialization.ModelSerializerFormat (string value) { throw null; }
public static bool operator !=(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public override string ToString() { throw null; }
}
public partial class ModelSerializerOptions
{
public ModelSerializerOptions() { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public bool IgnoreReadOnlyProperties { get { throw null; } set { } }
public Azure.Core.Serialization.ModelSerializerFormat Format;
public ModelSerializerOptions(string format = "D") { }
public System.Collections.Generic.Dictionary<System.Type, Azure.Core.Serialization.ObjectSerializer> Serializers { get { throw null; } }
}
public abstract partial class ObjectSerializer
Expand Down
29 changes: 23 additions & 6 deletions sdk/core/Azure.Core/api/Azure.Core.net6.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,9 +1131,8 @@ public enum JsonPropertyNames
}
public partial class ModelJsonConverter : System.Text.Json.Serialization.JsonConverter<Azure.Core.Serialization.IModelSerializable>
{
public ModelJsonConverter() { }
public ModelJsonConverter(bool ignoreAdditionalProperties) { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public ModelJsonConverter(string format = "D") { }
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public override bool CanConvert(System.Type typeToConvert) { throw null; }
public override Azure.Core.Serialization.IModelSerializable 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, Azure.Core.Serialization.IModelSerializable value, System.Text.Json.JsonSerializerOptions options) { }
Expand All @@ -1143,11 +1142,29 @@ public static partial class ModelSerializer
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
public static System.BinaryData Serialize<T>(T model, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct ModelSerializerFormat : System.IEquatable<Azure.Core.Serialization.ModelSerializerFormat>
{
private readonly object _dummy;
private readonly int _dummyPrimitive;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Data;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Wire;
public ModelSerializerFormat(string value) { throw null; }
public bool Equals(Azure.Core.Serialization.ModelSerializerFormat other) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals([System.Diagnostics.CodeAnalysis.AllowNullAttribute] object obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public static bool operator ==(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public static implicit operator string (Azure.Core.Serialization.ModelSerializerFormat value) { throw null; }
public static implicit operator Azure.Core.Serialization.ModelSerializerFormat (string value) { throw null; }
public static bool operator !=(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public override string ToString() { throw null; }
}
public partial class ModelSerializerOptions
{
public ModelSerializerOptions() { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public bool IgnoreReadOnlyProperties { get { throw null; } set { } }
public Azure.Core.Serialization.ModelSerializerFormat Format;
public ModelSerializerOptions(string format = "D") { }
public System.Collections.Generic.Dictionary<System.Type, Azure.Core.Serialization.ObjectSerializer> Serializers { get { throw null; } }
}
public abstract partial class ObjectSerializer
Expand Down
29 changes: 23 additions & 6 deletions sdk/core/Azure.Core/api/Azure.Core.netcoreapp2.1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,9 +1131,8 @@ public enum JsonPropertyNames
}
public partial class ModelJsonConverter : System.Text.Json.Serialization.JsonConverter<Azure.Core.Serialization.IModelSerializable>
{
public ModelJsonConverter() { }
public ModelJsonConverter(bool ignoreAdditionalProperties) { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public ModelJsonConverter(string format = "D") { }
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public override bool CanConvert(System.Type typeToConvert) { throw null; }
public override Azure.Core.Serialization.IModelSerializable 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, Azure.Core.Serialization.IModelSerializable value, System.Text.Json.JsonSerializerOptions options) { }
Expand All @@ -1143,11 +1142,29 @@ public static partial class ModelSerializer
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
public static System.BinaryData Serialize<T>(T model, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct ModelSerializerFormat : System.IEquatable<Azure.Core.Serialization.ModelSerializerFormat>
{
private readonly object _dummy;
private readonly int _dummyPrimitive;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Data;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Wire;
public ModelSerializerFormat(string value) { throw null; }
public bool Equals(Azure.Core.Serialization.ModelSerializerFormat other) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals(object obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public static bool operator ==(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public static implicit operator string (Azure.Core.Serialization.ModelSerializerFormat value) { throw null; }
public static implicit operator Azure.Core.Serialization.ModelSerializerFormat (string value) { throw null; }
public static bool operator !=(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public override string ToString() { throw null; }
}
public partial class ModelSerializerOptions
{
public ModelSerializerOptions() { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public bool IgnoreReadOnlyProperties { get { throw null; } set { } }
public Azure.Core.Serialization.ModelSerializerFormat Format;
public ModelSerializerOptions(string format = "D") { }
public System.Collections.Generic.Dictionary<System.Type, Azure.Core.Serialization.ObjectSerializer> Serializers { get { throw null; } }
}
public abstract partial class ObjectSerializer
Expand Down
29 changes: 23 additions & 6 deletions sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,9 +1131,8 @@ public enum JsonPropertyNames
}
public partial class ModelJsonConverter : System.Text.Json.Serialization.JsonConverter<Azure.Core.Serialization.IModelSerializable>
{
public ModelJsonConverter() { }
public ModelJsonConverter(bool ignoreAdditionalProperties) { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public ModelJsonConverter(string format = "D") { }
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public override bool CanConvert(System.Type typeToConvert) { throw null; }
public override Azure.Core.Serialization.IModelSerializable 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, Azure.Core.Serialization.IModelSerializable value, System.Text.Json.JsonSerializerOptions options) { }
Expand All @@ -1143,11 +1142,29 @@ public static partial class ModelSerializer
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
public static System.BinaryData Serialize<T>(T model, Azure.Core.Serialization.ModelSerializerOptions? options = null) where T : class, Azure.Core.Serialization.IModelSerializable { throw null; }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct ModelSerializerFormat : System.IEquatable<Azure.Core.Serialization.ModelSerializerFormat>
{
private readonly object _dummy;
private readonly int _dummyPrimitive;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Data;
public static readonly Azure.Core.Serialization.ModelSerializerFormat Wire;
public ModelSerializerFormat(string value) { throw null; }
public bool Equals(Azure.Core.Serialization.ModelSerializerFormat other) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals(object obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public static bool operator ==(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public static implicit operator string (Azure.Core.Serialization.ModelSerializerFormat value) { throw null; }
public static implicit operator Azure.Core.Serialization.ModelSerializerFormat (string value) { throw null; }
public static bool operator !=(Azure.Core.Serialization.ModelSerializerFormat left, Azure.Core.Serialization.ModelSerializerFormat right) { throw null; }
public override string ToString() { throw null; }
}
public partial class ModelSerializerOptions
{
public ModelSerializerOptions() { }
public bool IgnoreAdditionalProperties { get { throw null; } set { } }
public bool IgnoreReadOnlyProperties { get { throw null; } set { } }
public Azure.Core.Serialization.ModelSerializerFormat Format;
public ModelSerializerOptions(string format = "D") { }
public System.Collections.Generic.Dictionary<System.Type, Azure.Core.Serialization.ObjectSerializer> Serializers { get { throw null; } }
}
public abstract partial class ObjectSerializer
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/Azure.Core/samples/Serialization.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ DogListProperty dog = new DogListProperty
};

JsonSerializerOptions options = new JsonSerializerOptions();
options.Converters.Add(new ModelJsonConverter(false));
options.Converters.Add(new ModelJsonConverter());

string json = System.Text.Json.JsonSerializer.Serialize(dog, options);
```
Expand All @@ -90,7 +90,7 @@ string json = System.Text.Json.JsonSerializer.Serialize(dog, options);
string json = @"[{""LatinName"":""Animalia"",""Weight"":1.1,""Name"":""Doggo"",""IsHungry"":false,""FoodConsumed"":[""kibble"",""egg"",""peanut butter""],""NumberOfLegs"":4}]";

JsonSerializerOptions options = new JsonSerializerOptions();
options.Converters.Add(new ModelJsonConverter(false));
options.Converters.Add(new ModelJsonConverter());

DogListProperty dog = System.Text.Json.JsonSerializer.Deserialize<DogListProperty>(json, options);
```
Expand Down
Loading