Skip to content

Commit 4b51f96

Browse files
glennblockglennblock
committed
Changing all properties to be auto properties. The values should not be in the dynamic prop backing store
1 parent 6a5ab51 commit 4b51f96

10 files changed

Lines changed: 37 additions & 130 deletions

File tree

‎src/WebApiContrib.CollectionJson/Collection.cs‎

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,22 @@ public Collection()
1919
}
2020

2121
[DataMember(Name="version")]
22-
public string Version
23-
{
24-
get { return GetValue<string>("Version"); }
25-
set { SetValue("Version", value); }
26-
}
27-
22+
public string Version { get; set; }
23+
2824
[DataMember(Name = "href")]
29-
public Uri Href
30-
{
31-
get { return GetValue<Uri>("Href"); }
32-
set { SetValue("Href", value); }
33-
}
25+
public Uri Href { get; set; }
3426

3527
[DataMember(Name = "links")]
36-
public IList<Link> Links
37-
{
38-
get { return GetValue<IList<Link>>("Links"); }
39-
private set { SetValue("Links", value); }
40-
}
41-
28+
public IList<Link> Links { get; private set; }
29+
4230
[DataMember(Name = "items")]
43-
public IList<Item> Items
44-
{
45-
get { return GetValue<IList<Item>>("Items"); }
46-
private set { SetValue("Items", value); }
47-
}
31+
public IList<Item> Items { get; private set; }
4832

4933
[DataMember(Name = "queries")]
50-
public IList<Query> Queries
51-
{
52-
get { return GetValue<IList<Query>>("Queries"); }
53-
private set { SetValue("Queries", value); }
54-
}
55-
34+
public IList<Query> Queries { get; private set; }
35+
5636
[DataMember(Name = "template")]
57-
public Template Template
58-
{
59-
get { return GetValue<Template>("Template"); }
60-
set { SetValue("Template", value); }
61-
}
37+
public Template Template { get; private set; }
6238
}
6339

6440
}

‎src/WebApiContrib.CollectionJson/Data.cs‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,13 @@ namespace WebApiContrib.CollectionJson
1010
public class Data : ExtensibleObject
1111
{
1212
[DataMember(Name = "name")]
13-
public string Name
14-
{
15-
get { return GetValue<string>("Name"); }
16-
set { SetValue("Name", value); }
17-
}
13+
public string Name { get; set; }
1814

1915
[DataMember(Name = "value")]
20-
public string Value
21-
{
22-
get { return GetValue<string>("Value"); }
23-
set { SetValue("Value", value); }
24-
}
16+
public string Value { get; set; }
2517

2618
[DataMember(Name = "prompt")]
27-
public string Prompt
28-
{
29-
get { return GetValue<string>("Prompt"); }
30-
set { SetValue("Prompt", value); }
31-
}
19+
public string Prompt { get; set; }
20+
3221
}
3322
}

‎src/WebApiContrib.CollectionJson/ExtensibleObject.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@ public abstract class ExtensibleObject : DynamicObject
1212
{
1313
public ExtensibleObject()
1414
{
15-
Members = new Dictionary<string, object>();
16-
DynamicMembers = new Dictionary<string, object>(StringComparer.CurrentCultureIgnoreCase);
15+
Members = new Dictionary<string, object>(StringComparer.CurrentCultureIgnoreCase);
1716
}
1817

1918
protected IDictionary<string, object> Members { get; private set; }
20-
protected IDictionary<string, object> DynamicMembers { get; private set; }
21-
19+
2220
public override bool TryGetMember(GetMemberBinder binder, out object result)
2321
{
2422
var name = binder.Name;
25-
var found = DynamicMembers.TryGetValue(name, out result);
23+
var found = Members.TryGetValue(name, out result);
2624

2725
if (result == null)
2826
return false;
@@ -32,13 +30,13 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
3230

3331
public override bool TrySetMember(SetMemberBinder binder, object value)
3432
{
35-
DynamicMembers[binder.Name] = value;
33+
Members[binder.Name] = value;
3634
return true;
3735
}
3836

3937
public override IEnumerable<string> GetDynamicMemberNames()
4038
{
41-
foreach (var entry in DynamicMembers)
39+
foreach (var entry in Members)
4240
{
4341
if (entry.Value != null)
4442
yield return entry.Key;
@@ -60,7 +58,7 @@ public void SetValue(string key, object value)
6058
{
6159
Members[key] = value;
6260
}
63-
61+
6462
public dynamic Extensions()
6563
{
6664
return this;

‎src/WebApiContrib.CollectionJson/Item.cs‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,19 @@ public Item()
1616
}
1717

1818
[DataMember(Name = "href")]
19-
public Uri Href
20-
{
21-
get { return GetValue<Uri>("Href"); }
22-
set { SetValue("Href", value); }
23-
}
19+
public Uri Href { get; set; }
2420

2521
[DataMember(Name = "rel")]
26-
public string Rel
27-
{
28-
get { return GetValue<string>("Rel"); }
29-
set { SetValue("Rel", value); }
30-
}
22+
public string Rel { get; set; }
3123

3224
[DataMember(Name = "rt")]
33-
public string Rt
34-
{
35-
get { return GetValue<string>("Rt"); }
36-
set { SetValue("Rt", value); }
37-
}
25+
public string Rt { get; set; }
3826

3927
[DataMember(Name = "data")]
40-
public IList<Data> Data
41-
{
42-
get { return GetValue<IList<Data>>("Data"); }
43-
private set { SetValue("Data", value); }
44-
}
28+
public IList<Data> Data { get; private set; }
4529

4630
[DataMember(Name = "links")]
47-
public IList<Link> Links
48-
{
49-
get { return GetValue<IList<Link>>("Links"); }
50-
private set { SetValue("Links", value); }
51-
}
31+
public IList<Link> Links { get; private set; }
5232

5333
}
5434
}

‎src/WebApiContrib.CollectionJson/Link.cs‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,15 @@ namespace WebApiContrib.CollectionJson
1010
public class Link : ExtensibleObject
1111
{
1212
[DataMember(Name = "rel")]
13-
public String Rel
14-
{
15-
get { return GetValue<String>("Rel"); }
16-
set { SetValue("Rel", value); }
17-
}
13+
public String Rel { get; set; }
1814

1915
[DataMember(Name = "href")]
20-
public Uri Href
21-
{
22-
get { return GetValue<Uri>("Href"); }
23-
set { SetValue("Href", value); }
24-
}
16+
public Uri Href { get; set; }
2517

2618
[DataMember(Name = "prompt")]
27-
public String Prompt
28-
{
29-
get { return GetValue<String>("Prompt"); }
30-
set { SetValue("Promot", value); }
31-
}
19+
public String Prompt { get; set; }
3220

3321
[DataMember(Name = "render")]
34-
public String Render
35-
{
36-
get { return GetValue<String>("Render"); }
37-
set { SetValue("Render", value); }
38-
}
22+
public String Render { get; set; }
3923
}
4024
}

‎src/WebApiContrib.CollectionJson/Query.cs‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,18 @@ public Query()
1515
}
1616

1717
[DataMember(Name = "rt")]
18-
public String Rt
19-
{
20-
get { return GetValue<String>("Rt"); }
21-
set { SetValue("Rt", value); }
22-
}
18+
public String Rt { get; set; }
2319

2420
[DataMember(Name = "rel")]
25-
public String Rel
26-
{
27-
get { return GetValue<String>("Rel"); }
28-
set { SetValue("Rel", value); }
29-
}
21+
public String Rel { get; set; }
3022

3123
[DataMember(Name = "href")]
32-
public Uri Href
33-
{
34-
get { return GetValue<Uri>("Href"); }
35-
set { SetValue("Href", value); }
36-
}
24+
public Uri Href { get; set; }
3725

3826
[DataMember(Name = "prompt")]
39-
public string Prompt
40-
{
41-
get { return GetValue<String>("Prompt"); }
42-
set { SetValue("Prompt", value); }
43-
}
27+
public string Prompt { get; set; }
4428

4529
[DataMember(Name = "data")]
46-
public IList<Data> Data
47-
{
48-
get { return GetValue<IList<Data>>("Data"); }
49-
set { SetValue("Data", value); }
50-
}
30+
public IList<Data> Data { get; set; }
5131
}
5232
}

‎src/WebApiContrib.CollectionJson/ReadDocument.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ public ReadDocument()
1616
}
1717

1818
[DataMember(Name = "collection")]
19-
public Collection Collection { get; set; }
19+
public Collection Collection { get; private set; }
2020
}
2121
}

‎src/WebApiContrib.CollectionJson/Template.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public Template()
1515
}
1616

1717
[DataMember(Name = "Data")]
18-
public IList<Data> Data { get; set; }
18+
public IList<Data> Data { get; private set; }
1919
}
2020
}

‎src/WebApiContrib.CollectionJson/WriteDocument.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ namespace WebApiContrib.CollectionJson
1010
public class WriteDocument : IWriteDocument
1111
{
1212
[DataMember(Name = "template")]
13-
public Template Template { get; set; }
13+
public Template Template { get; private set; }
1414
}
1515
}

‎test/WebApiContrib.CollectionJson.Tests/ExtensibleObjectTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public TheSetValueMethod()
121121
}
122122

123123
[Fact]
124-
public void WhenValueIsPassedThenShouldSToreTheValue()
124+
public void WhenValueIsPassedThenShouldStoreTheValue()
125125
{
126126
_obj.Members["Test3"].ShouldEqual("TestValue");
127127
}

0 commit comments

Comments
 (0)