Rename to PropertyAccessor / FieldAccessor

mythz · mythz · commit 8f991495e560 · 2017-06-03T05:06:45.000-04:00
diff --git a/src/ServiceStack.Text/TypeFields.cs b/src/ServiceStack.Text/TypeFields.cs
@@ -12,9 +12,9 @@
 
 namespace ServiceStack
 {
-    public class TypeFieldInfo
+    public class FieldAccessor
     {
-        public TypeFieldInfo(
+        public FieldAccessor(
             FieldInfo fieldInfo,
             GetMemberDelegate publicGetter,
             SetMemberDelegate publicSetter,
@@ -48,7 +48,7 @@ static TypeFields()
                 try
                 {
                     var fnRef = fi.SetExpressionRef<T>();
-                    Instance.FieldsMap[fi.Name] = new TypeFieldInfo(
+                    Instance.FieldsMap[fi.Name] = new FieldAccessor(
                         fi,
                         PclExport.Instance.CreateGetter(fi),
                         PclExport.Instance.CreateSetter(fi),
@@ -66,9 +66,9 @@ static TypeFields()
             }
         }
 
-        public static TypeFieldInfo GetAccessor(string propertyName)
+        public static FieldAccessor GetAccessor(string propertyName)
         {
-            return Instance.FieldsMap.TryGetValue(propertyName, out TypeFieldInfo info)
+            return Instance.FieldsMap.TryGetValue(propertyName, out FieldAccessor info)
                 ? info
                 : null;
         }
@@ -103,17 +103,17 @@ public static TypeFields Get(Type type)
             return instance;
         }
 
-        public TypeFieldInfo GetAccessor(string propertyName)
+        public FieldAccessor GetAccessor(string propertyName)
         {
-            return FieldsMap.TryGetValue(propertyName, out TypeFieldInfo info)
+            return FieldsMap.TryGetValue(propertyName, out FieldAccessor info)
                 ? info
                 : null;
         }
 
         public Type Type { get; protected set; }
 
-        public readonly Dictionary<string, TypeFieldInfo> FieldsMap =
-            new Dictionary<string, TypeFieldInfo>(PclExport.Instance.InvariantComparerIgnoreCase);
+        public readonly Dictionary<string, FieldAccessor> FieldsMap =
+            new Dictionary<string, FieldAccessor>(PclExport.Instance.InvariantComparerIgnoreCase);
 
         public FieldInfo[] PublicFieldInfos { get; protected set; }
 
@@ -134,7 +134,7 @@ public virtual GetMemberDelegate GetPublicGetter(string name)
             if (name == null)
                 return null;
 
-            return FieldsMap.TryGetValue(name, out TypeFieldInfo info)
+            return FieldsMap.TryGetValue(name, out FieldAccessor info)
                 ? info.PublicGetter
                 : null;
         }
@@ -146,7 +146,7 @@ public virtual SetMemberDelegate GetPublicSetter(string name)
             if (name == null)
                 return null;
 
-            return FieldsMap.TryGetValue(name, out TypeFieldInfo info)
+            return FieldsMap.TryGetValue(name, out FieldAccessor info)
                 ? info.PublicSetter
                 : null;
         }
@@ -156,7 +156,7 @@ public virtual SetMemberRefDelegate GetPublicSetterRef(string name)
             if (name == null)
                 return null;
 
-            return FieldsMap.TryGetValue(name, out TypeFieldInfo info)
+            return FieldsMap.TryGetValue(name, out FieldAccessor info)
                 ? info.PublicSetterRef
                 : null;
         }
diff --git a/src/ServiceStack.Text/TypeProperties.cs b/src/ServiceStack.Text/TypeProperties.cs
@@ -15,9 +15,9 @@ namespace ServiceStack
     [Obsolete("Use TypeProperties<T>.Instance")]
     public static class TypeReflector<T> { }
 
-    public class TypePropertyInfo
+    public class PropertyAccessor
     {
-        public TypePropertyInfo(
+        public PropertyAccessor(
             PropertyInfo propertyInfo,
             GetMemberDelegate publicGetter,
             SetMemberDelegate publicSetter)
@@ -46,7 +46,7 @@ static TypeProperties()
             {
                 try
                 {
-                    Instance.PropertyMap[pi.Name] = new TypePropertyInfo(
+                    Instance.PropertyMap[pi.Name] = new PropertyAccessor(
                         pi,
                         PclExport.Instance.CreateGetter(pi),
                         PclExport.Instance.CreateSetter(pi)
@@ -59,9 +59,9 @@ static TypeProperties()
             }
         }
 
-        public static TypePropertyInfo GetAccessor(string propertyName)
+        public static PropertyAccessor GetAccessor(string propertyName)
         {
-            return Instance.PropertyMap.TryGetValue(propertyName, out TypePropertyInfo info)
+            return Instance.PropertyMap.TryGetValue(propertyName, out PropertyAccessor info)
                 ? info
                 : null;
         }
@@ -96,17 +96,17 @@ public static TypeProperties Get(Type type)
             return instance;
         }
 
-        public TypePropertyInfo GetAccessor(string propertyName)
+        public PropertyAccessor GetAccessor(string propertyName)
         {
-            return PropertyMap.TryGetValue(propertyName, out TypePropertyInfo info)
+            return PropertyMap.TryGetValue(propertyName, out PropertyAccessor info)
                 ? info
                 : null;
         }
 
         public Type Type { get; protected set; }
 
-        public readonly Dictionary<string, TypePropertyInfo> PropertyMap =
-            new Dictionary<string, TypePropertyInfo>(PclExport.Instance.InvariantComparerIgnoreCase);
+        public readonly Dictionary<string, PropertyAccessor> PropertyMap =
+            new Dictionary<string, PropertyAccessor>(PclExport.Instance.InvariantComparerIgnoreCase);
 
         public PropertyInfo[] PublicPropertyInfos { get; protected set; }
 
@@ -127,7 +127,7 @@ public GetMemberDelegate GetPublicGetter(string name)
             if (name == null)
                 return null;
 
-            return PropertyMap.TryGetValue(name, out TypePropertyInfo info)
+            return PropertyMap.TryGetValue(name, out PropertyAccessor info)
                 ? info.PublicGetter
                 : null;
         }
@@ -139,7 +139,7 @@ public SetMemberDelegate GetPublicSetter(string name)
             if (name == null)
                 return null;
 
-            return PropertyMap.TryGetValue(name, out TypePropertyInfo info)
+            return PropertyMap.TryGetValue(name, out PropertyAccessor info)
                 ? info.PublicSetter
                 : null;
         }

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`
`13`	`13`	`namespace ServiceStack`
`14`	`14`	`{`
`15`		`- public class TypeFieldInfo`
	`15`	`+ public class FieldAccessor`
`16`	`16`	`{`
`17`		`- public TypeFieldInfo(`
	`17`	`+ public FieldAccessor(`
`18`	`18`	`FieldInfo fieldInfo,`
`19`	`19`	`GetMemberDelegate publicGetter,`
`20`	`20`	`SetMemberDelegate publicSetter,`
`@@ -48,7 +48,7 @@ static TypeFields()`
`48`	`48`	`try`
`49`	`49`	`{`
`50`	`50`	`var fnRef = fi.SetExpressionRef<T>();`
`51`		`- Instance.FieldsMap[fi.Name] = new TypeFieldInfo(`
	`51`	`+ Instance.FieldsMap[fi.Name] = new FieldAccessor(`
`52`	`52`	`fi,`
`53`	`53`	`PclExport.Instance.CreateGetter(fi),`
`54`	`54`	`PclExport.Instance.CreateSetter(fi),`
`@@ -66,9 +66,9 @@ static TypeFields()`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- public static TypeFieldInfo GetAccessor(string propertyName)`
	`69`	`+ public static FieldAccessor GetAccessor(string propertyName)`
`70`	`70`	`{`
`71`		`- return Instance.FieldsMap.TryGetValue(propertyName, out TypeFieldInfo info)`
	`71`	`+ return Instance.FieldsMap.TryGetValue(propertyName, out FieldAccessor info)`
`72`	`72`	`? info`
`73`	`73`	`: null;`
`74`	`74`	`}`
`@@ -103,17 +103,17 @@ public static TypeFields Get(Type type)`
`103`	`103`	`return instance;`
`104`	`104`	`}`
`105`	`105`
`106`		`- public TypeFieldInfo GetAccessor(string propertyName)`
	`106`	`+ public FieldAccessor GetAccessor(string propertyName)`
`107`	`107`	`{`
`108`		`- return FieldsMap.TryGetValue(propertyName, out TypeFieldInfo info)`
	`108`	`+ return FieldsMap.TryGetValue(propertyName, out FieldAccessor info)`
`109`	`109`	`? info`
`110`	`110`	`: null;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public Type Type { get; protected set; }`
`114`	`114`
`115`		`- public readonly Dictionary<string, TypeFieldInfo> FieldsMap =`
`116`		`- new Dictionary<string, TypeFieldInfo>(PclExport.Instance.InvariantComparerIgnoreCase);`
	`115`	`+ public readonly Dictionary<string, FieldAccessor> FieldsMap =`
	`116`	`+ new Dictionary<string, FieldAccessor>(PclExport.Instance.InvariantComparerIgnoreCase);`
`117`	`117`
`118`	`118`	`public FieldInfo[] PublicFieldInfos { get; protected set; }`
`119`	`119`
`@@ -134,7 +134,7 @@ public virtual GetMemberDelegate GetPublicGetter(string name)`
`134`	`134`	`if (name == null)`
`135`	`135`	`return null;`
`136`	`136`
`137`		`- return FieldsMap.TryGetValue(name, out TypeFieldInfo info)`
	`137`	`+ return FieldsMap.TryGetValue(name, out FieldAccessor info)`
`138`	`138`	`? info.PublicGetter`
`139`	`139`	`: null;`
`140`	`140`	`}`
`@@ -146,7 +146,7 @@ public virtual SetMemberDelegate GetPublicSetter(string name)`
`146`	`146`	`if (name == null)`
`147`	`147`	`return null;`
`148`	`148`
`149`		`- return FieldsMap.TryGetValue(name, out TypeFieldInfo info)`
	`149`	`+ return FieldsMap.TryGetValue(name, out FieldAccessor info)`
`150`	`150`	`? info.PublicSetter`
`151`	`151`	`: null;`
`152`	`152`	`}`
`@@ -156,7 +156,7 @@ public virtual SetMemberRefDelegate GetPublicSetterRef(string name)`
`156`	`156`	`if (name == null)`
`157`	`157`	`return null;`
`158`	`158`
`159`		`- return FieldsMap.TryGetValue(name, out TypeFieldInfo info)`
	`159`	`+ return FieldsMap.TryGetValue(name, out FieldAccessor info)`
`160`	`160`	`? info.PublicSetterRef`
`161`	`161`	`: null;`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ namespace ServiceStack`
`15`	`15`	`[Obsolete("Use TypeProperties<T>.Instance")]`
`16`	`16`	`public static class TypeReflector<T> { }`
`17`	`17`
`18`		`- public class TypePropertyInfo`
	`18`	`+ public class PropertyAccessor`
`19`	`19`	`{`
`20`		`- public TypePropertyInfo(`
	`20`	`+ public PropertyAccessor(`
`21`	`21`	`PropertyInfo propertyInfo,`
`22`	`22`	`GetMemberDelegate publicGetter,`
`23`	`23`	`SetMemberDelegate publicSetter)`
`@@ -46,7 +46,7 @@ static TypeProperties()`
`46`	`46`	`{`
`47`	`47`	`try`
`48`	`48`	`{`
`49`		`- Instance.PropertyMap[pi.Name] = new TypePropertyInfo(`
	`49`	`+ Instance.PropertyMap[pi.Name] = new PropertyAccessor(`
`50`	`50`	`pi,`
`51`	`51`	`PclExport.Instance.CreateGetter(pi),`
`52`	`52`	`PclExport.Instance.CreateSetter(pi)`
`@@ -59,9 +59,9 @@ static TypeProperties()`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- public static TypePropertyInfo GetAccessor(string propertyName)`
	`62`	`+ public static PropertyAccessor GetAccessor(string propertyName)`
`63`	`63`	`{`
`64`		`- return Instance.PropertyMap.TryGetValue(propertyName, out TypePropertyInfo info)`
	`64`	`+ return Instance.PropertyMap.TryGetValue(propertyName, out PropertyAccessor info)`
`65`	`65`	`? info`
`66`	`66`	`: null;`
`67`	`67`	`}`
`@@ -96,17 +96,17 @@ public static TypeProperties Get(Type type)`
`96`	`96`	`return instance;`
`97`	`97`	`}`
`98`	`98`
`99`		`- public TypePropertyInfo GetAccessor(string propertyName)`
	`99`	`+ public PropertyAccessor GetAccessor(string propertyName)`
`100`	`100`	`{`
`101`		`- return PropertyMap.TryGetValue(propertyName, out TypePropertyInfo info)`
	`101`	`+ return PropertyMap.TryGetValue(propertyName, out PropertyAccessor info)`
`102`	`102`	`? info`
`103`	`103`	`: null;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public Type Type { get; protected set; }`
`107`	`107`
`108`		`- public readonly Dictionary<string, TypePropertyInfo> PropertyMap =`
`109`		`- new Dictionary<string, TypePropertyInfo>(PclExport.Instance.InvariantComparerIgnoreCase);`
	`108`	`+ public readonly Dictionary<string, PropertyAccessor> PropertyMap =`
	`109`	`+ new Dictionary<string, PropertyAccessor>(PclExport.Instance.InvariantComparerIgnoreCase);`
`110`	`110`
`111`	`111`	`public PropertyInfo[] PublicPropertyInfos { get; protected set; }`
`112`	`112`
`@@ -127,7 +127,7 @@ public GetMemberDelegate GetPublicGetter(string name)`
`127`	`127`	`if (name == null)`
`128`	`128`	`return null;`
`129`	`129`
`130`		`- return PropertyMap.TryGetValue(name, out TypePropertyInfo info)`
	`130`	`+ return PropertyMap.TryGetValue(name, out PropertyAccessor info)`
`131`	`131`	`? info.PublicGetter`
`132`	`132`	`: null;`
`133`	`133`	`}`
`@@ -139,7 +139,7 @@ public SetMemberDelegate GetPublicSetter(string name)`
`139`	`139`	`if (name == null)`
`140`	`140`	`return null;`
`141`	`141`
`142`		`- return PropertyMap.TryGetValue(name, out TypePropertyInfo info)`
	`142`	`+ return PropertyMap.TryGetValue(name, out PropertyAccessor info)`
`143`	`143`	`? info.PublicSetter`
`144`	`144`	`: null;`
`145`	`145`	`}`