Skip to content

fix bug in GetJsonKeyForType #39

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
SphtKr merged 1 commit into from
Jan 29, 2015
+4 −2
Merged

fix bug in GetJsonKeyForType #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions JSONAPI.Tests/Core/ModelManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ public void GetJsonKeyForTypeTest()
var postKey = mm.GetJsonKeyForType(typeof(Post));
var authorKey = mm.GetJsonKeyForType(typeof(Author));
var commentKey = mm.GetJsonKeyForType(typeof(Comment));
var manyCommentKey = mm.GetJsonKeyForType(typeof(Comment[]));

// Assert
Assert.AreEqual("posts", postKey);
Assert.AreEqual("authors", authorKey);
Assert.AreEqual("comments", commentKey);
Assert.AreEqual("comments", manyCommentKey);
}

[TestMethod]
Expand Down
4 changes: 2 additions & 2 deletions JSONAPI/Core/ModelManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ public string GetJsonKeyForType(Type type)

lock (keyCache)
{
if (keyCache.TryGetValue(type, out key)) return key;

if (IsSerializedAsMany(type))
type = GetElementType(type);

if (keyCache.TryGetValue(type, out key)) return key;

var attrs = type.CustomAttributes.Where(x => x.AttributeType == typeof(Newtonsoft.Json.JsonObjectAttribute)).ToList();

string title = type.Name;
Expand Down