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

Commit edeec9a

Browse files
committed
Convert remaining code to use newer CreateGetter/CreateSetter APIs
1 parent 691b335 commit edeec9a

File tree

6 files changed

+16
-24
lines changed

6 files changed

+16
-24
lines changed

src/ServiceStack.Text/Common/WriteType.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using System.IO;
1717
using System.Linq;
1818
using System.Reflection;
19-
using ServiceStack.Reflection;
2019
using ServiceStack.Text.Json;
2120
using ServiceStack.Text.Jsv;
2221

src/ServiceStack.Text/CsvReader.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using ServiceStack.Reflection;
54
using ServiceStack.Text.Common;
65
using ServiceStack.Text.Jsv;
76

src/ServiceStack.Text/CsvSerializer.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Globalization;
43
using System.IO;
54
using System.Linq;
65
using System.Reflection;
76
using System.Text;
87
using System.Threading;
9-
using ServiceStack.Reflection;
108
using ServiceStack.Text.Common;
119
using ServiceStack.Text.Jsv;
12-
using ServiceStack.Text.Pools;
1310

1411
namespace ServiceStack.Text
1512
{
@@ -241,7 +238,7 @@ public static WriteObjectDelegate WriteFn()
241238

242239
private const string IgnoreResponseStatus = "ResponseStatus";
243240

244-
private static Func<object, object> valueGetter = null;
241+
private static GetMemberDelegate valueGetter = null;
245242
private static WriteObjectDelegate writeElementFn = null;
246243

247244
private static WriteObjectDelegate GetWriteFn()
@@ -305,15 +302,15 @@ private static WriteObjectDelegate GetWriteFn()
305302
//If is DTO and has an enumerable property serialize that
306303
if (bestCandidateEnumerableType != null)
307304
{
308-
valueGetter = bestCandidate.GetValueGetter(typeof(T));
305+
valueGetter = bestCandidate.CreateGetter();
309306
var elementType = bestCandidateEnumerableType.GenericTypeArguments()[0];
310307
writeElementFn = CreateWriteFn(elementType);
311308

312309
return WriteEnumerableProperty;
313310
}
314311

315312
//If is DTO and has non-enumerable, reference type property serialize that
316-
valueGetter = firstCandidate.GetValueGetter(typeof(T));
313+
valueGetter = firstCandidate.CreateGetter();
317314
writeElementFn = CreateWriteRowFn(firstCandidate.PropertyType);
318315

319316
return WriteNonEnumerableType;
@@ -396,7 +393,7 @@ public static ParseStringDelegate ReadFn()
396393
return ReadCacheFn;
397394
}
398395

399-
private static Action<object, object> valueSetter = null;
396+
private static SetMemberDelegate valueSetter = null;
400397
private static ParseStringDelegate readElementFn = null;
401398

402399
private static ParseStringDelegate GetReadFn()
@@ -460,15 +457,15 @@ private static ParseStringDelegate GetReadFn()
460457
//If is DTO and has an enumerable property serialize that
461458
if (bestCandidateEnumerableType != null)
462459
{
463-
valueSetter = bestCandidate.GetValueSetter(typeof(T));
460+
valueSetter = bestCandidate.CreateSetter();
464461
var elementType = bestCandidateEnumerableType.GenericTypeArguments()[0];
465462
readElementFn = CreateReadFn(elementType);
466463

467464
return ReadEnumerableProperty;
468465
}
469466

470467
//If is DTO and has non-enumerable, reference type property serialize that
471-
valueSetter = firstCandidate.GetValueSetter(typeof(T));
468+
valueSetter = firstCandidate.CreateSetter();
472469
readElementFn = CreateReadRowFn(firstCandidate.PropertyType);
473470

474471
return ReadNonEnumerableType;

src/ServiceStack.Text/CsvWriter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5-
using ServiceStack.Reflection;
65
using ServiceStack.Text.Common;
76

87
namespace ServiceStack.Text

src/ServiceStack.Text/TypeFields.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Reflection;
44
using System.Threading;
5-
using ServiceStack.Reflection;
65
using ServiceStack.Text;
76

87
using System.Linq.Expressions;

tests/ServiceStack.Text.Tests/StaticAccessorTests.cs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using NUnit.Framework;
2-
using ServiceStack.Reflection;
32

43
namespace ServiceStack.Text.Tests
54
{
@@ -30,26 +29,26 @@ public void Can_get_accessor_in_declared_and_base_class()
3029
var baseProperty = typeof(AccessorBase).GetProperty("Base");
3130
var declaredProperty = typeof(Accessor).GetProperty("Declared");
3231

33-
var baseSetter = baseProperty.GetValueSetter<AccessorBase>();
32+
var baseSetter = baseProperty.CreateGetter<AccessorBase>();
3433
Assert.That(baseSetter, Is.Not.Null);
3534

36-
var declaredSetter = declaredProperty.GetValueSetter<Accessor>();
35+
var declaredSetter = declaredProperty.CreateSetter<Accessor>();
3736
Assert.That(declaredSetter, Is.Not.Null);
3837
}
3938

4039
[Test]
4140
public void Can_get_property_accessor_from_sub_and_super_types()
4241
{
4342
var sub = new SubAccessor();
44-
var subGet = StaticAccessors.GetValueGetter<SubAccessor>(typeof(SubAccessor).GetProperty("Sub"));
45-
var subSet = StaticAccessors.GetValueSetter<SubAccessor>(typeof(SubAccessor).GetProperty("Sub"));
43+
var subGet = typeof(SubAccessor).GetProperty("Sub").CreateGetter<SubAccessor>();
44+
var subSet = typeof(SubAccessor).GetProperty("Sub").CreateSetter<SubAccessor>();
4645

4746
subSet(sub, "sub");
4847
Assert.That(subGet(sub), Is.EqualTo("sub"));
4948

5049
var sup = new AccessorBase();
51-
var supGet = StaticAccessors.GetValueGetter<AccessorBase>(typeof(AccessorBase).GetProperty("Base"));
52-
var supSet = StaticAccessors.GetValueSetter<AccessorBase>(typeof(AccessorBase).GetProperty("Base"));
50+
var supGet = typeof(AccessorBase).GetProperty("Base").CreateGetter<AccessorBase>();
51+
var supSet = typeof(AccessorBase).GetProperty("Base").CreateSetter<AccessorBase>();
5352

5453
supSet(sup, "base");
5554
Assert.That(supGet(sup), Is.EqualTo("base"));
@@ -61,15 +60,15 @@ public void Can_get_property_accessor_from_sub_and_super_types()
6160
public void Can_get_field_accessor_from_sub_and_super_types()
6261
{
6362
var sub = new SubAccessor();
64-
var subGet = StaticAccessors.GetValueGetter<SubAccessor>(typeof(SubAccessor).GetFieldInfo("SubField"));
65-
var subSet = StaticAccessors.GetValueSetter<SubAccessor>(typeof(SubAccessor).GetFieldInfo("SubField"));
63+
var subGet = typeof(SubAccessor).GetFieldInfo("SubField").CreateGetter<SubAccessor>();
64+
var subSet = typeof(SubAccessor).GetFieldInfo("SubField").CreateSetter<SubAccessor>();
6665

6766
subSet(sub, "sub");
6867
Assert.That(subGet(sub), Is.EqualTo("sub"));
6968

7069
var sup = new AccessorBase();
71-
var supGet = StaticAccessors.GetValueGetter<AccessorBase>(typeof(AccessorBase).GetFieldInfo("BaseField"));
72-
var supSet = StaticAccessors.GetValueSetter<AccessorBase>(typeof(AccessorBase).GetFieldInfo("BaseField"));
70+
var supGet = typeof(AccessorBase).GetFieldInfo("BaseField").CreateGetter<AccessorBase>();
71+
var supSet = typeof(AccessorBase).GetFieldInfo("BaseField").CreateSetter<AccessorBase>();
7372

7473
supSet(sup, "base");
7574
Assert.That(supGet(sup), Is.EqualTo("base"));

0 commit comments

Comments
 (0)