-Added DeserializeObject overload
This commit is contained in:
+4
-1
@@ -15,4 +15,7 @@ Json.NET comes in different versions for the various .NET frameworks.
|
|||||||
Silverlight 3.0
|
Silverlight 3.0
|
||||||
|
|
||||||
-Phone:
|
-Phone:
|
||||||
Windows Phone 7
|
Windows Phone 7
|
||||||
|
|
||||||
|
Microsoft stopped supporting the Compact Framework in Visual Studio 2010.
|
||||||
|
For a Compact Framework 3.5 build download Json.NET 3.5.
|
||||||
@@ -331,7 +331,7 @@ Parameter name: arrayIndex")]
|
|||||||
{
|
{
|
||||||
string json = @"[new Date(1207285200000)]";
|
string json = @"[new Date(1207285200000)]";
|
||||||
|
|
||||||
JArray a = (JArray)JsonConvert.DeserializeObject(json, null);
|
JArray a = (JArray)JsonConvert.DeserializeObject(json);
|
||||||
JValue v = (JValue)a[0];
|
JValue v = (JValue)a[0];
|
||||||
|
|
||||||
Assert.AreEqual(JsonConvert.ConvertJavaScriptTicksToDateTime(1207285200000), (DateTime)v);
|
Assert.AreEqual(JsonConvert.ConvertJavaScriptTicksToDateTime(1207285200000), (DateTime)v);
|
||||||
|
|||||||
@@ -565,6 +565,55 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
SearchDetails searchDetails = (SearchDetails) deserialized.Body;
|
SearchDetails searchDetails = (SearchDetails) deserialized.Body;
|
||||||
// Json.NET
|
// Json.NET
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class UrlStatus
|
||||||
|
{
|
||||||
|
public int Status { get; set; }
|
||||||
|
public string Url { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void GenericDictionaryObject()
|
||||||
|
{
|
||||||
|
Dictionary<string, object> collection = new Dictionary<string, object>()
|
||||||
|
{
|
||||||
|
{"First", new UrlStatus{ Status = 404, Url = @"http://www.bing.com"}},
|
||||||
|
{"Second", new UrlStatus{Status = 400, Url = @"http://www.google.com"}}
|
||||||
|
};
|
||||||
|
|
||||||
|
string json = JsonConvert.SerializeObject(collection, Formatting.Indented, new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
TypeNameHandling = TypeNameHandling.Objects,
|
||||||
|
TypeNameAssemblyFormat = FormatterAssemblyStyle.Simple
|
||||||
|
});
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""$type"": ""System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib"",
|
||||||
|
""First"": {
|
||||||
|
""$type"": ""Newtonsoft.Json.Tests.Serialization.TypeNameHandlingTests+UrlStatus, Newtonsoft.Json.Tests"",
|
||||||
|
""Status"": 404,
|
||||||
|
""Url"": ""http://www.bing.com""
|
||||||
|
},
|
||||||
|
""Second"": {
|
||||||
|
""$type"": ""Newtonsoft.Json.Tests.Serialization.TypeNameHandlingTests+UrlStatus, Newtonsoft.Json.Tests"",
|
||||||
|
""Status"": 400,
|
||||||
|
""Url"": ""http://www.google.com""
|
||||||
|
}
|
||||||
|
}", json);
|
||||||
|
|
||||||
|
object c = JsonConvert.DeserializeObject(json, new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
TypeNameHandling = TypeNameHandling.Objects,
|
||||||
|
TypeNameAssemblyFormat = FormatterAssemblyStyle.Simple
|
||||||
|
});
|
||||||
|
|
||||||
|
Assert.IsInstanceOfType(typeof(Dictionary<string, object>), c);
|
||||||
|
|
||||||
|
Dictionary<string, object> newCollection = (Dictionary<string, object>)c;
|
||||||
|
Assert.AreEqual(2, newCollection.Count);
|
||||||
|
Assert.AreEqual(@"http://www.bing.com", ((UrlStatus)newCollection["First"]).Url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Message
|
public class Message
|
||||||
|
|||||||
@@ -595,9 +595,9 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the specified object to a Json object.
|
/// Deserializes the JSON to a .NET object.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">The object to deserialize.</param>
|
/// <param name="value">The JSON to deserialize.</param>
|
||||||
/// <returns>The deserialized object from the Json string.</returns>
|
/// <returns>The deserialized object from the Json string.</returns>
|
||||||
public static object DeserializeObject(string value)
|
public static object DeserializeObject(string value)
|
||||||
{
|
{
|
||||||
@@ -605,9 +605,23 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the specified object to a Json object.
|
/// Deserializes the JSON to a .NET object.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">The object to deserialize.</param>
|
/// <param name="value">The JSON to deserialize.</param>
|
||||||
|
/// <param name="settings">
|
||||||
|
/// The <see cref="JsonSerializerSettings"/> used to deserialize the object.
|
||||||
|
/// If this is null, default serialization settings will be is used.
|
||||||
|
/// </param>
|
||||||
|
/// <returns>The deserialized object from the JSON string.</returns>
|
||||||
|
public static object DeserializeObject(string value, JsonSerializerSettings settings)
|
||||||
|
{
|
||||||
|
return DeserializeObject(value, null, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Deserializes the JSON to the specified .NET type.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="value">The JSON to deserialize.</param>
|
||||||
/// <param name="type">The <see cref="Type"/> of object being deserialized.</param>
|
/// <param name="type">The <see cref="Type"/> of object being deserialized.</param>
|
||||||
/// <returns>The deserialized object from the Json string.</returns>
|
/// <returns>The deserialized object from the Json string.</returns>
|
||||||
public static object DeserializeObject(string value, Type type)
|
public static object DeserializeObject(string value, Type type)
|
||||||
@@ -616,10 +630,10 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the specified object to a Json object.
|
/// Deserializes the JSON to the specified .NET type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T">The type of the object to deserialize.</typeparam>
|
/// <typeparam name="T">The type of the object to deserialize to.</typeparam>
|
||||||
/// <param name="value">The object to deserialize.</param>
|
/// <param name="value">The JSON to deserialize.</param>
|
||||||
/// <returns>The deserialized object from the Json string.</returns>
|
/// <returns>The deserialized object from the Json string.</returns>
|
||||||
public static T DeserializeObject<T>(string value)
|
public static T DeserializeObject<T>(string value)
|
||||||
{
|
{
|
||||||
@@ -627,14 +641,14 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the specified JSON to the given anonymous type.
|
/// Deserializes the JSON to the given anonymous type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T">
|
/// <typeparam name="T">
|
||||||
/// The anonymous type to deserialize to. This can't be specified
|
/// The anonymous type to deserialize to. This can't be specified
|
||||||
/// traditionally and must be infered from the anonymous type passed
|
/// traditionally and must be infered from the anonymous type passed
|
||||||
/// as a parameter.
|
/// as a parameter.
|
||||||
/// </typeparam>
|
/// </typeparam>
|
||||||
/// <param name="value">The object to deserialize.</param>
|
/// <param name="value">The JSON to deserialize.</param>
|
||||||
/// <param name="anonymousTypeObject">The anonymous type object.</param>
|
/// <param name="anonymousTypeObject">The anonymous type object.</param>
|
||||||
/// <returns>The deserialized anonymous type from the JSON string.</returns>
|
/// <returns>The deserialized anonymous type from the JSON string.</returns>
|
||||||
public static T DeserializeAnonymousType<T>(string value, T anonymousTypeObject)
|
public static T DeserializeAnonymousType<T>(string value, T anonymousTypeObject)
|
||||||
@@ -643,10 +657,10 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the JSON string to the specified type.
|
/// Deserializes the JSON to the specified .NET type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T">The type of the object to deserialize.</typeparam>
|
/// <typeparam name="T">The type of the object to deserialize to.</typeparam>
|
||||||
/// <param name="value">The object to deserialize.</param>
|
/// <param name="value">The JSON to deserialize.</param>
|
||||||
/// <param name="converters">Converters to use while deserializing.</param>
|
/// <param name="converters">Converters to use while deserializing.</param>
|
||||||
/// <returns>The deserialized object from the JSON string.</returns>
|
/// <returns>The deserialized object from the JSON string.</returns>
|
||||||
public static T DeserializeObject<T>(string value, params JsonConverter[] converters)
|
public static T DeserializeObject<T>(string value, params JsonConverter[] converters)
|
||||||
@@ -655,9 +669,9 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the JSON string to the specified type.
|
/// Deserializes the JSON to the specified .NET type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T">The type of the object to deserialize.</typeparam>
|
/// <typeparam name="T">The type of the object to deserialize to.</typeparam>
|
||||||
/// <param name="value">The object to deserialize.</param>
|
/// <param name="value">The object to deserialize.</param>
|
||||||
/// <param name="settings">
|
/// <param name="settings">
|
||||||
/// The <see cref="JsonSerializerSettings"/> used to deserialize the object.
|
/// The <see cref="JsonSerializerSettings"/> used to deserialize the object.
|
||||||
@@ -670,9 +684,9 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the JSON string to the specified type.
|
/// Deserializes the JSON to the specified .NET type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">The object to deserialize.</param>
|
/// <param name="value">The JSON to deserialize.</param>
|
||||||
/// <param name="type">The type of the object to deserialize.</param>
|
/// <param name="type">The type of the object to deserialize.</param>
|
||||||
/// <param name="converters">Converters to use while deserializing.</param>
|
/// <param name="converters">Converters to use while deserializing.</param>
|
||||||
/// <returns>The deserialized object from the JSON string.</returns>
|
/// <returns>The deserialized object from the JSON string.</returns>
|
||||||
@@ -686,10 +700,10 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the JSON string to the specified type.
|
/// Deserializes the JSON to the specified .NET type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">The JSON to deserialize.</param>
|
/// <param name="value">The JSON to deserialize.</param>
|
||||||
/// <param name="type">The type of the object to deserialize.</param>
|
/// <param name="type">The type of the object to deserialize to.</param>
|
||||||
/// <param name="settings">
|
/// <param name="settings">
|
||||||
/// The <see cref="JsonSerializerSettings"/> used to deserialize the object.
|
/// The <see cref="JsonSerializerSettings"/> used to deserialize the object.
|
||||||
/// If this is null, default serialization settings will be is used.
|
/// If this is null, default serialization settings will be is used.
|
||||||
|
|||||||
Reference in New Issue
Block a user