Add support for multiple ctors in JavaScriptDateTimeConverter
This commit is contained in:
@@ -91,22 +91,9 @@ namespace Newtonsoft.Json.Converters
|
||||
throw JsonSerializationException.Create(reader, "Unexpected token or value when parsing date. Token: {0}, Value: {1}".FormatWith(CultureInfo.InvariantCulture, reader.TokenType, reader.Value));
|
||||
}
|
||||
|
||||
reader.Read();
|
||||
|
||||
if (reader.TokenType != JsonToken.Integer)
|
||||
if (!JavaScriptUtils.TryGetDateFromConstructorJson(reader, out DateTime d, out string errorMessage))
|
||||
{
|
||||
throw JsonSerializationException.Create(reader, "Unexpected token parsing date. Expected Integer, got {0}.".FormatWith(CultureInfo.InvariantCulture, reader.TokenType));
|
||||
}
|
||||
|
||||
long ticks = (long)reader.Value;
|
||||
|
||||
DateTime d = DateTimeUtils.ConvertJavaScriptTicksToDateTime(ticks);
|
||||
|
||||
reader.Read();
|
||||
|
||||
if (reader.TokenType != JsonToken.EndConstructor)
|
||||
{
|
||||
throw JsonSerializationException.Create(reader, "Unexpected token parsing date. Expected EndConstructor, got {0}.".FormatWith(CultureInfo.InvariantCulture, reader.TokenType));
|
||||
throw JsonSerializationException.Create(reader, errorMessage);
|
||||
}
|
||||
|
||||
#if HAVE_DATE_TIME_OFFSET
|
||||
|
||||
@@ -696,32 +696,12 @@ namespace Newtonsoft.Json
|
||||
|
||||
private void WriteConstructorDate(JsonReader reader)
|
||||
{
|
||||
List<long> DateParams = new List<long>();
|
||||
while (true)
|
||||
if (!JavaScriptUtils.TryGetDateFromConstructorJson(reader, out DateTime dateTime, out string errorMessage))
|
||||
{
|
||||
if (!reader.Read())
|
||||
throw JsonWriterException.Create(this, "Unexpected end when reading date constructor.", null);
|
||||
if (reader.TokenType == JsonToken.EndConstructor)
|
||||
break;
|
||||
if (reader.TokenType != JsonToken.Integer)
|
||||
throw JsonWriterException.Create(this, "Unexpected token when reading date constructor. Expected Integer, got " + reader.TokenType, null);
|
||||
DateParams.Add((long)reader.Value);
|
||||
if (DateParams.Count > 7)
|
||||
throw JsonWriterException.Create(this, "Unexpected token when reading date constructor. Wrong number of arguments", null);
|
||||
throw JsonWriterException.Create(this, errorMessage, null);
|
||||
}
|
||||
DateTime date;
|
||||
if (DateParams.Count == 1)
|
||||
{
|
||||
date = DateTimeUtils.ConvertJavaScriptTicksToDateTime(DateParams[0]);
|
||||
}
|
||||
else if (DateParams.Count == 7) //Add support: new Date(2018,5,26,11,14,31,36)
|
||||
{
|
||||
date = new DateTime((int)DateParams[0], (int)DateParams[1] + 1, (int)DateParams[2], (int)DateParams[3],
|
||||
(int)DateParams[4], (int)DateParams[5], (int)DateParams[6]);
|
||||
}
|
||||
else
|
||||
throw JsonWriterException.Create(this, "Unexpected token when reading date constructor. Wrong number of arguments", null);
|
||||
WriteValue(date);
|
||||
|
||||
WriteValue(dateTime);
|
||||
}
|
||||
|
||||
private void WriteEnd(JsonContainerType type)
|
||||
|
||||
@@ -564,5 +564,90 @@ namespace Newtonsoft.Json.Utilities
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
public static bool TryGetDateFromConstructorJson(JsonReader reader, out DateTime dateTime, out string errorMessage)
|
||||
{
|
||||
dateTime = default(DateTime);
|
||||
errorMessage = null;
|
||||
|
||||
if (!TryGetDateConstructorValue(reader, out long? t1, out errorMessage) || t1 == null)
|
||||
{
|
||||
errorMessage = errorMessage ?? "Date constructor has no arguments.";
|
||||
return false;
|
||||
}
|
||||
if (!TryGetDateConstructorValue(reader, out long? t2, out errorMessage))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (t2 != null)
|
||||
{
|
||||
// Only create a list when there is more than one argument
|
||||
List<long> dateArgs = new List<long>
|
||||
{
|
||||
t1.Value,
|
||||
t2.Value
|
||||
};
|
||||
while (true)
|
||||
{
|
||||
if (!TryGetDateConstructorValue(reader, out long? integer, out errorMessage))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (integer != null)
|
||||
{
|
||||
dateArgs.Add(integer.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (dateArgs.Count > 7)
|
||||
{
|
||||
errorMessage = "Unexpected number of arguments when reading date constructor.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// Pad args out to the number used by the ctor
|
||||
while (dateArgs.Count < 7)
|
||||
{
|
||||
dateArgs.Add(0);
|
||||
}
|
||||
|
||||
dateTime = new DateTime((int)dateArgs[0], (int)dateArgs[1] + 1, dateArgs[2] == 0 ? 1 : (int)dateArgs[2],
|
||||
(int)dateArgs[3], (int)dateArgs[4], (int)dateArgs[5], (int)dateArgs[6]);
|
||||
}
|
||||
else
|
||||
{
|
||||
dateTime = DateTimeUtils.ConvertJavaScriptTicksToDateTime(t1.Value);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private static bool TryGetDateConstructorValue(JsonReader reader, out long? integer, out string errorMessage)
|
||||
{
|
||||
integer = null;
|
||||
errorMessage = null;
|
||||
|
||||
if (!reader.Read())
|
||||
{
|
||||
errorMessage = "Unexpected end when reading date constructor.";
|
||||
return false;
|
||||
}
|
||||
if (reader.TokenType == JsonToken.EndConstructor)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (reader.TokenType != JsonToken.Integer)
|
||||
{
|
||||
errorMessage = "Unexpected token when reading date constructor. Expected Integer, got " + reader.TokenType;
|
||||
return false;
|
||||
}
|
||||
|
||||
integer = (long)reader.Value;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user