Finished removing GetPropertyMap, adds GetProperties to accomodate one of the use cases. Added tests.

Author: SphtKr

JSONAPI.Tests/Core/ModelManagerTests.cs

@@ -42,35 +42,60 @@ public void DoesntFindMissingId()
         }
 
         [TestMethod]
-        public void GetPropertyMapTest()
+        public void GetJsonKeyForTypeTest()
         {
             // Arrange
-            var mm = new ModelManager();
+            var pluralizationService = new PluralizationService();
+            var mm = new ModelManager(pluralizationService);
 
             // Act
-            var propMap = mm.GetPropertyMap(typeof(Post));
-            
+            var postKey = mm.GetJsonKeyForType(typeof(Post));
+            var authorKey = mm.GetJsonKeyForType(typeof(Author));
+            var commentKey = mm.GetJsonKeyForType(typeof(Comment));
+
             // Assert
-            Assert.AreSame(typeof(Post).GetProperty("Id"), propMap["id"]);
-            Assert.AreSame(typeof(Post).GetProperty("Author"), propMap["author"]);
+            Assert.AreEqual("posts", postKey);
+            Assert.AreEqual("authors", authorKey);
+            Assert.AreEqual("comments", commentKey);
         }
 
         [TestMethod]
-        public void GetJsonKeyForTypeTest()
+        public void GetJsonKeyForPropertyTest()
         {
             // Arrange
             var pluralizationService = new PluralizationService();
             var mm = new ModelManager(pluralizationService);
 
             // Act
-            var postKey = mm.GetJsonKeyForType(typeof(Post));
-            var authorKey = mm.GetJsonKeyForType(typeof(Author));
-            var commentKey = mm.GetJsonKeyForType(typeof(Comment));
+            var idKey = mm.GetJsonKeyForProperty(typeof(Author).GetProperty("Id"));
+            var nameKey = mm.GetJsonKeyForProperty(typeof(Author).GetProperty("Name"));
+            var postsKey = mm.GetJsonKeyForProperty(typeof(Author).GetProperty("Posts"));
 
             // Assert
-            Assert.AreEqual("posts", postKey);
-            Assert.AreEqual("authors", authorKey);
-            Assert.AreEqual("comments", commentKey);
+            Assert.AreEqual("id", idKey);
+            Assert.AreEqual("name", nameKey);
+            Assert.AreEqual("posts", postsKey);
+
+        }
+        
+        [TestMethod]
+        public void GetPropertyForJsonKeyTest()
+        {
+            // Arrange
+            var pluralizationService = new PluralizationService();
+            var mm = new ModelManager(pluralizationService);
+            Type authorType = typeof(Author).GetType();
+
+            // Act
+            var idProp = mm.GetPropertyForJsonKey(authorType, "id");
+            var nameProp = mm.GetPropertyForJsonKey(authorType, "name");
+            var postsProp = mm.GetPropertyForJsonKey(authorType, "posts");
+
+            // Assert
+            Assert.AreSame(authorType.GetProperty("Id"), idProp);
+            Assert.AreSame(authorType.GetProperty("Name"), nameProp);
+            Assert.AreSame(authorType.GetProperty("Posts"), postsProp);
+
         }
     }
 }

JSONAPI/Core/IModelManager.cs

@@ -13,10 +13,19 @@ public interface IModelManager
 
         PropertyInfo GetIdProperty(Type type);
         string GetJsonKeyForType(Type type);
-        string GetJsonKeyForProperty(PropertyInfo propInfo); //TODO: Do we need to have a type parameter here, in case propInfo is inherited?
+        string GetJsonKeyForProperty(PropertyInfo propInfo); //TODO: Do we need to have a type parameter here, in case the property is inherited?
         PropertyInfo GetPropertyForJsonKey(Type type, string jsonKey);
 
-        [Obsolete]
-        IDictionary<string, PropertyInfo> GetPropertyMap(Type type);
+        /// <summary>
+        /// Analogue to System.Type.GetProperties(), but made available so that any caching done
+        /// by an IModelManager can be leveraged to return the results faster.
+        /// </summary>
+        /// <param name="type">The type to get properties from</param>
+        /// <returns>All properties recognized by the IModelManager.</returns>
+        //TODO: This needs to include JsonIgnore'd properties, so that they can be found and explicitly included at runtime...confusing? Add another method that excludes these?
+        PropertyInfo[] GetProperties(Type type);
+
+        //[Obsolete]
+        //IDictionary<string, PropertyInfo> GetPropertyMap(Type type);
     }
 }

JSONAPI/Core/ModelManager.cs

@@ -76,7 +76,7 @@ public PropertyInfo GetIdProperty(Type type)
 
         #region Property Maps
 
-        public IDictionary<string, PropertyInfo> GetPropertyMap(Type type) //FIXME: Will become protected
+        protected IDictionary<string, PropertyInfo> GetPropertyMap(Type type) //FIXME: Will become protected
         {
             Dictionary<string, PropertyInfo> propMap = null;
 
@@ -99,6 +99,11 @@ public IDictionary<string, PropertyInfo> GetPropertyMap(Type type) //FIXME: Will
             return propMap;
         }
 
+        public PropertyInfo[] GetProperties(Type type)
+        {
+            return GetPropertyMap(type).Values.ToArray();
+        }
+
         public PropertyInfo GetPropertyForJsonKey(Type type, string jsonKey)
         {
             PropertyInfo propInfo;

JSONAPI/Json/JsonApiFormatter.cs

@@ -175,8 +175,8 @@ protected void Serialize(object value, Stream writeStream, JsonWriter writer, Js
             var idProp = _modelManager.GetIdProperty(value.GetType());
             writer.WriteValue(GetValueForIdProperty(idProp, value));
 
-            // Leverage the cached map to avoid another costly call to GetProperties()
-            PropertyInfo[] props = _modelManager.GetPropertyMap(value.GetType()).Values.ToArray();
+            // Leverage the cached map to avoid another costly call to System.Type.GetProperties()
+            PropertyInfo[] props = _modelManager.GetProperties(value.GetType());
 
             // Do non-model properties first, everything else goes in "links"
             //TODO: Unless embedded???
@@ -573,8 +573,6 @@ public object Deserialize(Type objectType, Stream readStream, JsonReader reader,
         {
             object retval = Activator.CreateInstance(objectType);
 
-            IDictionary<string, PropertyInfo> propMap = _modelManager.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
@@ -589,7 +587,7 @@ public object Deserialize(Type objectType, Stream readStream, JsonReader reader,
                         //TODO: linked resources (Done??)
                         DeserializeLinkedResources(retval, readStream, reader, serializer);
                     }
-                    else if (propMap.TryGetValue(value, out prop))
+                    else if ((prop = _modelManager.GetPropertyForJsonKey(objectType, value)) != null)
                     {
                         reader.Read(); // burn the PropertyName token
                         //TODO: Embedded would be dropped here!
@@ -657,16 +655,16 @@ private void DeserializeLinkedResources(object obj, Stream readStream, JsonReade
             //reader.Read();
             if (reader.TokenType != JsonToken.StartObject) throw new JsonSerializationException("'links' property is not an object!");
 
-            IDictionary<string, PropertyInfo> propMap = _modelManager.GetPropertyMap(obj.GetType());
+            Type objectType = obj.GetType();
 
             while (reader.Read())
             {
                 if (reader.TokenType == JsonToken.PropertyName)
                 {
                     string value = (string)reader.Value;
                     reader.Read(); // burn the PropertyName token
-                    PropertyInfo prop;
-                    if (propMap.TryGetValue(value, out prop) && !CanWriteTypeAsPrimitive(prop.PropertyType))
+                    PropertyInfo prop = _modelManager.GetPropertyForJsonKey(objectType, value);
+                    if (prop != null && !CanWriteTypeAsPrimitive(prop.PropertyType))
                     {
                         //FIXME: We're really assuming they're ICollections...but testing for that doesn't work for some reason. Break prone!
                         if (prop.PropertyType.GetInterfaces().Contains(typeof(IEnumerable)) && prop.PropertyType.IsGenericType)