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
@@ -30,6 +30,10 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
#if !(NET20 || NET35 || NET40 || PORTABLE40)
using System.Threading.Tasks;
#endif
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System.Xml; using System.Xml;
@@ -60,5 +64,17 @@ namespace Newtonsoft.Json.Tests.Issues
Assert.AreEqual("null", sw.ToString()); Assert.AreEqual("null", sw.ToString());
} }
#if !(NET20 || NET35 || NET40 || PORTABLE40)
[Test]
public async Task TestAsync()
{
StringWriter sw = new StringWriter();
JsonTextWriter writer = new JsonTextWriter(sw);
await JsonWriter.WriteValueAsync(writer, PrimitiveTypeCode.Object, null, CancellationToken.None);
Assert.AreEqual("null", sw.ToString());
}
#endif
} }
} }
+15 -7
View File
@@ -1679,6 +1679,8 @@ namespace Newtonsoft.Json
} }
internal static Task WriteValueAsync(JsonWriter writer, PrimitiveTypeCode typeCode, object value, CancellationToken cancellationToken) internal static Task WriteValueAsync(JsonWriter writer, PrimitiveTypeCode typeCode, object value, CancellationToken cancellationToken)
{
while (true)
{ {
switch (typeCode) switch (typeCode)
{ {
@@ -1772,25 +1774,31 @@ namespace Newtonsoft.Json
#endif #endif
default: default:
#if HAVE_ICONVERTIBLE #if HAVE_ICONVERTIBLE
if (value is IConvertible convertable) if (value is IConvertible convertible)
{ {
// the value is a non-standard IConvertible // the value is a non-standard IConvertible
// convert to the underlying value and retry // convert to the underlying value and retry
TypeInformation typeInformation = ConvertUtils.GetTypeInformation(convertable); TypeInformation typeInformation = ConvertUtils.GetTypeInformation(convertible);
// if convertible has an underlying typecode of Object then attempt to convert it to a string // 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; typeCode = typeInformation.TypeCode == PrimitiveTypeCode.Object ? PrimitiveTypeCode.String : typeInformation.TypeCode;
Type resolvedType = typeInformation.TypeCode == PrimitiveTypeCode.Object ? typeof(string) : typeInformation.Type; Type resolvedType = typeInformation.TypeCode == PrimitiveTypeCode.Object ? typeof(string) : typeInformation.Type;
value = convertible.ToType(resolvedType, CultureInfo.InvariantCulture);
object convertedValue = convertable.ToType(resolvedType, CultureInfo.InvariantCulture); continue;
return WriteValueAsync(writer, resolvedTypeCode, convertedValue, cancellationToken);
} }
#endif #endif
// 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); throw CreateUnsupportedTypeException(writer, value);
} }
} }
} }
} }
}
#endif #endif
+84 -47
View File
@@ -1481,136 +1481,174 @@ namespace Newtonsoft.Json
} }
internal static void WriteValue(JsonWriter writer, PrimitiveTypeCode typeCode, object value) internal static void WriteValue(JsonWriter writer, PrimitiveTypeCode typeCode, object value)
{
while (true)
{ {
switch (typeCode) switch (typeCode)
{ {
case PrimitiveTypeCode.Char: case PrimitiveTypeCode.Char:
writer.WriteValue((char)value); writer.WriteValue((char)value);
break; return;
case PrimitiveTypeCode.CharNullable: case PrimitiveTypeCode.CharNullable:
writer.WriteValue((value == null) ? (char?)null : (char)value); writer.WriteValue((value == null) ? (char?)null : (char)value);
break; return;
case PrimitiveTypeCode.Boolean: case PrimitiveTypeCode.Boolean:
writer.WriteValue((bool)value); writer.WriteValue((bool)value);
break; return;
case PrimitiveTypeCode.BooleanNullable: case PrimitiveTypeCode.BooleanNullable:
writer.WriteValue((value == null) ? (bool?)null : (bool)value); writer.WriteValue((value == null) ? (bool?)null : (bool)value);
break; return;
case PrimitiveTypeCode.SByte: case PrimitiveTypeCode.SByte:
writer.WriteValue((sbyte)value); writer.WriteValue((sbyte)value);
break; return;
case PrimitiveTypeCode.SByteNullable: case PrimitiveTypeCode.SByteNullable:
writer.WriteValue((value == null) ? (sbyte?)null : (sbyte)value); writer.WriteValue((value == null) ? (sbyte?)null : (sbyte)value);
break; return;
case PrimitiveTypeCode.Int16: case PrimitiveTypeCode.Int16:
writer.WriteValue((short)value); writer.WriteValue((short)value);
break; return;
case PrimitiveTypeCode.Int16Nullable: case PrimitiveTypeCode.Int16Nullable:
writer.WriteValue((value == null) ? (short?)null : (short)value); writer.WriteValue((value == null) ? (short?)null : (short)value);
break; return;
case PrimitiveTypeCode.UInt16: case PrimitiveTypeCode.UInt16:
writer.WriteValue((ushort)value); writer.WriteValue((ushort)value);
break; return;
case PrimitiveTypeCode.UInt16Nullable: case PrimitiveTypeCode.UInt16Nullable:
writer.WriteValue((value == null) ? (ushort?)null : (ushort)value); writer.WriteValue((value == null) ? (ushort?)null : (ushort)value);
break; return;
case PrimitiveTypeCode.Int32: case PrimitiveTypeCode.Int32:
writer.WriteValue((int)value); writer.WriteValue((int)value);
break; return;
case PrimitiveTypeCode.Int32Nullable: case PrimitiveTypeCode.Int32Nullable:
writer.WriteValue((value == null) ? (int?)null : (int)value); writer.WriteValue((value == null) ? (int?)null : (int)value);
break; return;
case PrimitiveTypeCode.Byte: case PrimitiveTypeCode.Byte:
writer.WriteValue((byte)value); writer.WriteValue((byte)value);
break; return;
case PrimitiveTypeCode.ByteNullable: case PrimitiveTypeCode.ByteNullable:
writer.WriteValue((value == null) ? (byte?)null : (byte)value); writer.WriteValue((value == null) ? (byte?)null : (byte)value);
break; return;
case PrimitiveTypeCode.UInt32: case PrimitiveTypeCode.UInt32:
writer.WriteValue((uint)value); writer.WriteValue((uint)value);
break; return;
case PrimitiveTypeCode.UInt32Nullable: case PrimitiveTypeCode.UInt32Nullable:
writer.WriteValue((value == null) ? (uint?)null : (uint)value); writer.WriteValue((value == null) ? (uint?)null : (uint)value);
break; return;
case PrimitiveTypeCode.Int64: case PrimitiveTypeCode.Int64:
writer.WriteValue((long)value); writer.WriteValue((long)value);
break; return;
case PrimitiveTypeCode.Int64Nullable: case PrimitiveTypeCode.Int64Nullable:
writer.WriteValue((value == null) ? (long?)null : (long)value); writer.WriteValue((value == null) ? (long?)null : (long)value);
break; return;
case PrimitiveTypeCode.UInt64: case PrimitiveTypeCode.UInt64:
writer.WriteValue((ulong)value); writer.WriteValue((ulong)value);
break; return;
case PrimitiveTypeCode.UInt64Nullable: case PrimitiveTypeCode.UInt64Nullable:
writer.WriteValue((value == null) ? (ulong?)null : (ulong)value); writer.WriteValue((value == null) ? (ulong?)null : (ulong)value);
break; return;
case PrimitiveTypeCode.Single: case PrimitiveTypeCode.Single:
writer.WriteValue((float)value); writer.WriteValue((float)value);
break; return;
case PrimitiveTypeCode.SingleNullable: case PrimitiveTypeCode.SingleNullable:
writer.WriteValue((value == null) ? (float?)null : (float)value); writer.WriteValue((value == null) ? (float?)null : (float)value);
break; return;
case PrimitiveTypeCode.Double: case PrimitiveTypeCode.Double:
writer.WriteValue((double)value); writer.WriteValue((double)value);
break; return;
case PrimitiveTypeCode.DoubleNullable: case PrimitiveTypeCode.DoubleNullable:
writer.WriteValue((value == null) ? (double?)null : (double)value); writer.WriteValue((value == null) ? (double?)null : (double)value);
break; return;
case PrimitiveTypeCode.DateTime: case PrimitiveTypeCode.DateTime:
writer.WriteValue((DateTime)value); writer.WriteValue((DateTime)value);
break; return;
case PrimitiveTypeCode.DateTimeNullable: case PrimitiveTypeCode.DateTimeNullable:
writer.WriteValue((value == null) ? (DateTime?)null : (DateTime)value); writer.WriteValue((value == null) ? (DateTime?)null : (DateTime)value);
break; return;
#if HAVE_DATE_TIME_OFFSET #if HAVE_DATE_TIME_OFFSET
case PrimitiveTypeCode.DateTimeOffset: case PrimitiveTypeCode.DateTimeOffset:
writer.WriteValue((DateTimeOffset)value); writer.WriteValue((DateTimeOffset)value);
break; return;
case PrimitiveTypeCode.DateTimeOffsetNullable: case PrimitiveTypeCode.DateTimeOffsetNullable:
writer.WriteValue((value == null) ? (DateTimeOffset?)null : (DateTimeOffset)value); writer.WriteValue((value == null) ? (DateTimeOffset?)null : (DateTimeOffset)value);
break; return;
#endif #endif
case PrimitiveTypeCode.Decimal: case PrimitiveTypeCode.Decimal:
writer.WriteValue((decimal)value); writer.WriteValue((decimal)value);
break; return;
case PrimitiveTypeCode.DecimalNullable: case PrimitiveTypeCode.DecimalNullable:
writer.WriteValue((value == null) ? (decimal?)null : (decimal)value); writer.WriteValue((value == null) ? (decimal?)null : (decimal)value);
break; break;
case PrimitiveTypeCode.Guid: case PrimitiveTypeCode.Guid:
writer.WriteValue((Guid)value); writer.WriteValue((Guid)value);
break; return;
case PrimitiveTypeCode.GuidNullable: case PrimitiveTypeCode.GuidNullable:
writer.WriteValue((value == null) ? (Guid?)null : (Guid)value); writer.WriteValue((value == null) ? (Guid?)null : (Guid)value);
break; return;
case PrimitiveTypeCode.TimeSpan: case PrimitiveTypeCode.TimeSpan:
writer.WriteValue((TimeSpan)value); writer.WriteValue((TimeSpan)value);
break; return;
case PrimitiveTypeCode.TimeSpanNullable: case PrimitiveTypeCode.TimeSpanNullable:
writer.WriteValue((value == null) ? (TimeSpan?)null : (TimeSpan)value); writer.WriteValue((value == null) ? (TimeSpan?)null : (TimeSpan)value);
break; return;
#if HAVE_BIG_INTEGER #if HAVE_BIG_INTEGER
case PrimitiveTypeCode.BigInteger: case PrimitiveTypeCode.BigInteger:
// this will call to WriteValue(object) // this will call to WriteValue(object)
writer.WriteValue((BigInteger)value); writer.WriteValue((BigInteger)value);
break; return;
case PrimitiveTypeCode.BigIntegerNullable: case PrimitiveTypeCode.BigIntegerNullable:
// this will call to WriteValue(object) // this will call to WriteValue(object)
writer.WriteValue((value == null) ? (BigInteger?)null : (BigInteger)value); writer.WriteValue((value == null) ? (BigInteger?)null : (BigInteger)value);
break; return;
#endif #endif
case PrimitiveTypeCode.Uri: case PrimitiveTypeCode.Uri:
writer.WriteValue((Uri)value); writer.WriteValue((Uri)value);
break; return;
case PrimitiveTypeCode.String: case PrimitiveTypeCode.String:
writer.WriteValue((string)value); writer.WriteValue((string)value);
break; return;
case PrimitiveTypeCode.Bytes: case PrimitiveTypeCode.Bytes:
writer.WriteValue((byte[])value); writer.WriteValue((byte[])value);
break; return;
#if HAVE_DB_NULL_TYPE_CODE #if HAVE_DB_NULL_TYPE_CODE
case PrimitiveTypeCode.DBNull: case PrimitiveTypeCode.DBNull:
writer.WriteNull(); writer.WriteNull();
break; return;
#endif #endif
default: default:
#if HAVE_ICONVERTIBLE #if HAVE_ICONVERTIBLE
@@ -1622,25 +1660,24 @@ namespace Newtonsoft.Json
TypeInformation typeInformation = ConvertUtils.GetTypeInformation(convertible); TypeInformation typeInformation = ConvertUtils.GetTypeInformation(convertible);
// if convertible has an underlying typecode of Object then attempt to convert it to a string // 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; typeCode = typeInformation.TypeCode == PrimitiveTypeCode.Object ? PrimitiveTypeCode.String : typeInformation.TypeCode;
Type resolvedType = (typeInformation.TypeCode == PrimitiveTypeCode.Object) ? typeof(string) : typeInformation.Type; Type resolvedType = typeInformation.TypeCode == PrimitiveTypeCode.Object ? typeof(string) : typeInformation.Type;
value = convertible.ToType(resolvedType, CultureInfo.InvariantCulture);
object convertedValue = convertible.ToType(resolvedType, CultureInfo.InvariantCulture); continue;
WriteValue(writer, resolvedTypeCode, convertedValue);
break;
} }
#endif #endif
// write an unknown null value, fix https://github.com/JamesNK/Newtonsoft.Json/issues/1460 // write an unknown null value, fix https://github.com/JamesNK/Newtonsoft.Json/issues/1460
if (value == null) if (value == null)
{ {
writer.WriteNull(); writer.WriteNull();
break; return;
} }
throw CreateUnsupportedTypeException(writer, value); throw CreateUnsupportedTypeException(writer, value);
} }
} }
}
private static JsonWriterException CreateUnsupportedTypeException(JsonWriter writer, object value) private static JsonWriterException CreateUnsupportedTypeException(JsonWriter writer, object value)
{ {
@@ -353,26 +353,22 @@ namespace Newtonsoft.Json.Utilities
private static bool InheritsGenericDefinitionInternal(Type currentType, Type genericClassDefinition, out Type implementingType) private static bool InheritsGenericDefinitionInternal(Type currentType, Type genericClassDefinition, out Type implementingType)
{ {
if (currentType.IsGenericType()) do
{ {
Type currentGenericClassDefinition = currentType.GetGenericTypeDefinition(); if (currentType.IsGenericType() && genericClassDefinition == currentType.GetGenericTypeDefinition())
if (genericClassDefinition == currentGenericClassDefinition)
{ {
implementingType = currentType; implementingType = currentType;
return true; return true;
} }
}
if (currentType.BaseType() == null) currentType = currentType.BaseType();
{ }
while (currentType != null);
implementingType = null; implementingType = null;
return false; return false;
} }
return InheritsGenericDefinitionInternal(currentType.BaseType(), genericClassDefinition, out implementingType);
}
/// <summary> /// <summary>
/// Gets the type of the typed collection's items. /// Gets the type of the typed collection's items.
/// </summary> /// </summary>