Skip to content

Commit

Permalink
fixing the issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArcturusZhang
ArcturusZhang committed Jan 16, 2024
1 parent e1b176a commit ec36921
Show file tree
Hide file tree
Showing 10 changed files with 126 additions and 36 deletions.
99 changes: 81 additions & 18 deletions src/AutoRest.CSharp/Common/Output/Builders/JsonSerializationMethodsBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information.

using System;
using System.ClientModel;
using System.ClientModel.Primitives;
using System.Collections.Generic;
using System.Data;
Expand Down Expand Up @@ -620,7 +619,7 @@ private static IEnumerable<MethodBodyStatement> BuildDeserializeBody(JsonObjectS
// We could only do this when there is a discriminator, and the discriminator does not have a value (having a value indicating it is the child instead of base), and there is an unknown default object type to fall back, and I am not that fallback type.
if (discriminator is { Value: null, DefaultObjectType: { } defaultObjectType } && !serialization.Type.Equals(defaultObjectType.Type))
{
yield return Return(GetDeserializeImplementation(discriminator.DefaultObjectType.Type.Implementation, jsonElement, null));
yield return Return(GetDeserializeImplementation(discriminator.DefaultObjectType.Type.Implementation, jsonElement, null, out _));
}
else
{
Expand All @@ -632,7 +631,7 @@ private static IEnumerable<SwitchCase> GetDiscriminatorCases(JsonElementExpressi
{
foreach (var implementation in discriminator.Implementations)
{
yield return new SwitchCase(Literal(implementation.Key), Return(GetDeserializeImplementation(implementation.Type.Implementation, element, null)), true);
yield return new SwitchCase(Literal(implementation.Key), Return(GetDeserializeImplementation(implementation.Type.Implementation, element, null, out _)), true);
}
}

Expand Down Expand Up @@ -701,10 +700,18 @@ serialization.Discriminator.Value is not null &&
private static IEnumerable<MethodBodyStatement> DeserializeIntoObjectProperties(IEnumerable<JsonPropertySerialization> propertySerializations, JsonAdditionalPropertiesSerialization additionalPropertiesSerialization, JsonPropertyExpression jsonProperty, DictionaryExpression dictionary, ModelReaderWriterOptionsExpression? options, IReadOnlyDictionary<JsonPropertySerialization, VariableReference> propertyVariables, bool shouldTreatEmptyStringAsNull)
{
yield return DeserializeIntoObjectProperties(propertySerializations, jsonProperty, propertyVariables, shouldTreatEmptyStringAsNull);
// in the case here, this line returns an empty statement, we only want the value here
yield return DeserializeValue(additionalPropertiesSerialization.ValueSerialization!, jsonProperty.Value, out var value);
var deserializeStatements = DeserializeValue(additionalPropertiesSerialization.ValueSerialization!, jsonProperty.Value, out var value, out var condition);
var additionalPropertiesStatement = dictionary.Add(jsonProperty.Name, value);

if (condition is not null)
{
additionalPropertiesStatement = new IfStatement(condition)
{
deserializeStatements,
additionalPropertiesStatement
};
}

yield return Serializations.WrapInCheckNotWire(
additionalPropertiesSerialization,
options?.Format,
Expand Down Expand Up @@ -908,11 +915,11 @@ public static MethodBodyStatement BuildDeserializationForMethods(JsonSerializati

public static MethodBodyStatement DeserializeValue(JsonSerialization serialization, JsonElementExpression element, out ValueExpression value, out BoolExpression? condition)
{
condition = null;
switch (serialization)
{
case JsonArraySerialization jsonReadOnlyMemory when TypeFactory.IsArray(jsonReadOnlyMemory.ImplementationType):
var readOnlyMemory = new VariableReference(jsonReadOnlyMemory.ImplementationType, "array");
condition = element.ValueKindEquals(JsonValueKind.Array);
value = readOnlyMemory;
VariableReference index = new VariableReference(typeof(int), "index");

Expand All @@ -929,6 +936,7 @@ public static MethodBodyStatement DeserializeValue(JsonSerialization serializati

case JsonArraySerialization jsonArray:
var array = new VariableReference(jsonArray.ImplementationType, "array");
condition = element.ValueKindEquals(JsonValueKind.Array);
value = array;

return new MethodBodyStatement[]
Expand All @@ -949,16 +957,17 @@ public static MethodBodyStatement DeserializeValue(JsonSerialization serializati
DeserializeDictionaryValue(jsonDictionary.ValueSerialization, dictionary, new JsonPropertyExpression(property))
}
};
condition = element.ValueKindEquals(JsonValueKind.Object);
value = dictionary;
return deserializeDictionaryStatement;

case JsonValueSerialization { Options: JsonSerializationOptions.UseManagedServiceIdentityV3 } valueSerialization:
var declareSerializeOptions = Var("serializeOptions", New.JsonSerializerOptions(), out var serializeOptions);
value = GetDeserializeValueExpression(element, valueSerialization.Type, valueSerialization.Format, serializeOptions);
value = GetDeserializeValueExpression(element, valueSerialization.Type, out condition, valueSerialization.Format, serializeOptions);
return declareSerializeOptions;

case JsonValueSerialization valueSerialization:
value = GetDeserializeValueExpression(element, valueSerialization.Type, valueSerialization.Format);
value = GetDeserializeValueExpression(element, valueSerialization.Type, out condition, valueSerialization.Format);
return EmptyStatement;

default:
Expand Down Expand Up @@ -1015,10 +1024,13 @@ private static MethodBodyStatement DeserializeDictionaryValue(JsonSerialization
}

public static ValueExpression GetDeserializeValueExpression(JsonElementExpression element, CSharpType serializationType, SerializationFormat serializationFormat = SerializationFormat.Default, ValueExpression? serializerOptions = null)
=> GetDeserializeValueExpression(element, serializationType, out _, serializationFormat, serializerOptions);

public static ValueExpression GetDeserializeValueExpression(JsonElementExpression element, CSharpType serializationType, out BoolExpression? condition, SerializationFormat serializationFormat = SerializationFormat.Default, ValueExpression? serializerOptions = null)
{
if (serializationType.SerializeAs != null)
{
return GetFrameworkTypeValueExpression(serializationType.SerializeAs, element, serializationFormat, serializationType).CastTo(serializationType);
return GetFrameworkTypeValueExpression(serializationType.SerializeAs, element, serializationFormat, serializationType, out condition).CastTo(serializationType);
}

if (serializationType.IsFrameworkType)
Expand All @@ -1029,30 +1041,36 @@ public static ValueExpression GetDeserializeValueExpression(JsonElementExpressio
frameworkType = serializationType.Arguments[0].FrameworkType;
}

return GetFrameworkTypeValueExpression(frameworkType, element, serializationFormat, serializationType);
return GetFrameworkTypeValueExpression(frameworkType, element, serializationFormat, serializationType, out condition);
}

return GetDeserializeImplementation(serializationType.Implementation, element, serializerOptions);
return GetDeserializeImplementation(serializationType.Implementation, element, serializerOptions, out condition);
}

public static ValueExpression GetDeserializeImplementation(TypeProvider implementation, JsonElementExpression element, ValueExpression? serializerOptions)
public static ValueExpression GetDeserializeImplementation(TypeProvider implementation, JsonElementExpression element, ValueExpression? serializerOptions) => GetDeserializeImplementation(implementation, element, serializerOptions);

private static ValueExpression GetDeserializeImplementation(TypeProvider implementation, JsonElementExpression element, ValueExpression? serializerOptions, out BoolExpression? condition)
{
switch (implementation)
{
case SystemObjectType systemObjectType when IsCustomJsonConverterAdded(systemObjectType.SystemType):
condition = element.ValueKindEquals(JsonValueKind.Object);
return InvokeJsonSerializerDeserializeMethod(element, implementation.Type, serializerOptions);

case Resource { ResourceData: SerializableObjectType resourceDataType } resource:
condition = element.ValueKindEquals(JsonValueKind.Object);
return New.Instance(resource.Type, new MemberExpression(null, "Client"), SerializableObjectTypeExpression.Deserialize(resourceDataType, element));

case MgmtObjectType mgmtObjectType when TypeReferenceTypeChooser.HasMatch(mgmtObjectType.ObjectSchema):
condition = element.ValueKindEquals(JsonValueKind.Object);
return InvokeJsonSerializerDeserializeMethod(element, implementation.Type);

case SerializableObjectType type:
condition = element.ValueKindEquals(JsonValueKind.Object);
return SerializableObjectTypeExpression.Deserialize(type, element);

case EnumType clientEnum:
var value = GetFrameworkTypeValueExpression(clientEnum.ValueType.FrameworkType, element, SerializationFormat.Default, null);
var value = GetFrameworkTypeValueExpression(clientEnum.ValueType.FrameworkType, element, SerializationFormat.Default, null, out condition);
return EnumExpression.ToEnum(clientEnum, value);

default:
Expand Down Expand Up @@ -1092,9 +1110,9 @@ private static ValueExpression GetOptional(PropertySerialization jsonPropertySer
return variable;
}

// TODO -- make this method to return a condition as well to check ValueKind to avoid exceptions
public static ValueExpression GetFrameworkTypeValueExpression(Type frameworkType, JsonElementExpression element, SerializationFormat format, CSharpType? serializationType)
private static ValueExpression GetFrameworkTypeValueExpression(Type frameworkType, JsonElementExpression element, SerializationFormat format, CSharpType? serializationType, out BoolExpression? condition)
{
condition = null;
if (frameworkType == typeof(ETag) ||
frameworkType == typeof(Uri) ||
frameworkType == typeof(ResourceIdentifier) ||
Expand All @@ -1104,11 +1122,13 @@ public static ValueExpression GetFrameworkTypeValueExpression(Type frameworkType
frameworkType == typeof(AzureLocation) ||
frameworkType == typeof(ExtendedLocationType))
{
condition = element.ValueKindEqualsString();
return New.Instance(frameworkType, element.GetString());
}

if (frameworkType == typeof(IPAddress))
{
condition = element.ValueKindEqualsString();
return new InvokeStaticMethodExpression(typeof(IPAddress), nameof(IPAddress.Parse), new[] { element.GetString() });
}

Expand All @@ -1129,50 +1149,93 @@ public static ValueExpression GetFrameworkTypeValueExpression(Type frameworkType
if (frameworkType == typeof(object))
return element.GetObject();
if (frameworkType == typeof(bool))
{
condition = Or(element.ValueKindEquals(JsonValueKind.True), element.ValueKindEquals(JsonValueKind.False));
return element.GetBoolean();
}
if (frameworkType == typeof(char))
{
condition = element.ValueKindEqualsString();
return element.GetChar();
}

if (frameworkType == typeof(short))
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return element.GetInt16();
}
if (frameworkType == typeof(int))
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return element.GetInt32();
}
if (frameworkType == typeof(long))
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return element.GetInt64();
}
if (frameworkType == typeof(float))
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return element.GetSingle();
}
if (frameworkType == typeof(double))
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return element.GetDouble();
}
if (frameworkType == typeof(decimal))
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return element.GetDecimal();
}
if (frameworkType == typeof(string))
{
condition = element.ValueKindEqualsString();
return element.GetString();
}
if (frameworkType == typeof(Guid))
{
condition = element.ValueKindEqualsString();
return element.GetGuid();
}
if (frameworkType == typeof(byte[]))
return element.GetBytesFromBase64(format.ToFormatSpecifier());

if (frameworkType == typeof(DateTimeOffset))
{
return format == SerializationFormat.DateTime_Unix
? DateTimeOffsetExpression.FromUnixTimeSeconds(element.GetInt64())
: element.GetDateTimeOffset(format.ToFormatSpecifier());
if (format == SerializationFormat.DateTime_Unix)
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return DateTimeOffsetExpression.FromUnixTimeSeconds(element.GetInt64());
}
else
{
condition = element.ValueKindEqualsString();
return element.GetDateTimeOffset(format.ToFormatSpecifier());
}
}

if (frameworkType == typeof(DateTime))
{
condition = element.ValueKindEqualsString();
return element.GetDateTime();
}
if (frameworkType == typeof(TimeSpan))
{
if (format == SerializationFormat.Duration_Seconds)
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return TimeSpanExpression.FromSeconds(element.GetInt32());
}

if (format == SerializationFormat.Duration_Seconds_Float)
{
condition = element.ValueKindEquals(JsonValueKind.Number);
return TimeSpanExpression.FromSeconds(element.GetDouble());
}

condition = element.ValueKindEqualsString();
return element.GetTimeSpan(format.ToFormatSpecifier());
}

Expand Down
11 changes: 7 additions & 4 deletions src/AutoRest.CSharp/Common/Output/Expressions/KnownValueExpressions/JsonElementExpression.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ internal sealed record JsonElementExpression(ValueExpression Untyped) : TypedVal
public StringExpression GetString() => new(Untyped.Invoke(nameof(JsonElement.GetString)));
public ValueExpression GetTimeSpan(string? format) => Extensible.JsonElement.GetTimeSpan(this, format);

public BoolExpression ValueKindEqualsNull()
=> new(new BinaryOperatorExpression("==", Property(nameof(JsonElement.ValueKind)), FrameworkEnumValue(JsonValueKind.Null)));
public BoolExpression ValueKindEqualsNull() => ValueKindEquals(JsonValueKind.Null);

public BoolExpression ValueKindEqualsString()
=> new(new BinaryOperatorExpression("==", Property(nameof(JsonElement.ValueKind)), FrameworkEnumValue(JsonValueKind.String)));
public BoolExpression ValueKindEqualsString() => ValueKindEquals(JsonValueKind.String);

public BoolExpression ValueKindEquals(JsonValueKind kind)
=> new(new BinaryOperatorExpression("==", ValueKind, FrameworkEnumValue(kind)));

public ValueExpression ValueKind => Property(nameof(JsonElement.ValueKind));

public MethodBodyStatement WriteTo(ValueExpression writer) => new InvokeInstanceMethodStatement(Untyped, nameof(JsonElement.WriteTo), new[] { writer }, false);

Expand Down
5 changes: 4 additions & 1 deletion ...itional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ internal static ExtendsFloatAdditionalProperties DeserializeExtendsFloatAddition
id = property.Value.GetSingle();
continue;
}
additionalPropertiesDictionary.Add(property.Name, property.Value.GetSingle());
if (property.Value.ValueKind == JsonValueKind.Number)
{
additionalPropertiesDictionary.Add(property.Name, property.Value.GetSingle());
}
}
additionalProperties = additionalPropertiesDictionary;
return new ExtendsFloatAdditionalProperties(id, additionalProperties);
Expand Down
5 changes: 4 additions & 1 deletion ...itional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ internal static ExtendsModelAdditionalProperties DeserializeExtendsModelAddition
Dictionary<string, ModelForRecord> additionalPropertiesDictionary = new Dictionary<string, ModelForRecord>();
foreach (var property in element.EnumerateObject())
{
additionalPropertiesDictionary.Add(property.Name, ModelForRecord.DeserializeModelForRecord(property.Value));
if (property.Value.ValueKind == JsonValueKind.Object)
{
additionalPropertiesDictionary.Add(property.Name, ModelForRecord.DeserializeModelForRecord(property.Value));
}
}
additionalProperties = additionalPropertiesDictionary;
return new ExtendsModelAdditionalProperties(additionalProperties);
Expand Down
11 changes: 7 additions & 4 deletions ...al-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,15 @@ internal static ExtendsModelArrayAdditionalProperties DeserializeExtendsModelArr
Dictionary<string, IList<ModelForRecord>> additionalPropertiesDictionary = new Dictionary<string, IList<ModelForRecord>>();
foreach (var property in element.EnumerateObject())
{
List<ModelForRecord> array = new List<ModelForRecord>();
foreach (var item in property.Value.EnumerateArray())
if (property.Value.ValueKind == JsonValueKind.Array)
{
array.Add(ModelForRecord.DeserializeModelForRecord(item));
List<ModelForRecord> array = new List<ModelForRecord>();
foreach (var item in property.Value.EnumerateArray())
{
array.Add(ModelForRecord.DeserializeModelForRecord(item));
}
additionalPropertiesDictionary.Add(property.Name, array);
}
additionalPropertiesDictionary.Add(property.Name, array);
}
additionalProperties = additionalPropertiesDictionary;
return new ExtendsModelArrayAdditionalProperties(additionalProperties);
Expand Down
Loading

0 comments on commit ec36921

Please sign in to comment.