Apply fix to #1460 to async writing. (#1540)

* Apply fix to #1460 to async writing.

* Replace recursion with iteration.

* Test for 1460 in async use.

* Change infinite loop style.
This commit is contained in:
Jon Hanna
2017-12-20 16:06:07 +13:00
committed by James Newton-King
parent 3ea750d6d6
commit 1b40ebfe26
4 changed files with 314 additions and 257 deletions
+106 -98
View File
@@ -1680,114 +1680,122 @@ namespace Newtonsoft.Json
internal static Task WriteValueAsync(JsonWriter writer, PrimitiveTypeCode typeCode, object value, CancellationToken cancellationToken)
{
switch (typeCode)
while (true)
{
case PrimitiveTypeCode.Char:
return writer.WriteValueAsync((char)value, cancellationToken);
case PrimitiveTypeCode.CharNullable:
return writer.WriteValueAsync(value == null ? (char?)null : (char)value, cancellationToken);
case PrimitiveTypeCode.Boolean:
return writer.WriteValueAsync((bool)value, cancellationToken);
case PrimitiveTypeCode.BooleanNullable:
return writer.WriteValueAsync(value == null ? (bool?)null : (bool)value, cancellationToken);
case PrimitiveTypeCode.SByte:
return writer.WriteValueAsync((sbyte)value, cancellationToken);
case PrimitiveTypeCode.SByteNullable:
return writer.WriteValueAsync(value == null ? (sbyte?)null : (sbyte)value, cancellationToken);
case PrimitiveTypeCode.Int16:
return writer.WriteValueAsync((short)value, cancellationToken);
case PrimitiveTypeCode.Int16Nullable:
return writer.WriteValueAsync(value == null ? (short?)null : (short)value, cancellationToken);
case PrimitiveTypeCode.UInt16:
return writer.WriteValueAsync((ushort)value, cancellationToken);
case PrimitiveTypeCode.UInt16Nullable:
return writer.WriteValueAsync(value == null ? (ushort?)null : (ushort)value, cancellationToken);
case PrimitiveTypeCode.Int32:
return writer.WriteValueAsync((int)value, cancellationToken);
case PrimitiveTypeCode.Int32Nullable:
return writer.WriteValueAsync(value == null ? (int?)null : (int)value, cancellationToken);
case PrimitiveTypeCode.Byte:
return writer.WriteValueAsync((byte)value, cancellationToken);
case PrimitiveTypeCode.ByteNullable:
return writer.WriteValueAsync(value == null ? (byte?)null : (byte)value, cancellationToken);
case PrimitiveTypeCode.UInt32:
return writer.WriteValueAsync((uint)value, cancellationToken);
case PrimitiveTypeCode.UInt32Nullable:
return writer.WriteValueAsync(value == null ? (uint?)null : (uint)value, cancellationToken);
case PrimitiveTypeCode.Int64:
return writer.WriteValueAsync((long)value, cancellationToken);
case PrimitiveTypeCode.Int64Nullable:
return writer.WriteValueAsync(value == null ? (long?)null : (long)value, cancellationToken);
case PrimitiveTypeCode.UInt64:
return writer.WriteValueAsync((ulong)value, cancellationToken);
case PrimitiveTypeCode.UInt64Nullable:
return writer.WriteValueAsync(value == null ? (ulong?)null : (ulong)value, cancellationToken);
case PrimitiveTypeCode.Single:
return writer.WriteValueAsync((float)value, cancellationToken);
case PrimitiveTypeCode.SingleNullable:
return writer.WriteValueAsync(value == null ? (float?)null : (float)value, cancellationToken);
case PrimitiveTypeCode.Double:
return writer.WriteValueAsync((double)value, cancellationToken);
case PrimitiveTypeCode.DoubleNullable:
return writer.WriteValueAsync(value == null ? (double?)null : (double)value, cancellationToken);
case PrimitiveTypeCode.DateTime:
return writer.WriteValueAsync((DateTime)value, cancellationToken);
case PrimitiveTypeCode.DateTimeNullable:
return writer.WriteValueAsync(value == null ? (DateTime?)null : (DateTime)value, cancellationToken);
case PrimitiveTypeCode.DateTimeOffset:
return writer.WriteValueAsync((DateTimeOffset)value, cancellationToken);
case PrimitiveTypeCode.DateTimeOffsetNullable:
return writer.WriteValueAsync(value == null ? (DateTimeOffset?)null : (DateTimeOffset)value, cancellationToken);
case PrimitiveTypeCode.Decimal:
return writer.WriteValueAsync((decimal)value, cancellationToken);
case PrimitiveTypeCode.DecimalNullable:
return writer.WriteValueAsync(value == null ? (decimal?)null : (decimal)value, cancellationToken);
case PrimitiveTypeCode.Guid:
return writer.WriteValueAsync((Guid)value, cancellationToken);
case PrimitiveTypeCode.GuidNullable:
return writer.WriteValueAsync(value == null ? (Guid?)null : (Guid)value, cancellationToken);
case PrimitiveTypeCode.TimeSpan:
return writer.WriteValueAsync((TimeSpan)value, cancellationToken);
case PrimitiveTypeCode.TimeSpanNullable:
return writer.WriteValueAsync(value == null ? (TimeSpan?)null : (TimeSpan)value, cancellationToken);
switch (typeCode)
{
case PrimitiveTypeCode.Char:
return writer.WriteValueAsync((char)value, cancellationToken);
case PrimitiveTypeCode.CharNullable:
return writer.WriteValueAsync(value == null ? (char?)null : (char)value, cancellationToken);
case PrimitiveTypeCode.Boolean:
return writer.WriteValueAsync((bool)value, cancellationToken);
case PrimitiveTypeCode.BooleanNullable:
return writer.WriteValueAsync(value == null ? (bool?)null : (bool)value, cancellationToken);
case PrimitiveTypeCode.SByte:
return writer.WriteValueAsync((sbyte)value, cancellationToken);
case PrimitiveTypeCode.SByteNullable:
return writer.WriteValueAsync(value == null ? (sbyte?)null : (sbyte)value, cancellationToken);
case PrimitiveTypeCode.Int16:
return writer.WriteValueAsync((short)value, cancellationToken);
case PrimitiveTypeCode.Int16Nullable:
return writer.WriteValueAsync(value == null ? (short?)null : (short)value, cancellationToken);
case PrimitiveTypeCode.UInt16:
return writer.WriteValueAsync((ushort)value, cancellationToken);
case PrimitiveTypeCode.UInt16Nullable:
return writer.WriteValueAsync(value == null ? (ushort?)null : (ushort)value, cancellationToken);
case PrimitiveTypeCode.Int32:
return writer.WriteValueAsync((int)value, cancellationToken);
case PrimitiveTypeCode.Int32Nullable:
return writer.WriteValueAsync(value == null ? (int?)null : (int)value, cancellationToken);
case PrimitiveTypeCode.Byte:
return writer.WriteValueAsync((byte)value, cancellationToken);
case PrimitiveTypeCode.ByteNullable:
return writer.WriteValueAsync(value == null ? (byte?)null : (byte)value, cancellationToken);
case PrimitiveTypeCode.UInt32:
return writer.WriteValueAsync((uint)value, cancellationToken);
case PrimitiveTypeCode.UInt32Nullable:
return writer.WriteValueAsync(value == null ? (uint?)null : (uint)value, cancellationToken);
case PrimitiveTypeCode.Int64:
return writer.WriteValueAsync((long)value, cancellationToken);
case PrimitiveTypeCode.Int64Nullable:
return writer.WriteValueAsync(value == null ? (long?)null : (long)value, cancellationToken);
case PrimitiveTypeCode.UInt64:
return writer.WriteValueAsync((ulong)value, cancellationToken);
case PrimitiveTypeCode.UInt64Nullable:
return writer.WriteValueAsync(value == null ? (ulong?)null : (ulong)value, cancellationToken);
case PrimitiveTypeCode.Single:
return writer.WriteValueAsync((float)value, cancellationToken);
case PrimitiveTypeCode.SingleNullable:
return writer.WriteValueAsync(value == null ? (float?)null : (float)value, cancellationToken);
case PrimitiveTypeCode.Double:
return writer.WriteValueAsync((double)value, cancellationToken);
case PrimitiveTypeCode.DoubleNullable:
return writer.WriteValueAsync(value == null ? (double?)null : (double)value, cancellationToken);
case PrimitiveTypeCode.DateTime:
return writer.WriteValueAsync((DateTime)value, cancellationToken);
case PrimitiveTypeCode.DateTimeNullable:
return writer.WriteValueAsync(value == null ? (DateTime?)null : (DateTime)value, cancellationToken);
case PrimitiveTypeCode.DateTimeOffset:
return writer.WriteValueAsync((DateTimeOffset)value, cancellationToken);
case PrimitiveTypeCode.DateTimeOffsetNullable:
return writer.WriteValueAsync(value == null ? (DateTimeOffset?)null : (DateTimeOffset)value, cancellationToken);
case PrimitiveTypeCode.Decimal:
return writer.WriteValueAsync((decimal)value, cancellationToken);
case PrimitiveTypeCode.DecimalNullable:
return writer.WriteValueAsync(value == null ? (decimal?)null : (decimal)value, cancellationToken);
case PrimitiveTypeCode.Guid:
return writer.WriteValueAsync((Guid)value, cancellationToken);
case PrimitiveTypeCode.GuidNullable:
return writer.WriteValueAsync(value == null ? (Guid?)null : (Guid)value, cancellationToken);
case PrimitiveTypeCode.TimeSpan:
return writer.WriteValueAsync((TimeSpan)value, cancellationToken);
case PrimitiveTypeCode.TimeSpanNullable:
return writer.WriteValueAsync(value == null ? (TimeSpan?)null : (TimeSpan)value, cancellationToken);
#if HAVE_BIG_INTEGER
case PrimitiveTypeCode.BigInteger:
case PrimitiveTypeCode.BigInteger:
// this will call to WriteValueAsync(object)
return writer.WriteValueAsync((BigInteger)value, cancellationToken);
case PrimitiveTypeCode.BigIntegerNullable:
// this will call to WriteValueAsync(object)
return writer.WriteValueAsync((BigInteger)value, cancellationToken);
case PrimitiveTypeCode.BigIntegerNullable:
// this will call to WriteValueAsync(object)
return writer.WriteValueAsync(value == null ? (BigInteger?)null : (BigInteger)value, cancellationToken);
// this will call to WriteValueAsync(object)
return writer.WriteValueAsync(value == null ? (BigInteger?)null : (BigInteger)value, cancellationToken);
#endif
case PrimitiveTypeCode.Uri:
return writer.WriteValueAsync((Uri)value, cancellationToken);
case PrimitiveTypeCode.String:
return writer.WriteValueAsync((string)value, cancellationToken);
case PrimitiveTypeCode.Bytes:
return writer.WriteValueAsync((byte[])value, cancellationToken);
case PrimitiveTypeCode.Uri:
return writer.WriteValueAsync((Uri)value, cancellationToken);
case PrimitiveTypeCode.String:
return writer.WriteValueAsync((string)value, cancellationToken);
case PrimitiveTypeCode.Bytes:
return writer.WriteValueAsync((byte[])value, cancellationToken);
#if HAVE_DB_NULL_TYPE_CODE
case PrimitiveTypeCode.DBNull:
return writer.WriteNullAsync(cancellationToken);
case PrimitiveTypeCode.DBNull:
return writer.WriteNullAsync(cancellationToken);
#endif
default:
default:
#if HAVE_ICONVERTIBLE
if (value is IConvertible convertable)
{
// the value is a non-standard IConvertible
// convert to the underlying value and retry
TypeInformation typeInformation = ConvertUtils.GetTypeInformation(convertable);
if (value is IConvertible convertible)
{
// the value is a non-standard IConvertible
// convert to the underlying value and retry
TypeInformation typeInformation = ConvertUtils.GetTypeInformation(convertible);
// if convertible has an underlying typecode of Object then attempt to convert it to a string
PrimitiveTypeCode resolvedTypeCode = typeInformation.TypeCode == PrimitiveTypeCode.Object ? PrimitiveTypeCode.String : typeInformation.TypeCode;
Type resolvedType = typeInformation.TypeCode == PrimitiveTypeCode.Object ? typeof(string) : typeInformation.Type;
object convertedValue = convertable.ToType(resolvedType, CultureInfo.InvariantCulture);
return WriteValueAsync(writer, resolvedTypeCode, convertedValue, cancellationToken);
}
// if convertible has an underlying typecode of Object then attempt to convert it to a string
typeCode = typeInformation.TypeCode == PrimitiveTypeCode.Object ? PrimitiveTypeCode.String : typeInformation.TypeCode;
Type resolvedType = typeInformation.TypeCode == PrimitiveTypeCode.Object ? typeof(string) : typeInformation.Type;
value = convertible.ToType(resolvedType, CultureInfo.InvariantCulture);
continue;
}
#endif
throw CreateUnsupportedTypeException(writer, value);
// write an unknown null value, fix https://github.com/JamesNK/Newtonsoft.Json/issues/1460
if (value == null)
{
return writer.WriteNullAsync(cancellationToken);
}
throw CreateUnsupportedTypeException(writer, value);
}
}
}
}