Merge pull request #18 from trainline/dev

Merge dev into master

Author: cnolewajka

src/NJsonApiCore.Web.MVC5.HelloWorld/Controllers/ArticlesController.cs

@@ -20,6 +20,13 @@ public IHttpActionResult Get()
             md.GetMetaData().Add("response created", DateTime.Now);
             md.GetMetaData().Add("response created by", this.GetType());
             md.Links.Add("link1", new SimpleLink(new Uri("http://localhost")));
+
+            md.Links.Add("link2", new SimpleLink(new Uri("http://localhost")));
+
+            var complexLink = new LinkObject(new Uri("http://localhost/complex/"));
+            complexLink.Meta.Add("linkmeta", "linkmetavalue");
+            md.Links.Add("complexLink", complexLink);
+
             return Ok(md);
         }
 
@@ -40,7 +47,15 @@ public IHttpActionResult Get(int id)
             var md = new TopLevelDocument<Article>(a);
             md.GetMetaData().Add("response created", DateTime.Now);
             md.GetMetaData().Add("response created by", this.GetType());
+
             md.Links.Add("link1", new SimpleLink(new Uri("http://localhost")));
+
+            md.Links.Add("link2", new SimpleLink(new Uri("http://localhost")));
+
+            var complexLink = new LinkObject(new Uri("http://localhost/complex/"));
+            complexLink.Meta.Add("linkmeta", "linkmetavalue");
+            md.Links.Add("complexLink", complexLink);
+
             return Ok(md);
         }
 

src/NJsonApiCore.Web.MVC5.HelloWorld/Models/Article.cs

@@ -1,10 +1,15 @@
 using NJsonApi.Infrastructure;
+using NJsonApi.Serialization.Representations;
 using System.Collections.Generic;
+using System;
 
 namespace NJsonApi.Web.MVC5.HelloWorld.Models
 {
-    public class Article : ObjectMetaDataContainer
+    public class Article : IObjectMetaDataContainer, IObjectLinkContainer
     {
+        private ObjectMetaDataContainer _metaDataContainer = new ObjectMetaDataContainer();
+        private ObjectLinkContainer _linkContainer = new ObjectLinkContainer();
+
         public Article()
         {
         }
@@ -17,7 +22,6 @@ public Article(string title)
             PublishedInYears = new List<int>();
             Id = StaticPersistentStore.GetNextId();
             Title = title;
-
         }
 
         public int Id { get; set; }
@@ -44,5 +48,15 @@ public Article(string title)
 
         // an array of simple types that serializes as an attribute
         public List<int> PublishedInYears { get; set; }
+
+        public ILinkData GetLinks()
+        {
+            return _linkContainer.GetLinks();
+        }
+
+        public MetaData GetMetaData()
+        {
+            return _metaDataContainer.GetMetaData();
+        }
     }
 }

src/NJsonApiCore.Web.MVC5.HelloWorld/Models/StaticPersistentStore.cs

@@ -1,4 +1,5 @@
 using NJsonApi.Infrastructure;
+using NJsonApi.Serialization.Representations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -46,6 +47,13 @@ static StaticPersistentStore()
             article1.MoreComments.Add(comment3);
             article1.MoreComments.Add(comment4);
             article1.GetMetaData().Add("article created", DateTime.Now);
+
+            article1.GetLinks().Add("simplelink", new SimpleLink(new Uri("http://localhost/simplelink")));
+
+            var complexLink = new LinkObject(new Uri("http://localhost/complex/"));
+            complexLink.Meta.Add("linkmeta", "linkmetavalue");
+            article1.GetLinks().Add("complexLink", complexLink);
+
             article1.SingleTag = new Tag { Key = "tag key", Value = "single tag value" };
             article1.MoreTags.Add(new Tag { Key = "tag key (more)", Value = "tag value 1" });
             article1.MoreTags.Add(new Tag { Key = "tag key (more)", Value = "tag value 2" });

src/NJsonApiCore.Web.MVC5/Serialization/LinkBuilder.cs

@@ -20,7 +20,7 @@ public LinkBuilder(HttpConfiguration configuration, IApiExplorer descriptionProv
             this.descriptionProvider = descriptionProvider;
         }
 
-        public ILink FindResourceSelfLink(Context context, string resourceId, IResourceMapping resourceMapping)
+        public ISimpleLink FindResourceSelfLink(Context context, string resourceId, IResourceMapping resourceMapping)
         {
             var actions = descriptionProvider.From(resourceMapping.Controller);
 
@@ -34,15 +34,15 @@ public ILink FindResourceSelfLink(Context context, string resourceId, IResourceM
         }
 
         // TODO - Move into NJsonApiCore base library from here and .mVC6
-        public ILink RelationshipRelatedLink(Context context, string resourceId, IResourceMapping resourceMapping, IRelationshipMapping linkMapping)
+        public ISimpleLink RelationshipRelatedLink(Context context, string resourceId, IResourceMapping resourceMapping, IRelationshipMapping linkMapping)
         {
             var selfLink = FindResourceSelfLink(context, resourceId, resourceMapping).Href;
             var completeLink = $"{selfLink}/{linkMapping.RelationshipName}";
             return new SimpleLink(new Uri(completeLink));
         }
 
         // TODO - Move into NJsonApiCore base library from here and .mVC6
-        public ILink RelationshipSelfLink(Context context, string resourceId, IResourceMapping resourceMapping, IRelationshipMapping linkMapping)
+        public ISimpleLink RelationshipSelfLink(Context context, string resourceId, IResourceMapping resourceMapping, IRelationshipMapping linkMapping)
         {
             var selfLink = FindResourceSelfLink(context, resourceId, resourceMapping).Href;
             var completeLink = $"{selfLink}/relationships/{linkMapping.RelationshipName}";

src/NJsonApiCore.Web.MVCCore/Serialization/LinkBuilder.cs

@@ -17,7 +17,7 @@ public LinkBuilder(IApiDescriptionGroupCollectionProvider descriptionProvider)
             this.descriptionProvider = descriptionProvider;
         }
 
-        public ILink FindResourceSelfLink(Context context, string resourceId, IResourceMapping resourceMapping)
+        public ISimpleLink FindResourceSelfLink(Context context, string resourceId, IResourceMapping resourceMapping)
         {
             var actions = descriptionProvider.From(resourceMapping.Controller).Items;
 
@@ -31,14 +31,14 @@ public ILink FindResourceSelfLink(Context context, string resourceId, IResourceM
             return ToUrl(context, action, values);
         }
 
-        public ILink RelationshipRelatedLink(Context context, string resourceId, IResourceMapping resourceMapping, IRelationshipMapping linkMapping)
+        public ISimpleLink RelationshipRelatedLink(Context context, string resourceId, IResourceMapping resourceMapping, IRelationshipMapping linkMapping)
         {
             var selfLink = FindResourceSelfLink(context, resourceId, resourceMapping).Href;
             var completeLink = $"{selfLink}/{linkMapping.RelationshipName}";
             return new SimpleLink(new Uri(completeLink));
         }
 
-        public ILink RelationshipSelfLink(Context context, string resourceId, IResourceMapping resourceMapping, IRelationshipMapping linkMapping)
+        public ISimpleLink RelationshipSelfLink(Context context, string resourceId, IResourceMapping resourceMapping, IRelationshipMapping linkMapping)
         {
             var selfLink = FindResourceSelfLink(context, resourceId, resourceMapping).Href;
             var completeLink = $"{selfLink}/relationships/{linkMapping.RelationshipName}";

src/NJsonApiCore/IResourceMapping.cs

@@ -23,8 +23,5 @@ public interface IResourceMapping
         Dictionary<string, object> GetAttributes(object objectGraph, JsonSerializerSettings settings);
 
         Dictionary<string, object> GetValuesFromAttributes(Dictionary<string, object> attributes);
-
-        MetaData GetObjectMetadata(object objectGraph);
-        MetaData GetRelationshipMetadata(object objectGraph);
     }
 }

src/NJsonApiCore/Infrastructure/ILinkContainer.cs

@@ -0,0 +1,19 @@
+using NJsonApi.Infrastructure;
+
+namespace NJsonApi.Serialization.Representations
+{
+    public interface IObjectLinkContainer
+    {
+        ILinkData GetLinks();
+    }
+
+    public class ObjectLinkContainer : IObjectLinkContainer
+    {
+        private ILinkData _linkData = new LinkData();
+
+        public ILinkData GetLinks()
+        {
+            return _linkData;
+        }
+    }
+}

src/NJsonApiCore/Infrastructure/ILinkData.cs

@@ -0,0 +1,14 @@
+using NJsonApi.Serialization.Representations;
+using System.Collections.Generic;
+
+namespace NJsonApi.Infrastructure
+{
+    public interface ILinkData : IDictionary<string, ILink>
+    {
+    }
+
+    public class LinkData : Dictionary<string, ILink>, ILinkData
+    {
+
+    }
+}

src/NJsonApiCore/Infrastructure/IMetaDataContainer.cs

@@ -1,6 +1,4 @@
-using NJsonApi.Infrastructure;
-
-namespace NJsonApi.Infrastructure
+namespace NJsonApi.Infrastructure
 {
     public interface IObjectMetaDataContainer
     {

src/NJsonApiCore/NJsonApiCore.csproj

@@ -67,6 +67,8 @@
     <Compile Include="Conventions\IResourceTypeConvention.cs" />
     <Compile Include="Exceptions\MissingMappingException.cs" />
     <Compile Include="IConfiguration.cs" />
+    <Compile Include="Infrastructure\ILinkContainer.cs" />
+    <Compile Include="Infrastructure\ILinkData.cs" />
     <Compile Include="Infrastructure\IMetaDataContainer.cs" />
     <Compile Include="Infrastructure\TopLevelDocument.cs" />
     <Compile Include="Infrastructure\CollectionDelta.cs" />