Skip to content

Added support for JsonArray and JsonObject deserialization when target type is specified as System.Object #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 20, 2014
Merged

Added support for JsonArray and JsonObject deserialization when target type is specified as System.Object #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3586cf8
Added support for JsonArray deserialization
ryno1234 Nov 18, 2013
18826dd
Merge pull request #517 from lhaussknecht/cf
haacked Mar 19, 2014
708adc5
JsonDeserializer now can deserialize objects JsonArray and JsonObject…
ryno1234 Nov 18, 2013
133e3cb
Merge branch 'master' of github.com:ryno1234/RestSharp
ryno1234 Mar 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions RestSharp.Tests/JsonTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,20 @@ public void Can_Deserialize_From_Root_Element()
Assert.Equal("John Sheehan", output.DisplayName);
}

[Fact]
public void Can_Deserialize_To_Dictionary_String_Object() {
var doc = File.ReadAllText(Path.Combine("SampleData", "jsondictionary.txt"));

var json = new JsonDeserializer();

var output = json.Deserialize<Dictionary<string, object>>(new RestResponse() { Content = doc });

Assert.Equal(output.Keys.Count, 3);

var firstKeysVal = output.FirstOrDefault().Value;
Assert.IsAssignableFrom<System.Collections.IDictionary>(firstKeysVal);
}

[Fact]
public void Can_Deserialize_Generic_Members()
{
Expand Down
12 changes: 11 additions & 1 deletion RestSharp/Deserializers/JsonDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,17 @@ private object ConvertValue(Type type, object value)
return CreateAndMap(type, value);
}
}
else
else if (type.IsSubclassOfRawGeneric(typeof(List<>)))
{
// handles classes that derive from List<T>
return BuildList(type, value);
}
else if (type == typeof(JsonObject))
{
// simplify JsonObject into a Dictionary<string, object>
return BuildDictionary(typeof(Dictionary<string, object>), value);
}
else
{
// nested property classes
return CreateAndMap(type, value);
Expand Down