Initial implementation of GetPropertyMap, no tests yet.

Author: SphtKr

JSONAPI/Core/ModelManager.cs

@@ -1,4 +1,5 @@
-using System;
+using JSONAPI.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -32,6 +33,11 @@ private Lazy<Dictionary<Type, PropertyInfo>> _idProperties
                 () => new Dictionary<Type, PropertyInfo>()
             );
 
+        private Lazy<Dictionary<Type, Dictionary<string, PropertyInfo>>> _propertyMaps
+            = new Lazy<Dictionary<Type, Dictionary<string, PropertyInfo>>>(
+                () => new Dictionary<Type, Dictionary<string, PropertyInfo>>()
+            );
+
         #endregion
 
         #region Id property determination
@@ -57,5 +63,29 @@ public PropertyInfo GetIdProperty(Type type)
         }
 
         #endregion
+
+        #region Property Maps
+
+        public Dictionary<string, PropertyInfo> GetPropertyMap(Type type)
+        {
+            Dictionary<string, PropertyInfo> propMap = null;
+
+            var propMapCache = _propertyMaps.Value;
+
+            if (propMapCache.TryGetValue(type, out propMap)) return propMap;
+
+            propMap = new Dictionary<string, PropertyInfo>();
+            PropertyInfo[] props = type.GetProperties();
+            foreach (PropertyInfo prop in props)
+            {
+                propMap[JsonApiFormatter.FormatPropertyName(prop.Name)] = prop;
+            }
+
+            propMapCache.Add(type, propMap);
+
+            return propMap;
+        }
+
+        #endregion
     }
 }

JSONAPI/Json/JsonApiFormatter.cs

@@ -549,15 +549,9 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,
         public object Deserialize(Type objectType, Stream readStream, JsonReader reader, JsonSerializer serializer)
         {
             object retval = Activator.CreateInstance(objectType);
-            PropertyInfo[] props = objectType.GetProperties();
-
-            //TODO: This could get expensive...cache these maps per type, so we only build the map once?
-            IDictionary<string, PropertyInfo> propMap = new Dictionary<string, PropertyInfo>();
-            foreach (PropertyInfo prop in props)
-            {
-                propMap[FormatPropertyName(prop.Name)] = prop;
-            }
 
+            IDictionary<string, PropertyInfo> propMap = ModelManager.Instance.GetPropertyMap(objectType);
+            
             if (reader.TokenType != JsonToken.StartObject) throw new JsonReaderException(String.Format("Expected JsonToken.StartObject, got {0}", reader.TokenType.ToString()));
             reader.Read(); // Burn the StartObject token
             do
@@ -640,13 +634,7 @@ private void DeserializeLinkedResources(object obj, Stream readStream, JsonReade
             //reader.Read();
             if (reader.TokenType != JsonToken.StartObject) throw new JsonSerializationException("'links' property is not an object!");
 
-            //TODO: Redundant, already done in Deserialize method...optimize?
-            PropertyInfo[] props = obj.GetType().GetProperties();
-            IDictionary<string, PropertyInfo> propMap = new Dictionary<string, PropertyInfo>();
-            foreach (PropertyInfo prop in props)
-            {
-                propMap[FormatPropertyName(prop.Name)] = prop;
-            }
+            IDictionary<string, PropertyInfo> propMap = ModelManager.Instance.GetPropertyMap(obj.GetType());
 
             while (reader.Read())
             {
@@ -809,6 +797,7 @@ private Type GetSingleType(Type type)//dynamic value = null)
             return type;
         }
 
+        //TODO: Should this move to ModelManager? Could be cached there to improve performance?
         public static string FormatPropertyName(string propertyName)
         {
             string result = propertyName.Substring(0, 1).ToLower() + propertyName.Substring(1);