JSONAPIdotNET · csantero · May 19, 2015 · Mar 15, 2015 · Mar 15, 2015 · Mar 16, 2015
diff --git a/JSONAPI.EntityFramework.Tests.TestWebApp/Startup.cs b/JSONAPI.EntityFramework.Tests.TestWebApp/Startup.cs
@@ -56,18 +56,20 @@ public void Configuration(IAppBuilder app)
 
         private static HttpConfiguration GetWebApiConfiguration()
         {
-            var pluralizationService = new PluralizationService();
             var httpConfig = new HttpConfiguration();
+
+            // Configure the model manager
+            var pluralizationService = new PluralizationService();
+            var modelManager = new ModelManager(pluralizationService)
+                .RegisterResourceType(typeof (Comment))
+                .RegisterResourceType(typeof (Post))
+                .RegisterResourceType(typeof (Tag))
+                .RegisterResourceType(typeof (User))
+                .RegisterResourceType(typeof (UserGroup));
 
             // Configure JSON API
-            new JsonApiConfiguration()
-                .PluralizeResourceTypesWith(pluralizationService)
+            new JsonApiConfiguration(modelManager)
                 .UseEntityFramework()
-                .RegisterResourceType(typeof(Comment))
-                .RegisterResourceType(typeof(Post))
-                .RegisterResourceType(typeof(Tag))
-                .RegisterResourceType(typeof(User))
-                .RegisterResourceType(typeof(UserGroup))
                 .Apply(httpConfig);
 
 

diff --git a/...mework.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithArrayForToOneLinkageRequest.json b/...mework.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithArrayForToOneLinkageRequest.json
@@ -0,0 +1,13 @@
+{
+    "data": [
+        {
+            "type": "posts",
+            "id": "202",
+            "links": {
+                "author": {
+                    "linkage": [ { "type": "users", "id": "403" } ]
+                }
+            }
+        }
+    ]
+}
diff --git a/...atchWithToManyEmptyDataUpdateRequest.json → ...PatchWithMissingToManyLinkageRequest.json b/...atchWithToManyEmptyDataUpdateRequest.json → ...PatchWithMissingToManyLinkageRequest.json
@@ -5,7 +5,6 @@
             "id": "202",
             "links": {
                 "tags": {
-                    "data": []
                 }
             }
         }

diff --git a/...ts/PatchWithMissingToManyTypeRequest.json → ...PatchWithNullForToManyLinkageRequest.json b/...ts/PatchWithMissingToManyTypeRequest.json → ...PatchWithNullForToManyLinkageRequest.json
@@ -5,7 +5,7 @@
             "id": "202",
             "links": {
                 "tags": {
-                    "ids": [ "301" ]
+                    "linkage": null
                 }
             }
         }

diff --git a/...tyFramework.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithNullToOneUpdateRequest.json b/...tyFramework.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithNullToOneUpdateRequest.json
@@ -4,7 +4,9 @@
             "type": "posts",
             "id": "202",
             "links": {
-                "author": null
+                "author": { 
+                    "linkage": null
+                }
             }
         }
     ]

diff --git a/...work.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithObjectForToManyLinkageRequest.json b/...work.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithObjectForToManyLinkageRequest.json
@@ -0,0 +1,13 @@
+{
+    "data": [
+        {
+            "type": "posts",
+            "id": "202",
+            "links": {
+                "tags": {
+                    "linkage": { "type": "tags", "id": "301" }
+                }
+            }
+        }
+    ]
+}
diff --git a/...work.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithStringForToManyLinkageRequest.json b/...work.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithStringForToManyLinkageRequest.json
@@ -0,0 +1,13 @@
+{
+    "data": [
+        {
+            "type": "posts",
+            "id": "202",
+            "links": {
+                "tags": {
+                    "linkage": "301"
+                }
+            }
+        }
+    ]
+}
diff --git a/...uests/PatchWithMissingToOneIdRequest.json → ...atchWithStringForToOneLinkageRequest.json b/...uests/PatchWithMissingToOneIdRequest.json → ...atchWithStringForToOneLinkageRequest.json
@@ -5,7 +5,7 @@
             "id": "202",
             "links": {
                 "author": {
-                    "type": "users"
+                    "linkage": "403"
                 }
             }
         }

diff --git a/...sts/PatchWithMissingToManyIdsRequest.json → ...hWithToManyEmptyLinkageUpdateRequest.json b/...sts/PatchWithMissingToManyIdsRequest.json → ...hWithToManyEmptyLinkageUpdateRequest.json
@@ -5,7 +5,7 @@
             "id": "202",
             "links": {
                 "tags": {
-                    "type": "tags"
+                    "linkage": []
                 }
             }
         }

diff --git a/...Tests/Acceptance/Fixtures/Posts/Requests/PatchWithToManyHomogeneousDataUpdateRequest.json b/...Tests/Acceptance/Fixtures/Posts/Requests/PatchWithToManyHomogeneousDataUpdateRequest.json
@@ -5,7 +5,7 @@
             "id": "202",
             "links": {
                 "tags": {
-                    "data": [
+                    "linkage": [
                         {
                             "id": "301",
                             "type": "tags"

diff --git a/...ests/Acceptance/Fixtures/Posts/Requests/PatchWithToManyLinkageObjectMissingIdRequest.json b/...ests/Acceptance/Fixtures/Posts/Requests/PatchWithToManyLinkageObjectMissingIdRequest.json
@@ -0,0 +1,13 @@
+{
+    "data": [
+        {
+            "type": "posts",
+            "id": "202",
+            "links": {
+                "tags": {
+                    "linkage": [ { "type": "tags" } ]
+                }
+            }
+        }
+    ]
+}
diff --git a/...ts/Acceptance/Fixtures/Posts/Requests/PatchWithToManyLinkageObjectMissingTypeRequest.json b/...ts/Acceptance/Fixtures/Posts/Requests/PatchWithToManyLinkageObjectMissingTypeRequest.json
@@ -0,0 +1,13 @@
+{
+    "data": [
+        {
+            "type": "posts",
+            "id": "202",
+            "links": {
+                "tags": {
+                    "linkage": [ { "id": "301" } ]
+                }
+            }
+        }
+    ]
+}
diff --git a/...ntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithToManyUpdateRequest.json b/...ntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithToManyUpdateRequest.json
@@ -5,8 +5,7 @@
             "id": "202",
             "links": {
                 "tags": {
-                    "type": "tags",
-                    "ids": ["301"]
+                    "linkage": [ { "type": "tags", "id": "301" } ]
                 }
             }
         }

diff --git a/...Tests/Acceptance/Fixtures/Posts/Requests/PatchWithToOneLinkageObjectMissingIdRequest.json b/...Tests/Acceptance/Fixtures/Posts/Requests/PatchWithToOneLinkageObjectMissingIdRequest.json
@@ -0,0 +1,13 @@
+{
+    "data": [
+        {
+            "type": "posts",
+            "id": "202",
+            "links": {
+                "author": {
+                    "linkage": { "type": "users" }
+                }
+            }
+        }
+    ]
+}
diff --git a/...sts/PatchWithMissingToOneTypeRequest.json → ...ToOneLinkageObjectMissingTypeRequest.json b/...sts/PatchWithMissingToOneTypeRequest.json → ...ToOneLinkageObjectMissingTypeRequest.json
@@ -5,7 +5,7 @@
             "id": "202",
             "links": {
                 "author": {
-                    "id": "403"
+                    "linkage": { "id": "403" }
                 }
             }
         }

diff --git a/...EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithToOneUpdateRequest.json b/...EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PatchWithToOneUpdateRequest.json
@@ -5,8 +5,10 @@
             "id": "202",
             "links": {
                 "author": {
-                    "type": "users",
-                    "id": "403"
+                    "linkage": {
+                        "type": "users",
+                        "id": "403"
+                    }
                 }
             }
         }

diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PostRequest.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PostRequest.json
@@ -8,8 +8,11 @@
             "created": "2015-03-11T04:31:00+00:00",
             "links": {
                 "author": {
-                    "type": "users",
-                    "id": "401"
+                    "linkage": {
+                        "type": "users",
+                        "id": "401"
+
+                    }
                 }
             }
         }

diff --git a/...es/PatchWithMissingToOneTypeResponse.json → ...atchWithArrayForToOneLinkageResponse.json b/...es/PatchWithMissingToOneTypeResponse.json → ...atchWithArrayForToOneLinkageResponse.json
@@ -4,7 +4,7 @@
             "id": "{{SOME_GUID}}",
             "status": "500",
             "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
-            "detail": "Nothing was specified for the `type` property.",
+            "detail": "Expected an object value for `linkage` but got Array.",
             "stackTrace": "{{STACK_TRACE}}",
             "inner": null
         }

diff --git a/...rk.Tests/Acceptance/Fixtures/Posts/Responses/PatchWithArrayRelationshipValueResponse.json b/...rk.Tests/Acceptance/Fixtures/Posts/Responses/PatchWithArrayRelationshipValueResponse.json
@@ -4,7 +4,7 @@
             "id": "{{SOME_GUID}}",
             "status": "500",
             "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
-            "detail": "The value of a to-many relationship must be an object.",
+            "detail": "Each relationship key on a links object must have an object value.",
             "stackTrace": "{{STACK_TRACE}}",
             "inner": null
         }

diff --git a/...work.Tests/Acceptance/Fixtures/Posts/Responses/PatchWithMissingToManyLinkageResponse.json b/...work.Tests/Acceptance/Fixtures/Posts/Responses/PatchWithMissingToManyLinkageResponse.json
@@ -0,0 +1,12 @@
+{
+    "errors": [
+        {
+            "id": "{{SOME_GUID}}",
+            "status": "500",
+            "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
+            "detail": "Expected an array value for `linkage` but no `linkage` key was found.",
+            "stackTrace": "{{STACK_TRACE}}",
+            "inner": null
+        }
+    ]
+}
diff --git a/...nses/PatchWithMissingToOneIdResponse.json → ...atchWithNullForToManyLinkageResponse.json b/...nses/PatchWithMissingToOneIdResponse.json → ...atchWithNullForToManyLinkageResponse.json
@@ -4,7 +4,7 @@
             "id": "{{SOME_GUID}}",
             "status": "500",
             "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
-            "detail": "Nothing was specified for the `id` property.",
+            "detail": "Expected an array value for `linkage` but got Null.",
             "stackTrace": "{{STACK_TRACE}}",
             "inner": null
         }

diff --git a/...es/PatchWithMissingToManyIdsResponse.json → ...chWithObjectForToManyLinkageResponse.json b/...es/PatchWithMissingToManyIdsResponse.json → ...chWithObjectForToManyLinkageResponse.json
@@ -4,7 +4,7 @@
             "id": "{{SOME_GUID}}",
             "status": "500",
             "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
-            "detail": "If `data` is not specified, then `ids` must be specified.",
+            "detail": "Expected an array value for `linkage` but got Object.",
             "stackTrace": "{{STACK_TRACE}}",
             "inner": null
         }

diff --git a/...s/PatchWithMissingToManyTypeResponse.json → ...chWithStringForToManyLinkageResponse.json b/...s/PatchWithMissingToManyTypeResponse.json → ...chWithStringForToManyLinkageResponse.json
@@ -4,7 +4,7 @@
             "id": "{{SOME_GUID}}",
             "status": "500",
             "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
-            "detail": "If `data` is not specified, then `type` must be specified.",
+            "detail": "Expected an array value for `linkage` but got String.",
             "stackTrace": "{{STACK_TRACE}}",
             "inner": null
         }

diff --git a/...ork.Tests/Acceptance/Fixtures/Posts/Responses/PatchWithStringForToOneLinkageResponse.json b/...ork.Tests/Acceptance/Fixtures/Posts/Responses/PatchWithStringForToOneLinkageResponse.json
@@ -0,0 +1,12 @@
+{
+    "errors": [
+        {
+            "id": "{{SOME_GUID}}",
+            "status": "500",
+            "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
+            "detail": "Expected an object value for `linkage` but got String.",
+            "stackTrace": "{{STACK_TRACE}}",
+            "inner": null
+        }
+    ]
+}
diff --git a/...k.Tests/Acceptance/Fixtures/Posts/Responses/PatchWithStringRelationshipValueResponse.json b/...k.Tests/Acceptance/Fixtures/Posts/Responses/PatchWithStringRelationshipValueResponse.json
@@ -4,7 +4,7 @@
             "id": "{{SOME_GUID}}",
             "status": "500",
             "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
-            "detail": "The value of a to-one relationship must be an object or null.",
+            "detail": "Each relationship key on a links object must have an object value.",
             "stackTrace": "{{STACK_TRACE}}",
             "inner": null
         }

diff --git a/...tchWithToManyEmptyDataUpdateResponse.json → ...WithToManyEmptyLinkageUpdateResponse.json b/...tchWithToManyEmptyDataUpdateResponse.json → ...WithToManyEmptyLinkageUpdateResponse.json
diff --git a/...ts/Acceptance/Fixtures/Posts/Responses/PatchWithToManyLinkageObjectMissingIdResponse.json b/...ts/Acceptance/Fixtures/Posts/Responses/PatchWithToManyLinkageObjectMissingIdResponse.json
@@ -0,0 +1,12 @@
+{
+    "errors": [
+        {
+            "id": "{{SOME_GUID}}",
+            "status": "500",
+            "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
+            "detail": "Each linkage object must have a string value for the key `id`.",
+            "stackTrace": "{{STACK_TRACE}}",
+            "inner": null
+        }
+    ]
+}
diff --git a/.../Acceptance/Fixtures/Posts/Responses/PatchWithToManyLinkageObjectMissingTypeResponse.json b/.../Acceptance/Fixtures/Posts/Responses/PatchWithToManyLinkageObjectMissingTypeResponse.json
@@ -0,0 +1,12 @@
+{
+    "errors": [
+        {
+            "id": "{{SOME_GUID}}",
+            "status": "500",
+            "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
+            "detail": "Each linkage object must have a string value for the key `type`.",
+            "stackTrace": "{{STACK_TRACE}}",
+            "inner": null
+        }
+    ]
+}
diff --git a/...sts/Acceptance/Fixtures/Posts/Responses/PatchWithToOneLinkageObjectMissingIdResponse.json b/...sts/Acceptance/Fixtures/Posts/Responses/PatchWithToOneLinkageObjectMissingIdResponse.json
@@ -0,0 +1,12 @@
+{
+    "errors": [
+        {
+            "id": "{{SOME_GUID}}",
+            "status": "500",
+            "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
+            "detail": "Each linkage object must have a string value for the key `id`.",
+            "stackTrace": "{{STACK_TRACE}}",
+            "inner": null
+        }
+    ]
+}
diff --git a/...s/Acceptance/Fixtures/Posts/Responses/PatchWithToOneLinkageObjectMissingTypeResponse.json b/...s/Acceptance/Fixtures/Posts/Responses/PatchWithToOneLinkageObjectMissingTypeResponse.json
@@ -0,0 +1,12 @@
+{
+    "errors": [
+        {
+            "id": "{{SOME_GUID}}",
+            "status": "500",
+            "title": "JSONAPI.Json.JsonApiFormatter+BadRequestException",
+            "detail": "Each linkage object must have a string value for the key `type`.",
+            "stackTrace": "{{STACK_TRACE}}",
+            "inner": null
+        }
+    ]
+}