Maintain a single dictionary for TypeFields + TypeProperties

Author: mythz

src/ServiceStack.Text/TypeFields.cs

@@ -8,6 +8,25 @@
 
 namespace ServiceStack
 {
+    public class TypeFieldInfo
+    {
+        public TypeFieldInfo(
+            FieldInfo fieldInfo,
+            PropertyGetterDelegate publicGetter,
+            PropertySetterDelegate publicSetter)
+        {
+            FieldInfo = fieldInfo;
+            PublicGetter = publicGetter;
+            PublicSetter = publicSetter;
+        }
+
+        public FieldInfo FieldInfo { get; }
+
+        public PropertyGetterDelegate PublicGetter { get; }
+
+        public PropertySetterDelegate PublicSetter { get; }
+    }
+
     public class TypeFields<T> : TypeFields
     {
         public static readonly TypeFields<T> Instance = new TypeFields<T>();
@@ -23,10 +42,12 @@ static TypeFields()
             {
                 try
                 {
-                    Instance.PublicGetters[fi.Name] = PclExport.Instance.GetFieldGetterFn(fi);
-                    Instance.PublicSetters[fi.Name] = fi.GetValueSetter(typeof(T));
+                    Instance.FieldsMap[fi.Name] = new TypeFieldInfo(
+                        fi,
+                        PclExport.Instance.GetFieldGetterFn(fi),
+                        PclExport.Instance.GetFieldSetterFn(fi));
+
                     Instance.GenericPublicSetters[fi.Name] = fi.GetValueSetterGenericRef<T>();
-                    Instance.PublicFields[fi.Name] = fi;
                 }
                 catch (Exception ex)
                 {
@@ -82,14 +103,8 @@ public static TypeFields Get(Type type)
 
         public Type Type { get; protected set; }
 
-        public readonly Dictionary<string, PropertyGetterDelegate> PublicGetters =
-            new Dictionary<string, PropertyGetterDelegate>(PclExport.Instance.InvariantComparerIgnoreCase);
-
-        public readonly Dictionary<string, Action<object, object>> PublicSetters =
-            new Dictionary<string, Action<object, object>>(PclExport.Instance.InvariantComparerIgnoreCase);
-
-        public readonly Dictionary<string, FieldInfo> PublicFields =
-            new Dictionary<string, FieldInfo>(PclExport.Instance.InvariantComparerIgnoreCase);
+        public readonly Dictionary<string, TypeFieldInfo> FieldsMap =
+            new Dictionary<string, TypeFieldInfo>(PclExport.Instance.InvariantComparerIgnoreCase);
 
         public FieldInfo[] PublicFieldInfos { get; protected set; }
 
@@ -103,43 +118,27 @@ public virtual FieldInfo GetPublicField(string name)
             return null;
         }
 
-        public virtual PropertyGetterDelegate GetPublicGetter(FieldInfo fi)
-        {
-            if (fi == null)
-                return null;
-
-            return PublicGetters.TryGetValue(fi.Name, out PropertyGetterDelegate fn)
-                ? fn
-                : PclExport.Instance.GetFieldGetterFn(fi);
-        }
+        public virtual PropertyGetterDelegate GetPublicGetter(FieldInfo fi) => GetPublicGetter(fi?.Name);
 
         public virtual PropertyGetterDelegate GetPublicGetter(string name)
         {
             if (name == null)
                 return null;
 
-            return PublicGetters.TryGetValue(name, out PropertyGetterDelegate fn)
-                ? fn
+            return FieldsMap.TryGetValue(name, out TypeFieldInfo info)
+                ? info.PublicGetter
                 : null;
         }
 
-        public virtual Action<object, object> GetPublicSetter(FieldInfo fi)
-        {
-            if (fi == null)
-                return null;
-
-            return PublicSetters.TryGetValue(fi.Name, out Action<object, object> fn)
-                ? fn
-                : fi.GetValueSetter(Type);
-        }
+        public virtual PropertySetterDelegate GetPublicSetter(FieldInfo fi) => GetPublicSetter(fi?.Name);
 
-        public virtual Action<object, object> GetPublicSetter(string name)
+        public virtual PropertySetterDelegate GetPublicSetter(string name)
         {
             if (name == null)
                 return null;
 
-            return PublicSetters.TryGetValue(name, out Action<object, object> fn)
-                ? fn
+            return FieldsMap.TryGetValue(name, out TypeFieldInfo info)
+                ? info.PublicSetter
                 : null;
         }
 

src/ServiceStack.Text/TypeProperties.cs

@@ -10,6 +10,25 @@ namespace ServiceStack
     [Obsolete("Use TypeProperties<T>.Instance")]
     public static class TypeReflector<T> { }
 
+    public class TypePropertyInfo
+    {
+        public TypePropertyInfo(
+            PropertyInfo propertyInfo, 
+            Func<object, object> publicGetter, 
+            Action<object, object> publicSetter)
+        {
+            PropertyInfo = propertyInfo;
+            PublicGetter = publicGetter;
+            PublicSetter = publicSetter;
+        }
+
+        public PropertyInfo PropertyInfo { get; }
+
+        public Func<object, object> PublicGetter { get; }
+
+        public Action<object, object> PublicSetter { get; }
+    }
+
     public class TypeProperties<T> : TypeProperties
     {
         public static readonly TypeProperties<T> Instance = new TypeProperties<T>();
@@ -22,9 +41,11 @@ static TypeProperties()
             {
                 try
                 {
-                    Instance.PublicGetters[pi.Name] = pi.GetValueGetter(typeof(T));
-                    Instance.PublicSetters[pi.Name] = pi.GetValueSetter(typeof(T));
-                    Instance.PublicProperties[pi.Name] = pi;
+                    Instance.PropertyMap[pi.Name] = new TypePropertyInfo(
+                        pi,
+                        pi.GetValueGetter(typeof(T)),
+                        pi.GetValueSetter(typeof(T))
+                    );
                 }
                 catch (Exception ex)
                 {
@@ -65,14 +86,8 @@ public static TypeProperties Get(Type type)
 
         public Type Type { get; protected set; }
 
-        public readonly Dictionary<string, Func<object, object>> PublicGetters =
-            new Dictionary<string, Func<object, object>>(PclExport.Instance.InvariantComparerIgnoreCase);
-
-        public readonly Dictionary<string, Action<object, object>> PublicSetters =
-            new Dictionary<string, Action<object, object>>(PclExport.Instance.InvariantComparerIgnoreCase);
-
-        public readonly Dictionary<string, PropertyInfo> PublicProperties =
-            new Dictionary<string, PropertyInfo>(PclExport.Instance.InvariantComparerIgnoreCase);
+        public readonly Dictionary<string, TypePropertyInfo> PropertyMap =
+            new Dictionary<string, TypePropertyInfo>(PclExport.Instance.InvariantComparerIgnoreCase);
 
         public PropertyInfo[] PublicPropertyInfos { get; protected set; }
 
@@ -86,43 +101,27 @@ public PropertyInfo GetPublicProperty(string name)
             return null;
         }
 
-        public Func<object, object> GetPublicGetter(PropertyInfo pi)
-        {
-            if (pi == null)
-                return null;
-
-            return PublicGetters.TryGetValue(pi.Name, out Func<object, object> fn)
-                ? fn
-                : pi.GetValueGetter();
-        }
+        public Func<object, object> GetPublicGetter(PropertyInfo pi) => GetPublicGetter(pi?.Name);
 
         public Func<object, object> GetPublicGetter(string name)
         {
             if (name == null)
                 return null;
 
-            return PublicGetters.TryGetValue(name, out Func<object, object> fn)
-                ? fn
+            return PropertyMap.TryGetValue(name, out TypePropertyInfo info)
+                ? info.PublicGetter
                 : null;
         }
 
-        public Action<object, object> GetPublicSetter(PropertyInfo pi)
-        {
-            if (pi == null)
-                return null;
-
-            return PublicSetters.TryGetValue(pi.Name, out Action<object, object> fn)
-                ? fn
-                : pi.GetValueSetter();
-        }
+        public Action<object, object> GetPublicSetter(PropertyInfo pi) => GetPublicSetter(pi?.Name);
 
         public Action<object, object> GetPublicSetter(string name)
         {
             if (name == null)
                 return null;
 
-            return PublicSetters.TryGetValue(name, out Action<object, object> fn)
-                ? fn
+            return PropertyMap.TryGetValue(name, out TypePropertyInfo info)
+                ? info.PublicSetter
                 : null;
         }
     }