Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit efab477

Browse files
mythzmythz
committed
Rename to more appropriate CreateGetter/CreateSetter
1 parent a795eec commit efab477

File tree

12 files changed

+261
-132
lines changed

12 files changed

+261
-132
lines changed

‎src/ServiceStack.Text/AutoMappingUtils.cs‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,8 @@ public AssignmentEntry(string name, AssignmentMember @from, AssignmentMember to)
617617
From = @from;
618618
To = to;
619619

620-
GetValueFn = From.GetGetValueFn();
621-
SetValueFn = To.GetSetValueFn();
620+
GetValueFn = From.CreateGetter();
621+
SetValueFn = To.CreateSetter();
622622
ConvertValueFn = TypeConverter.CreateTypeConverter(From.Type, To.Type);
623623
}
624624
}
@@ -648,29 +648,22 @@ public AssignmentMember(Type type, MethodInfo methodInfo)
648648
public FieldInfo FieldInfo;
649649
public MethodInfo MethodInfo;
650650

651-
public GetMemberDelegate GetGetValueFn()
651+
public GetMemberDelegate CreateGetter()
652652
{
653653
if (PropertyInfo != null)
654-
return PropertyInfo.GetPropertyGetterFn();
654+
return PropertyInfo.CreateGetter();
655655
if (FieldInfo != null)
656-
return FieldInfo.GetFieldGetterFn();
657-
if (MethodInfo != null)
658-
return (GetMemberDelegate)
659-
MethodInfo.CreateDelegate(typeof(GetMemberDelegate));
660-
661-
return null;
656+
return FieldInfo.CreateGetter();
657+
return (GetMemberDelegate) MethodInfo?.CreateDelegate(typeof(GetMemberDelegate));
662658
}
663659

664-
public SetMemberDelegate GetSetValueFn()
660+
public SetMemberDelegate CreateSetter()
665661
{
666662
if (PropertyInfo != null)
667-
return PropertyInfo.GetPropertySetterFn();
663+
return PropertyInfo.CreateSetter();
668664
if (FieldInfo != null)
669-
return FieldInfo.GetFieldSetterFn();
670-
if (MethodInfo != null)
671-
return (SetMemberDelegate)MethodInfo.MakeDelegate(typeof(SetMemberDelegate));
672-
673-
return null;
665+
return FieldInfo.CreateSetter();
666+
return (SetMemberDelegate) MethodInfo?.MakeDelegate(typeof(SetMemberDelegate));
674667
}
675668
}
676669

@@ -767,6 +760,7 @@ public void Populate(object to, object from,
767760
public delegate object GetMemberDelegate<T>(T instance);
768761

769762
public delegate void SetMemberDelegate(object instance, object value);
763+
public delegate void SetMemberDelegate<T>(T instance, object value);
770764
public delegate void SetMemberRefDelegate(ref object instance, object propertyValue);
771765
public delegate void SetMemberRefDelegate<T>(ref T instance, object value);
772766

‎src/ServiceStack.Text/Common/DeserializeType.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ private static SetMemberDelegate GetSetPropertyMethod(TypeConfig typeConfig, Pro
350350
if (fieldInfo == null) return null;
351351
}
352352

353-
return PclExport.Instance.GetSetMethod(propertyInfo, fieldInfo);
353+
return PclExport.Instance.CreateSetter(propertyInfo, fieldInfo);
354354
}
355355

356356
public static TypeAccessor Create(ITypeSerializer serializer, TypeConfig typeConfig, FieldInfo fieldInfo)
@@ -368,7 +368,7 @@ private static SetMemberDelegate GetSetFieldMethod(TypeConfig typeConfig, FieldI
368368
if (typeConfig.Type != fieldInfo.DeclaringType)
369369
fieldInfo = fieldInfo.DeclaringType.GetFieldInfo(fieldInfo.Name);
370370

371-
return PclExport.Instance.GetFieldSetterFn(fieldInfo);
371+
return PclExport.Instance.CreateSetter(fieldInfo);
372372
}
373373
}
374374

‎src/ServiceStack.Text/Common/WriteType.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ private static bool Init()
184184
propertyOrder,
185185
propertySuppressDefaultConfig,
186186
propertySuppressDefaultAttribute,
187-
propertyInfo.GetPropertyGetterFn<T>(),
187+
propertyInfo.CreateGetter<T>(),
188188
Serializer.GetWriteFn(propertyType),
189189
propertyType.GetDefaultValue(),
190190
shouldSerialize,
@@ -241,7 +241,7 @@ private static bool Init()
241241
propertyOrder,
242242
propertySuppressDefaultConfig,
243243
propertySuppressDefaultAttribute,
244-
fieldInfo.GetFieldGetterFn<T>(),
244+
fieldInfo.CreateGetter<T>(),
245245
Serializer.GetWriteFn(propertyType),
246246
defaultValue,
247247
shouldSerialize,

‎src/ServiceStack.Text/CsvReader.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ public class CsvReader<T>
169169
{
170170
public static List<string> Headers { get; set; }
171171

172-
internal static List<Action<T, object>> PropertySetters;
173-
internal static Dictionary<string, Action<T, object>> PropertySettersMap;
172+
internal static List<SetMemberDelegate<T>> PropertySetters;
173+
internal static Dictionary<string, SetMemberDelegate<T>> PropertySettersMap;
174174

175175
internal static List<ParseStringDelegate> PropertyConverters;
176176
internal static Dictionary<string, ParseStringDelegate> PropertyConvertersMap;
@@ -192,8 +192,8 @@ internal static void Reset()
192192
{
193193
Headers = new List<string>();
194194

195-
PropertySetters = new List<Action<T, object>>();
196-
PropertySettersMap = new Dictionary<string, Action<T, object>>(PclExport.Instance.InvariantComparerIgnoreCase);
195+
PropertySetters = new List<SetMemberDelegate<T>>();
196+
PropertySettersMap = new Dictionary<string, SetMemberDelegate<T>>(PclExport.Instance.InvariantComparerIgnoreCase);
197197

198198
PropertyConverters = new List<ParseStringDelegate>();
199199
PropertyConvertersMap = new Dictionary<string, ParseStringDelegate>(PclExport.Instance.InvariantComparerIgnoreCase);
@@ -205,7 +205,7 @@ internal static void Reset()
205205
if (!TypeSerializer.CanCreateFromString(propertyInfo.PropertyType)) continue;
206206

207207
var propertyName = propertyInfo.Name;
208-
var setter = propertyInfo.GetValueSetter<T>();
208+
var setter = propertyInfo.CreateSetter<T>();
209209
PropertySetters.Add(setter);
210210

211211
var converter = JsvReader.GetParseFn(propertyInfo.PropertyType);

‎src/ServiceStack.Text/CsvWriter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public class CsvWriter<T>
107107

108108
public static List<string> Headers { get; set; }
109109

110-
internal static List<Func<T, object>> PropertyGetters;
110+
internal static List<GetMemberDelegate<T>> PropertyGetters;
111111

112112
private static readonly WriteObjectDelegate OptimizedWriter;
113113

@@ -126,14 +126,14 @@ internal static void Reset()
126126
{
127127
Headers = new List<string>();
128128

129-
PropertyGetters = new List<Func<T, object>>();
129+
PropertyGetters = new List<GetMemberDelegate<T>>();
130130
var isDataContract = typeof(T).IsDto();
131131
foreach (var propertyInfo in TypeConfig<T>.Properties)
132132
{
133133
if (!propertyInfo.CanRead || propertyInfo.GetMethodInfo() == null) continue;
134134
if (!TypeSerializer.CanCreateFromString(propertyInfo.PropertyType)) continue;
135135

136-
PropertyGetters.Add(propertyInfo.GetValueGetter<T>());
136+
PropertyGetters.Add(propertyInfo.CreateGetter<T>());
137137
var propertyName = propertyInfo.Name;
138138
if (isDataContract)
139139
{

‎src/ServiceStack.Text/PclExport.Net40.cs‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -289,77 +289,91 @@ public override Type GetGenericCollectionType(Type type)
289289
&& t.GetGenericTypeDefinition() == typeof(ICollection<>), null).FirstOrDefault();
290290
}
291291

292-
public override GetMemberDelegate GetPropertyGetterFn(PropertyInfo propertyInfo)
292+
public override GetMemberDelegate CreateGetter(PropertyInfo propertyInfo)
293293
{
294294
return
295295
#if NET45
296296
SupportsEmit ? PropertyInvoker.GetEmit(propertyInfo) :
297297
#endif
298298
SupportsExpression
299299
? PropertyInvoker.GetExpression(propertyInfo)
300-
: base.GetPropertyGetterFn(propertyInfo);
300+
: base.CreateGetter(propertyInfo);
301301
}
302302

303-
public override GetMemberDelegate<T> GetPropertyGetterFn<T>(PropertyInfo propertyInfo)
303+
public override GetMemberDelegate<T> CreateGetter<T>(PropertyInfo propertyInfo)
304304
{
305305
return
306306
#if NET45
307307
SupportsEmit ? PropertyInvoker.GetEmit<T>(propertyInfo) :
308308
#endif
309309
SupportsExpression
310310
? PropertyInvoker.GetExpression<T>(propertyInfo)
311-
: base.GetPropertyGetterFn<T>(propertyInfo);
311+
: base.CreateGetter<T>(propertyInfo);
312312
}
313313

314-
public override SetMemberDelegate GetPropertySetterFn(PropertyInfo propertyInfo)
314+
public override SetMemberDelegate CreateSetter(PropertyInfo propertyInfo)
315315
{
316316
return
317317
#if NET45
318318
SupportsEmit ? PropertyInvoker.SetEmit(propertyInfo) :
319319
#endif
320320
SupportsExpression
321321
? PropertyInvoker.SetExpression(propertyInfo)
322-
: base.GetPropertySetterFn(propertyInfo);
322+
: base.CreateSetter(propertyInfo);
323323
}
324324

325-
public override GetMemberDelegate GetFieldGetterFn(FieldInfo fieldInfo)
325+
public override SetMemberDelegate<T> CreateSetter<T>(PropertyInfo propertyInfo)
326+
{
327+
return SupportsExpression
328+
? PropertyInvoker.SetExpression<T>(propertyInfo)
329+
: base.CreateSetter<T>(propertyInfo);
330+
}
331+
332+
public override GetMemberDelegate CreateGetter(FieldInfo fieldInfo)
326333
{
327334
return
328335
#if NET45
329336
SupportsEmit ? FieldInvoker.GetEmit(fieldInfo) :
330337
#endif
331338
SupportsExpression
332339
? FieldInvoker.GetExpression(fieldInfo)
333-
: base.GetFieldGetterFn(fieldInfo);
340+
: base.CreateGetter(fieldInfo);
334341
}
335342

336-
public override GetMemberDelegate<T> GetFieldGetterFn<T>(FieldInfo fieldInfo)
343+
public override GetMemberDelegate<T> CreateGetter<T>(FieldInfo fieldInfo)
337344
{
338345
return
339346
#if NET45
340347
SupportsEmit ? FieldInvoker.GetEmit<T>(fieldInfo) :
341348
#endif
342349
SupportsExpression
343350
? FieldInvoker.GetExpression<T>(fieldInfo)
344-
: base.GetFieldGetterFn<T>(fieldInfo);
351+
: base.CreateGetter<T>(fieldInfo);
345352
}
346353

347-
public override SetMemberDelegate GetFieldSetterFn(FieldInfo fieldInfo)
354+
public override SetMemberDelegate CreateSetter(FieldInfo fieldInfo)
348355
{
349356
return
350357
#if NET45
351358
SupportsEmit ? FieldInvoker.SetEmit(fieldInfo) :
352359
#endif
353360
SupportsExpression
354361
? FieldInvoker.SetExpression(fieldInfo)
355-
: base.GetFieldSetterFn(fieldInfo);
362+
: base.CreateSetter(fieldInfo);
363+
}
364+
365+
public override SetMemberDelegate<T> CreateSetter<T>(FieldInfo fieldInfo)
366+
{
367+
return SupportsExpression
368+
? FieldInvoker.SetExpression<T>(fieldInfo)
369+
: base.CreateSetter<T>(fieldInfo);
356370
}
357371

358-
public override SetMemberDelegate GetSetMethod(PropertyInfo propertyInfo, FieldInfo fieldInfo)
372+
public override SetMemberDelegate CreateSetter(PropertyInfo propertyInfo, FieldInfo fieldInfo)
359373
{
360374
return propertyInfo.CanWrite
361-
? GetPropertySetterFn(propertyInfo)
362-
: GetFieldSetterFn(fieldInfo);
375+
? CreateSetter(propertyInfo)
376+
: CreateSetter(fieldInfo);
363377
}
364378

365379
public override string ToXsdDateTimeString(DateTime dateTime)

‎src/ServiceStack.Text/PclExport.NetStandard.cs‎

Lines changed: 59 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -290,67 +290,91 @@ public override Type GetGenericCollectionType(Type type)
290290
&& t.GetGenericTypeDefinition() == typeof(ICollection<>));
291291
}
292292

293-
#if NETSTANDARD1_3
294-
public override GetMemberDelegate GetPropertyGetterFn(PropertyInfo propertyInfo)
293+
public override GetMemberDelegate CreateGetter(PropertyInfo propertyInfo)
295294
{
296-
return SupportsEmit
297-
? PropertyInvoker.GetEmit(propertyInfo)
298-
: SupportsExpression
295+
return
296+
#if NETSTANDARD1_3
297+
SupportsEmit ? PropertyInvoker.GetEmit(propertyInfo) :
298+
#endif
299+
SupportsExpression
299300
? PropertyInvoker.GetExpression(propertyInfo)
300-
: base.GetPropertyGetterFn(propertyInfo);
301+
: base.CreateGetter(propertyInfo);
301302
}
302303

303-
public override GetMemberDelegate<T> GetPropertyGetterFn<T>(PropertyInfo propertyInfo)
304+
public override GetMemberDelegate<T> CreateGetter<T>(PropertyInfo propertyInfo)
304305
{
305-
return SupportsEmit
306-
? PropertyInvoker.GetEmit<T>(propertyInfo)
307-
: SupportsExpression
306+
return
307+
#if NETSTANDARD1_3
308+
SupportsEmit ? PropertyInvoker.GetEmit<T>(propertyInfo) :
309+
#endif
310+
SupportsExpression
308311
? PropertyInvoker.GetExpression<T>(propertyInfo)
309-
: base.GetPropertyGetterFn<T>(propertyInfo);
312+
: base.CreateGetter<T>(propertyInfo);
310313
}
311314

312-
public override SetMemberDelegate GetPropertySetterFn(PropertyInfo propertyInfo)
315+
public override SetMemberDelegate CreateSetter(PropertyInfo propertyInfo)
313316
{
314-
return SupportsEmit
315-
? PropertyInvoker.SetEmit(propertyInfo)
316-
: SupportsExpression
317+
return
318+
#if NETSTANDARD1_3
319+
SupportsEmit ? PropertyInvoker.SetEmit(propertyInfo) :
320+
#endif
321+
SupportsExpression
317322
? PropertyInvoker.SetExpression(propertyInfo)
318-
: base.GetPropertySetterFn(propertyInfo);
323+
: base.CreateSetter(propertyInfo);
324+
}
325+
326+
public override SetMemberDelegate<T> CreateSetter<T>(PropertyInfo propertyInfo)
327+
{
328+
return SupportsExpression
329+
? PropertyInvoker.SetExpression<T>(propertyInfo)
330+
: base.CreateSetter<T>(propertyInfo);
319331
}
320332

321-
public override GetMemberDelegate GetFieldGetterFn(FieldInfo fieldInfo)
333+
public override GetMemberDelegate CreateGetter(FieldInfo fieldInfo)
322334
{
323-
return SupportsEmit
324-
? FieldInvoker.GetEmit(fieldInfo)
325-
: SupportsExpression
335+
return
336+
#if NETSTANDARD1_3
337+
SupportsEmit ? FieldInvoker.GetEmit(fieldInfo) :
338+
#endif
339+
SupportsExpression
326340
? FieldInvoker.GetExpression(fieldInfo)
327-
: base.GetFieldGetterFn(fieldInfo);
341+
: base.CreateGetter(fieldInfo);
328342
}
329343

330-
public override GetMemberDelegate<T> GetFieldGetterFn<T>(FieldInfo fieldInfo)
344+
public override GetMemberDelegate<T> CreateGetter<T>(FieldInfo fieldInfo)
331345
{
332-
return SupportsEmit
333-
? FieldInvoker.GetEmit<T>(fieldInfo)
334-
: SupportsExpression
346+
return
347+
#if NETSTANDARD1_3
348+
SupportsEmit ? FieldInvoker.GetEmit<T>(fieldInfo) :
349+
#endif
350+
SupportsExpression
335351
? FieldInvoker.GetExpression<T>(fieldInfo)
336-
: base.GetFieldGetterFn<T>(fieldInfo);
352+
: base.CreateGetter<T>(fieldInfo);
337353
}
338354

339-
public override SetMemberDelegate GetFieldSetterFn(FieldInfo fieldInfo)
355+
public override SetMemberDelegate CreateSetter(FieldInfo fieldInfo)
340356
{
341-
return SupportsEmit
342-
? FieldInvoker.SetEmit(fieldInfo)
343-
: SupportsExpression
357+
return
358+
#if NETSTANDARD1_3
359+
SupportsEmit ? FieldInvoker.SetEmit(fieldInfo) :
360+
#endif
361+
SupportsExpression
344362
? FieldInvoker.SetExpression(fieldInfo)
345-
: base.GetFieldSetterFn(fieldInfo);
363+
: base.CreateSetter(fieldInfo);
364+
}
365+
366+
public override SetMemberDelegate<T> CreateSetter<T>(FieldInfo fieldInfo)
367+
{
368+
return SupportsExpression
369+
? FieldInvoker.SetExpression<T>(fieldInfo)
370+
: base.CreateSetter<T>(fieldInfo);
346371
}
347-
#endif
348372

349-
public override SetMemberDelegate GetSetMethod(PropertyInfo propertyInfo, FieldInfo fieldInfo)
373+
public override SetMemberDelegate CreateSetter(PropertyInfo propertyInfo, FieldInfo fieldInfo)
350374
{
351375
return propertyInfo.CanWrite
352-
? GetPropertySetterFn(propertyInfo)
353-
: GetFieldSetterFn(fieldInfo);
376+
? CreateSetter(propertyInfo)
377+
: CreateSetter(fieldInfo);
354378
}
355379

356380
public override string ToXsdDateTimeString(DateTime dateTime)

0 commit comments

Comments
 (0)