-Fixed deserializing non-string values in some XML nodes
This commit is contained in:
@@ -2913,6 +2913,47 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
var deserialized = JsonConvert.DeserializeObject<XDocument>(json);
|
var deserialized = JsonConvert.DeserializeObject<XDocument>(json);
|
||||||
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", deserialized.ToString());
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", deserialized.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class Model
|
||||||
|
{
|
||||||
|
public XElement Document { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeDateInElementText()
|
||||||
|
{
|
||||||
|
Model model = new Model();
|
||||||
|
model.Document = new XElement("Value", new XAttribute("foo", "bar"))
|
||||||
|
{
|
||||||
|
Value = "2001-01-01T11:11:11"
|
||||||
|
};
|
||||||
|
|
||||||
|
var serializer = JsonSerializer.Create(new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
Converters = new List<JsonConverter>(new[] { new XmlNodeConverter() })
|
||||||
|
});
|
||||||
|
|
||||||
|
var json = new StringBuilder(1024);
|
||||||
|
|
||||||
|
using (var stringWriter = new StringWriter(json, CultureInfo.InvariantCulture))
|
||||||
|
using (var jsonWriter = new JsonTextWriter(stringWriter))
|
||||||
|
{
|
||||||
|
jsonWriter.Formatting = Formatting.None;
|
||||||
|
serializer.Serialize(jsonWriter, model);
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{""Document"":{""Value"":{""@foo"":""bar"",""#text"":""2001-01-01T11:11:11""}}}", json.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
using (var stringReader = new StringReader(json.ToString()))
|
||||||
|
using (var jsonReader = new JsonTextReader(stringReader))
|
||||||
|
{
|
||||||
|
var document = (XDocument)serializer.Deserialize(jsonReader, typeof(XDocument));
|
||||||
|
|
||||||
|
StringAssert.AreEqual(@"<Document>
|
||||||
|
<Value foo=""bar"">2001-01-01T11:11:11</Value>
|
||||||
|
</Document>", document.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1680,16 +1680,16 @@ namespace Newtonsoft.Json.Converters
|
|||||||
switch (propertyName)
|
switch (propertyName)
|
||||||
{
|
{
|
||||||
case TextName:
|
case TextName:
|
||||||
currentNode.AppendChild(document.CreateTextNode(reader.Value.ToString()));
|
currentNode.AppendChild(document.CreateTextNode(ConvertTokenToXmlValue(reader)));
|
||||||
break;
|
break;
|
||||||
case CDataName:
|
case CDataName:
|
||||||
currentNode.AppendChild(document.CreateCDataSection(reader.Value.ToString()));
|
currentNode.AppendChild(document.CreateCDataSection(ConvertTokenToXmlValue(reader)));
|
||||||
break;
|
break;
|
||||||
case WhitespaceName:
|
case WhitespaceName:
|
||||||
currentNode.AppendChild(document.CreateWhitespace(reader.Value.ToString()));
|
currentNode.AppendChild(document.CreateWhitespace(ConvertTokenToXmlValue(reader)));
|
||||||
break;
|
break;
|
||||||
case SignificantWhitespaceName:
|
case SignificantWhitespaceName:
|
||||||
currentNode.AppendChild(document.CreateSignificantWhitespace(reader.Value.ToString()));
|
currentNode.AppendChild(document.CreateSignificantWhitespace(ConvertTokenToXmlValue(reader)));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// processing instructions and the xml declaration start with ?
|
// processing instructions and the xml declaration start with ?
|
||||||
@@ -2072,15 +2072,15 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
case "@version":
|
case "@version":
|
||||||
reader.Read();
|
reader.Read();
|
||||||
version = reader.Value.ToString();
|
version = ConvertTokenToXmlValue(reader);
|
||||||
break;
|
break;
|
||||||
case "@encoding":
|
case "@encoding":
|
||||||
reader.Read();
|
reader.Read();
|
||||||
encoding = reader.Value.ToString();
|
encoding = ConvertTokenToXmlValue(reader);
|
||||||
break;
|
break;
|
||||||
case "@standalone":
|
case "@standalone":
|
||||||
reader.Read();
|
reader.Read();
|
||||||
standalone = reader.Value.ToString();
|
standalone = ConvertTokenToXmlValue(reader);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw JsonSerializationException.Create(reader, "Unexpected property name encountered while deserializing XmlDeclaration: " + reader.Value);
|
throw JsonSerializationException.Create(reader, "Unexpected property name encountered while deserializing XmlDeclaration: " + reader.Value);
|
||||||
@@ -2092,7 +2092,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
IXmlNode instruction = document.CreateProcessingInstruction(propertyName.Substring(1), reader.Value.ToString());
|
IXmlNode instruction = document.CreateProcessingInstruction(propertyName.Substring(1), ConvertTokenToXmlValue(reader));
|
||||||
currentNode.AppendChild(instruction);
|
currentNode.AppendChild(instruction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2109,19 +2109,19 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
case "@name":
|
case "@name":
|
||||||
reader.Read();
|
reader.Read();
|
||||||
name = reader.Value.ToString();
|
name = ConvertTokenToXmlValue(reader);
|
||||||
break;
|
break;
|
||||||
case "@public":
|
case "@public":
|
||||||
reader.Read();
|
reader.Read();
|
||||||
publicId = reader.Value.ToString();
|
publicId = ConvertTokenToXmlValue(reader);
|
||||||
break;
|
break;
|
||||||
case "@system":
|
case "@system":
|
||||||
reader.Read();
|
reader.Read();
|
||||||
systemId = reader.Value.ToString();
|
systemId = ConvertTokenToXmlValue(reader);
|
||||||
break;
|
break;
|
||||||
case "@internalSubset":
|
case "@internalSubset":
|
||||||
reader.Read();
|
reader.Read();
|
||||||
internalSubset = reader.Value.ToString();
|
internalSubset = ConvertTokenToXmlValue(reader);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw JsonSerializationException.Create(reader, "Unexpected property name encountered while deserializing XmlDeclaration: " + reader.Value);
|
throw JsonSerializationException.Create(reader, "Unexpected property name encountered while deserializing XmlDeclaration: " + reader.Value);
|
||||||
|
|||||||
Reference in New Issue
Block a user