use data key for primary data

Chris Santero · Chris Santero · commit e6908e22081e · 2015-02-25T15:24:53.000-05:00
instead of keying by resource type name.
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PostRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PostRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "205",
             "title": "Added post",
             "content": "Added post content",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithArrayRelationshipValueRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithArrayRelationshipValueRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": ["301"]
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithAttributeUpdateRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithAttributeUpdateRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "title": "New post title"
         }
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToManyIdsRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToManyIdsRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": {
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToManyTypeRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToManyTypeRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": {
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToOneIdRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToOneIdRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "author": {
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToOneTypeRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToOneTypeRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "author": {
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithNullToOneUpdateRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithNullToOneUpdateRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "author": null
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithStringRelationshipValueRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithStringRelationshipValueRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "author": "301"
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyEmptyDataUpdateRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyEmptyDataUpdateRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": {
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyHomogeneousDataUpdateRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyHomogeneousDataUpdateRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": {
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyUpdateRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyUpdateRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": {
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToOneUpdateRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToOneUpdateRequest.json
@@ -1,6 +1,7 @@
 ﻿{
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "author": {
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetAllResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetAllResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "201",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetByIdResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetByIdResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "202",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetWithFilterResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetWithFilterResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "204",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PostResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PostResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "205",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithAttributeUpdateResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithAttributeUpdateResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "202",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithNullToOneUpdateResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithNullToOneUpdateResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "202",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyEmptyDataUpdateResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyEmptyDataUpdateResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "202",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyHomogeneousDataUpdateResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyHomogeneousDataUpdateResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "202",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyUpdateResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyUpdateResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "202",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToOneUpdateResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToOneUpdateResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "202",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedAscendingResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedAscendingResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "users": [
+    "data": [
         {
             "type": "users",
             "id": "401",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedByMixedDirectionResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedByMixedDirectionResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "users": [
+    "data": [
         {
             "type": "users",
             "id": "410",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedByMultipleAscendingResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedByMultipleAscendingResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "users": [
+    "data": [
         {
             "type": "users",
             "id": "409",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedByMultipleDescendingResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedByMultipleDescendingResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "users": [
+    "data": [
         {
             "type": "users",
             "id": "404",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedDescendingResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedDescendingResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "users": [
+    "data": [
         {
             "type": "users",
             "id": "407",
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/UserGroups/Responses/GetAllResponse.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/UserGroups/Responses/GetAllResponse.json
@@ -1,5 +1,5 @@
 ﻿{
-    "user-groups": [
+    "data": [
         {
             "type": "user-groups",
             "id": "501",
diff --git a/JSONAPI.EntityFramework.Tests/EntityConverterTests.cs b/JSONAPI.EntityFramework.Tests/EntityConverterTests.cs
@@ -135,7 +135,7 @@ public async Task UnderpostingTest()
 
             EntityFrameworkMaterializer materializer = new EntityFrameworkMaterializer(context, MetadataManager.Instance);
 
-            string underpost = @"{""posts"":{""id"":""" + p.Id.ToString() + @""",""title"":""Not at all linkbait!""}}";
+            string underpost = @"{""data"":{""id"":""" + p.Id.ToString() + @""",""title"":""Not at all linkbait!""}}";
             stream = new MemoryStream(System.Text.Encoding.ASCII.GetBytes(underpost));
 
             int previousCommentsCount = p.Comments.Count;
diff --git a/JSONAPI.Tests/Data/AttributeSerializationTest.json b/JSONAPI.Tests/Data/AttributeSerializationTest.json
@@ -1,5 +1,5 @@
 {
-    "samples": [
+    "data": [
         {
             "type": "samples",
             "id": "1",
diff --git a/JSONAPI.Tests/Data/ByteIdSerializationTest.json b/JSONAPI.Tests/Data/ByteIdSerializationTest.json
@@ -1,5 +1,5 @@
 {
-    "tags": [
+    "data": [
         {
             "type": "tags",
             "id": "1",
diff --git a/JSONAPI.Tests/Data/DeserializeAttributeRequest.json b/JSONAPI.Tests/Data/DeserializeAttributeRequest.json
@@ -1,5 +1,5 @@
 {
-    "samples": [
+    "data": [
         {
             "id": "1",
             "booleanField": false,
diff --git a/JSONAPI.Tests/Data/DeserializeCollectionRequest.json b/JSONAPI.Tests/Data/DeserializeCollectionRequest.json
@@ -1,5 +1,5 @@
 {
-    "posts": [
+    "data": [
         {
             "id": "1",
             "title": "Linkbait!",
diff --git a/JSONAPI.Tests/Data/DeserializeRawJsonTest.json b/JSONAPI.Tests/Data/DeserializeRawJsonTest.json
@@ -1,5 +1,5 @@
 {
-    "comments": [
+    "data": [
         {
             "id": "2",
             "customData": null
diff --git a/JSONAPI.Tests/Data/LinkTemplateTest.json b/JSONAPI.Tests/Data/LinkTemplateTest.json
@@ -1,5 +1,5 @@
 {
-    "posts": {
+    "data": {
         "type": "posts",
         "id": "2",
         "title": "How to fry an egg",
diff --git a/JSONAPI.Tests/Data/MalformedRawJsonString.json b/JSONAPI.Tests/Data/MalformedRawJsonString.json
@@ -1,5 +1,5 @@
 {
-    "comments": [
+    "data": [
         {
             "type": "comments",
             "id": "5",
diff --git a/JSONAPI.Tests/Data/MetadataManagerPropertyWasPresentRequest.json b/JSONAPI.Tests/Data/MetadataManagerPropertyWasPresentRequest.json
@@ -1,5 +1,6 @@
 {
-    "posts": {
+    "data": {
+        "type": "posts",
         "id": "42",
         "links": {
             "author": {
diff --git a/JSONAPI.Tests/Data/NonStandardIdTest.json b/JSONAPI.Tests/Data/NonStandardIdTest.json
@@ -1,5 +1,5 @@
 ﻿{
-    "non-standard-id-things": [
+    "data": [
         {
             "type": "non-standard-id-things",
             "id": "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f",
diff --git a/JSONAPI.Tests/Data/ReformatsRawJsonStringWithUnquotedKeys.json b/JSONAPI.Tests/Data/ReformatsRawJsonStringWithUnquotedKeys.json
@@ -1,5 +1,5 @@
 {
-    "comments": [
+    "data": [
         {
             "type": "comments",
             "id": "5",
diff --git a/JSONAPI.Tests/Data/SerializerIntegrationTest.json b/JSONAPI.Tests/Data/SerializerIntegrationTest.json
@@ -1,5 +1,5 @@
 {
-    "posts": [
+    "data": [
         {
             "type": "posts",
             "id": "1",
diff --git a/JSONAPI.Tests/Json/JsonApiMediaFormatterTests.cs b/JSONAPI.Tests/Json/JsonApiMediaFormatterTests.cs
@@ -460,7 +460,7 @@ public void DeserializeExtraPropertyTest()
             var formatter = new JsonApiFormatter(modelManager);
             MemoryStream stream = new MemoryStream();
 
-            stream = new MemoryStream(System.Text.Encoding.ASCII.GetBytes(@"{""authors"":{""id"":13,""name"":""Jason Hater"",""bogus"":""PANIC!"",""links"":{""posts"":{""type"": ""posts"",""ids"": []}}}"));
+            stream = new MemoryStream(System.Text.Encoding.ASCII.GetBytes(@"{""data"":{""id"":13,""name"":""Jason Hater"",""bogus"":""PANIC!"",""links"":{""posts"":{""type"": ""posts"",""ids"": []}}}"));
 
             // Act
             Author a;
@@ -480,7 +480,7 @@ public void DeserializeExtraRelationshipTest()
             var formatter = new JsonApiFormatter(modelManager);
             MemoryStream stream = new MemoryStream();
 
-            stream = new MemoryStream(System.Text.Encoding.ASCII.GetBytes(@"{""authors"":{""id"":13,""name"":""Jason Hater"",""links"":{""posts"":{""type"": ""posts"",""ids"": []},""bogus"":[""PANIC!""]}}}"));
+            stream = new MemoryStream(System.Text.Encoding.ASCII.GetBytes(@"{""data"":{""id"":13,""name"":""Jason Hater"",""links"":{""posts"":{""type"": ""posts"",""ids"": []},""bogus"":[""PANIC!""]}}}"));
 
             // Act
             Author a;
diff --git a/JSONAPI/Json/JsonApiFormatter.cs b/JSONAPI/Json/JsonApiFormatter.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`		`- "posts": [`
	`2`	`+ "data": [`
`3`	`3`	`{`
	`4`	`+ "type": "posts",`
`4`	`5`	`"id": "205",`
`5`	`6`	`"title": "Added post",`
`6`	`7`	`"content": "Added post content",`