LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

-Fixed converting default datetime in JSON to XML on netstandard1.3

Browse Source
This commit is contained in:
James Newton-King
2017-10-02 21:48:22 +13:00
parent 8f65999684
commit 92d170a078
10 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs
+20
View File
@@ -151,6 +151,26 @@ namespace Newtonsoft.Json.Tests.Converters
return sw.ToString();
}
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void DeserializeXmlNode_DefaultDate()
{
XmlDocument xmlNode = JsonConvert.DeserializeXmlNode("{Time: \"0001-01-01T00:00:00\"}");
Assert.AreEqual("<Time>0001-01-01T00:00:00</Time>", xmlNode.OuterXml);
}
#endif
#if !NET20
[Test]
public void DeserializeXNode_DefaultDate()
{
var xmlNode = JsonConvert.DeserializeXNode("{Time: \"0001-01-01T00:00:00\"}");
Assert.AreEqual("<Time>0001-01-01T00:00:00</Time>", xmlNode.ToString());
}
#endif
[Test]
public void WriteJsonNull()
{
Src/Newtonsoft.Json/Converters/BinaryConverter.cs
+2 -2
View File
@@ -74,9 +74,9 @@ namespace Newtonsoft.Json.Converters
}
#endif
#if HAVE_ADO_NET
if (value is SqlBinary)
if (value is SqlBinary binary)
{
return ((SqlBinary)value).Value;
return binary.Value;
}
#endif
Src/Newtonsoft.Json/Converters/BsonObjectIdConverter.cs
+1 -2
View File
@@ -46,8 +46,7 @@ namespace Newtonsoft.Json.Converters
{
BsonObjectId objectId = (BsonObjectId)value;
BsonWriter bsonWriter = writer as BsonWriter;
if (bsonWriter != null)
if (writer is BsonWriter bsonWriter)
{
bsonWriter.WriteObjectId(objectId.Value);
}
Src/Newtonsoft.Json/Converters/DataTableConverter.cs
+1 -3
View File
@@ -94,9 +94,7 @@ namespace Newtonsoft.Json.Converters
return null;
}
DataTable dt = existingValue as DataTable;
if (dt == null)
if (!(existingValue is DataTable dt))
{
// handle typed datasets
dt = (objectType == typeof(DataTable))
Src/Newtonsoft.Json/Converters/EntityKeyMemberConverter.cs
+1 -2
View File
@@ -71,8 +71,7 @@ namespace Newtonsoft.Json.Converters
if (keyValueType != null)
{
string valueJson;
if (JsonSerializerInternalWriter.TryConvertToString(keyValue, keyValueType, out valueJson))
if (JsonSerializerInternalWriter.TryConvertToString(keyValue, keyValueType, out string valueJson))
{
writer.WriteValue(valueJson);
}
Src/Newtonsoft.Json/Converters/IsoDateTimeConverter.cs
+4 -7
View File
@@ -80,10 +80,8 @@ namespace Newtonsoft.Json.Converters
{
string text;
if (value is DateTime)
if (value is DateTime dateTime)
{
DateTime dateTime = (DateTime)value;
if ((_dateTimeStyles & DateTimeStyles.AdjustToUniversal) == DateTimeStyles.AdjustToUniversal
|| (_dateTimeStyles & DateTimeStyles.AssumeUniversal) == DateTimeStyles.AssumeUniversal)
{
@@ -93,9 +91,8 @@ namespace Newtonsoft.Json.Converters
text = dateTime.ToString(_dateTimeFormat ?? DefaultDateTimeFormat, Culture);
}
#if HAVE_DATE_TIME_OFFSET
else if (value is DateTimeOffset)
else if (value is DateTimeOffset dateTimeOffset)
{
DateTimeOffset dateTimeOffset = (DateTimeOffset)value;
if ((_dateTimeStyles & DateTimeStyles.AdjustToUniversal) == DateTimeStyles.AdjustToUniversal
|| (_dateTimeStyles & DateTimeStyles.AssumeUniversal) == DateTimeStyles.AssumeUniversal)
{
@@ -149,9 +146,9 @@ namespace Newtonsoft.Json.Converters
}
// converter is expected to return a DateTime
if (reader.Value is DateTimeOffset)
if (reader.Value is DateTimeOffset offset)
{
return ((DateTimeOffset)reader.Value).DateTime;
return offset.DateTime;
}
#endif
Src/Newtonsoft.Json/Converters/JavaScriptDateTimeConverter.cs
+2 -4
View File
@@ -44,16 +44,14 @@ namespace Newtonsoft.Json.Converters
{
long ticks;
if (value is DateTime)
if (value is DateTime dateTime)
{
DateTime dateTime = (DateTime)value;
DateTime utcDateTime = dateTime.ToUniversalTime();
ticks = DateTimeUtils.ConvertDateTimeToJavaScriptTicks(utcDateTime);
}
#if HAVE_DATE_TIME_OFFSET
else if (value is DateTimeOffset)
else if (value is DateTimeOffset dateTimeOffset)
{
DateTimeOffset dateTimeOffset = (DateTimeOffset)value;
DateTimeOffset utcDateTimeOffset = dateTimeOffset.ToUniversalTime();
ticks = DateTimeUtils.ConvertDateTimeToJavaScriptTicks(utcDateTimeOffset.UtcDateTime);
}
Src/Newtonsoft.Json/Converters/RegexConverter.cs
+1 -2
View File
@@ -57,8 +57,7 @@ namespace Newtonsoft.Json.Converters
Regex regex = (Regex)value;
#pragma warning disable 618
BsonWriter bsonWriter = writer as BsonWriter;
if (bsonWriter != null)
if (writer is BsonWriter bsonWriter)
{
WriteBson(bsonWriter, regex);
}
Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs
+17 -16
View File
@@ -1867,40 +1867,44 @@ namespace Newtonsoft.Json.Converters
return reader.Value?.ToString();
case JsonToken.Integer:
#if HAVE_BIG_INTEGER
if (reader.Value is BigInteger)
if (reader.Value is BigInteger i)
{
return ((BigInteger)reader.Value).ToString(CultureInfo.InvariantCulture);
return i.ToString(CultureInfo.InvariantCulture);
}
#endif
return XmlConvert.ToString(Convert.ToInt64(reader.Value, CultureInfo.InvariantCulture));
case JsonToken.Float:
if (reader.Value is decimal)
{
if (reader.Value is decimal d)
{
return XmlConvert.ToString((decimal)reader.Value);
return XmlConvert.ToString(d);
}
if (reader.Value is float)
if (reader.Value is float f)
{
return XmlConvert.ToString((float)reader.Value);
return XmlConvert.ToString(f);
}
return XmlConvert.ToString(Convert.ToDouble(reader.Value, CultureInfo.InvariantCulture));
}
case JsonToken.Boolean:
return XmlConvert.ToString(Convert.ToBoolean(reader.Value, CultureInfo.InvariantCulture));
case JsonToken.Date:
{
#if HAVE_DATE_TIME_OFFSET
if (reader.Value is DateTimeOffset)
if (reader.Value is DateTimeOffset offset)
{
return XmlConvert.ToString((DateTimeOffset)reader.Value);
return XmlConvert.ToString(offset);
}
#endif
DateTime d = Convert.ToDateTime(reader.Value, CultureInfo.InvariantCulture);
#if !PORTABLE
#if !PORTABLE || NETSTANDARD1_3
return XmlConvert.ToString(d, DateTimeUtils.ToSerializationMode(d.Kind));
#else
return XmlConvert.ToString(d, DateTimeUtils.ToDateTimeFormat(d.Kind));
return d.ToString(DateTimeUtils.ToDateTimeFormat(d.Kind), CultureInfo.InvariantCulture);
#endif
}
case JsonToken.Bytes:
return Convert.ToBase64String((byte[])reader.Value);
case JsonToken.Null:
@@ -1934,8 +1938,7 @@ namespace Newtonsoft.Json.Converters
{
foreach (IXmlNode childNode in nestedArrayElement.ChildNodes)
{
IXmlElement element = childNode as IXmlElement;
if (element != null && element.LocalName == propertyName)
if (childNode is IXmlElement element && element.LocalName == propertyName)
{
AddJsonArrayAttribute(element, document);
break;
@@ -2005,8 +2008,7 @@ namespace Newtonsoft.Json.Converters
attributeValue = ConvertTokenToXmlValue(reader);
attributeNameValues.Add(attributeName, attributeValue);
string namespacePrefix;
if (IsNamespaceAttribute(attributeName, out namespacePrefix))
if (IsNamespaceAttribute(attributeName, out string namespacePrefix))
{
manager.AddNamespace(namespacePrefix, attributeValue);
}
@@ -2205,8 +2207,7 @@ namespace Newtonsoft.Json.Converters
{
foreach (IXmlNode childNode in currentNode.ChildNodes)
{
IXmlElement element = childNode as IXmlElement;
if (element != null && element.LocalName == propertyName)
if (childNode is IXmlElement element && element.LocalName == propertyName)
{
AddJsonArrayAttribute(element, document);
break;
Src/Newtonsoft.Json/Utilities/DateTimeUtils.cs
+1 -1
View File
@@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Utilities
#endif
}
#if !(PORTABLE40 || PORTABLE)
#if !(PORTABLE40 || PORTABLE) || NETSTANDARD1_3
public static XmlDateTimeSerializationMode ToSerializationMode(DateTimeKind kind)
{
switch (kind)