Incorporated feedback from #25, including removing unneeded default constructors. Added caching to IsSerializedAsMany and GetElementType. Made ModelManager a little more subclassing-friendly.

Author: SphtKr

JSONAPI.Tests/Core/ModelManagerTests.cs

@@ -20,7 +20,7 @@ private class InvalidModel // No Id discernable!
         public void FindsIdNamedId()
         {
             // Arrange
-            var mm = new ModelManager();
+            var mm = new ModelManager(new PluralizationService());
 
             // Act
             PropertyInfo idprop = mm.GetIdProperty(typeof(Author));
@@ -34,7 +34,7 @@ public void FindsIdNamedId()
         public void DoesntFindMissingId()
         {
             // Arrange
-            var mm = new ModelManager();
+            var mm = new ModelManager(new PluralizationService());
 
             // Act
             PropertyInfo idprop = mm.GetIdProperty(typeof(InvalidModel));
@@ -104,7 +104,7 @@ public void GetPropertyForJsonKeyTest()
         public void IsSerializedAsManyTest()
         {
             // Arrange
-            var mm = new ModelManager();
+            var mm = new ModelManager(new PluralizationService());
 
             // Act
             bool isArray = mm.IsSerializedAsMany(typeof(Post[]));
@@ -125,7 +125,7 @@ public void IsSerializedAsManyTest()
         public void GetElementTypeTest()
         {
             // Arrange
-            var mm = new ModelManager();
+            var mm = new ModelManager(new PluralizationService());
 
             // Act
             Type postTypeFromArray = mm.GetElementType(typeof(Post[]));
@@ -140,7 +140,7 @@ public void GetElementTypeTest()
         public void GetElementTypeInvalidArgumentTest()
         {
             // Arrange
-            var mm = new ModelManager();
+            var mm = new ModelManager(new PluralizationService());
 
             // Act
             Type x = mm.GetElementType(typeof(Author));

JSONAPI.Tests/Json/JsonApiMediaFormaterTests.cs

@@ -107,7 +107,7 @@ private enum TestEnum
         public void CanWritePrimitiveTest()
         {
             // Arrange
-            JsonApiFormatter formatter = new JSONAPI.Json.JsonApiFormatter();
+            JsonApiFormatter formatter = new JSONAPI.Json.JsonApiFormatter(new PluralizationService());
             // Act
             // Assert
             Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(Int32)), "CanWriteTypeAsPrimitive returned wrong answer for Integer!");

JSONAPI/Core/IModelManager.cs

@@ -42,7 +42,7 @@ public interface IModelManager
         string GetJsonKeyForProperty(PropertyInfo propInfo); //TODO: Do we need to have a type parameter here, in case the property is inherited?
 
         /// <summary>
-        /// Returns the property corresponding to a given JSON Key. Inverse of GetJsonKeyForType.
+        /// Returns the property corresponding to a given JSON Key. Inverse of GetJsonKeyForProperty.
         /// </summary>
         /// <param name="type">The Type to find the property on</param>
         /// <param name="jsonKey">The JSON key representing a property</param>

JSONAPI/Core/ModelManager.cs

@@ -10,16 +10,12 @@ namespace JSONAPI.Core
 {
     public class ModelManager : IModelManager
     {
-        public ModelManager() {
-            _pluralizationService = new PluralizationService();
-        }
-
         public ModelManager(IPluralizationService pluralizationService)
         {
             _pluralizationService = pluralizationService;
         }
 
-        private IPluralizationService _pluralizationService = null;
+        protected IPluralizationService _pluralizationService = null;
         public IPluralizationService PluralizationService
         {
             get
@@ -30,21 +26,31 @@ public IPluralizationService PluralizationService
 
         #region Cache storage
 
-        private Lazy<Dictionary<Type, PropertyInfo>> _idProperties
+        protected Lazy<Dictionary<Type, PropertyInfo>> _idProperties
             = new Lazy<Dictionary<Type,PropertyInfo>>(
                 () => new Dictionary<Type, PropertyInfo>()
             );
 
-        private Lazy<Dictionary<Type, Dictionary<string, PropertyInfo>>> _propertyMaps
+        protected Lazy<Dictionary<Type, Dictionary<string, PropertyInfo>>> _propertyMaps
             = new Lazy<Dictionary<Type, Dictionary<string, PropertyInfo>>>(
                 () => new Dictionary<Type, Dictionary<string, PropertyInfo>>()
             );
 
-        private Lazy<Dictionary<Type, string>> _jsonKeysForType
+        protected Lazy<Dictionary<Type, string>> _jsonKeysForType
             = new Lazy<Dictionary<Type, string>>(
                 () => new Dictionary<Type, string>()
             );
 
+        protected Lazy<Dictionary<Type, bool>> _isSerializedAsMany
+            = new Lazy<Dictionary<Type, bool>>(
+                () => new Dictionary<Type, bool>()
+            );
+
+        protected Lazy<Dictionary<Type, Type>> _getElementType
+            = new Lazy<Dictionary<Type, Type>>(
+                () => new Dictionary<Type, Type>()
+            );
+
         #endregion
 
         #region Id property determination
@@ -76,7 +82,7 @@ public PropertyInfo GetIdProperty(Type type)
 
         #region Property Maps
 
-        protected IDictionary<string, PropertyInfo> GetPropertyMap(Type type) //FIXME: Will become protected
+        protected IDictionary<string, PropertyInfo> GetPropertyMap(Type type)
         {
             Dictionary<string, PropertyInfo> propMap = null;
 
@@ -158,20 +164,41 @@ protected static string FormatPropertyName(string propertyName)
 
         public bool IsSerializedAsMany(Type type)
         {
-            bool isMany = 
-                type.IsArray ||
-                (type.GetInterfaces().Contains(typeof(System.Collections.IEnumerable)) && type.IsGenericType);
+            bool isMany;
+
+            var isManyCache = _isSerializedAsMany.Value;
+
+            lock (isManyCache)
+            {
+                if (isManyCache.TryGetValue(type, out isMany)) return isMany;
+
+                isMany =
+                    type.IsArray ||
+                    (type.GetInterfaces().Contains(typeof(System.Collections.IEnumerable)) && type.IsGenericType);
+
+                isManyCache.Add(type, isMany);
+            }
 
             return isMany;
         }
 
         public Type GetElementType(Type manyType)
         {
             Type etype = null;
-            if (manyType.IsGenericType)
-                etype = manyType.GetGenericArguments()[0];
-            else
-                etype = manyType.GetElementType();
+
+            var etypeCache = _getElementType.Value;
+
+            lock (etypeCache)
+            {
+                if (etypeCache.TryGetValue(manyType, out etype)) return etype;
+
+                if (manyType.IsGenericType)
+                    etype = manyType.GetGenericArguments()[0];
+                else
+                    etype = manyType.GetElementType();
+
+                etypeCache.Add(manyType, etype);
+            }
 
             return etype;
         }

JSONAPI/Json/JsonApiFormatter.cs

@@ -19,11 +19,6 @@ namespace JSONAPI.Json
 {
     public class JsonApiFormatter : JsonMediaTypeFormatter
     {
-        public JsonApiFormatter()
-            : this(new ModelManager(), new ErrorSerializer())
-        {
-        }
-
         public JsonApiFormatter(IModelManager modelManager) :
             this(modelManager, new ErrorSerializer())
         {
@@ -36,7 +31,7 @@ public JsonApiFormatter(IPluralizationService pluralizationService) :
 
         // Currently for tests only.
         internal JsonApiFormatter(IErrorSerializer errorSerializer)
-            : this(new ModelManager(), errorSerializer)
+            : this(new ModelManager(new PluralizationService()), errorSerializer)
         {
 
         }
@@ -48,7 +43,7 @@ internal JsonApiFormatter(IModelManager modelManager, IErrorSerializer errorSeri
             SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/vnd.api+json"));
         }
 
-        [Obsolete]
+        [Obsolete("Use ModelManager.PluralizationService instead")]
         public IPluralizationService PluralizationService  //FIXME: Deprecated, will be removed shortly
         {
             get