Merged upstream

Author: SphtKr

JSONAPI.Tests/Core/ModelManagerTests.cs

@@ -18,8 +18,10 @@ private class InvalidModel
         public void FindsIdNamedId()
         {
             // Arrange
+            var mm = new ModelManager();
+
             // Act
-            PropertyInfo idprop = ModelManager.Instance.GetIdProperty(typeof(Author));
+            PropertyInfo idprop = mm.GetIdProperty(typeof(Author));
 
             // Assert
             Assert.AreSame(typeof(Author).GetProperty("Id"), idprop);
@@ -30,8 +32,10 @@ public void FindsIdNamedId()
         public void DoesntFindMissingId()
         {
             // Arrange
+            var mm = new ModelManager();
+
             // Act
-            PropertyInfo idprop = ModelManager.Instance.GetIdProperty(typeof(InvalidModel));
+            PropertyInfo idprop = mm.GetIdProperty(typeof(InvalidModel));
 
             // Assert
             Assert.Fail("An InvalidOperationException should be thrown and we shouldn't get here!");

JSONAPI/Core/IModelManager.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSONAPI.Core
+{
+    public interface IModelManager
+    {
+        PropertyInfo GetIdProperty(Type type);
+    }
+}

JSONAPI/Core/ModelManager.cs

@@ -8,23 +8,9 @@
 
 namespace JSONAPI.Core
 {
-    internal class ModelManager
+    public class ModelManager : IModelManager
     {
-        #region Singleton pattern
-
-        private static readonly ModelManager instance = new ModelManager();
-
-        private ModelManager() { }
-
-        public static ModelManager Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
-
-        #endregion
+        public ModelManager() { }
 
         #region Cache storage
 

JSONAPI/JSONAPI.csproj

@@ -68,6 +68,7 @@
     <Compile Include="Attributes\IncludeInPayload.cs" />
     <Compile Include="Attributes\LinkTemplate.cs" />
     <Compile Include="Attributes\SerializeAs.cs" />
+    <Compile Include="Core\IModelManager.cs" />
     <Compile Include="Core\IPluralizationService.cs" />
     <Compile Include="Core\IMaterializer.cs" />
     <Compile Include="Core\MetadataManager.cs" />

JSONAPI/Json/JsonApiFormatter.cs

@@ -22,16 +22,23 @@ public class JsonApiFormatter : JsonMediaTypeFormatter
         public JsonApiFormatter()
             : this(new ErrorSerializer())
         {
+            if (_modelManager == null) _modelManager = new ModelManager();
+            SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/vnd.api+json"));
         }
 
         internal JsonApiFormatter(IErrorSerializer errorSerializer)
         {
             _errorSerializer = errorSerializer;
-            SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/vnd.api+json"));
         }
 
-        public IPluralizationService PluralizationService { get; set; }
+        public JsonApiFormatter(IModelManager modelManager) : this()
+        {
+            _modelManager = modelManager;
+        }
+
+        public IPluralizationService PluralizationService { get; set; } //FIXME: Deprecated, will be removed shortly
         private readonly IErrorSerializer _errorSerializer;
+        private readonly IModelManager _modelManager;
 
         private Lazy<Dictionary<Stream, RelationAggregator>> _relationAggregators
             = new Lazy<Dictionary<Stream, RelationAggregator>>(
@@ -152,7 +159,7 @@ protected void Serialize(object value, Stream writeStream, JsonWriter writer, Js
 
             // Do the Id now...
             writer.WritePropertyName("id");
-            var idProp = ModelManager.Instance.GetIdProperty(value.GetType());
+            var idProp = _modelManager.GetIdProperty(value.GetType());
             writer.WriteValue(GetValueForIdProperty(idProp, value));
 
             // Leverage the cached map to avoid another costly call to GetProperties()
@@ -799,7 +806,7 @@ protected object GetById(Type type, string id)
         {
             // Only good for creating dummy relationship objects...
             object retval = Activator.CreateInstance(type);
-            PropertyInfo idprop = ModelManager.Instance.GetIdProperty(type);
+            PropertyInfo idprop = _modelManager.GetIdProperty(type);
             idprop.SetValue(retval, System.Convert.ChangeType(id, idprop.PropertyType));
             return retval;
         }
@@ -828,7 +835,7 @@ protected string GetValueForIdProperty(PropertyInfo idprop, object obj)
         protected string GetIdFor(object obj)
         {
             Type type = obj.GetType();
-            PropertyInfo idprop = ModelManager.Instance.GetIdProperty(type);
+            PropertyInfo idprop = _modelManager.GetIdProperty(type);
             return GetValueForIdProperty(idprop, obj);
         }