-Added support for DataContractAttribute and DataMemberAttribute to JsonSerializer

-Added support for serializing private members by marking them with JsonPropertyAttribute or DataMemberAttribute

1 files changed, 34 insertions, 0 deletions

diff --git a/Src/Newtonsoft.Json/Serialization/CachedAttributeGetter.cs b/Src/Newtonsoft.Json/Serialization/CachedAttributeGetter.cs
new file mode 100644
index 0000000..878f629
--- /dev/null
+++ b/Src/Newtonsoft.Json/Serialization/CachedAttributeGetter.cs
@@ -0,0 +1,34 @@
+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Reflection;

+using System.Text;

+using Newtonsoft.Json.Utilities;

+

+namespace Newtonsoft.Json.Serialization

+{

+  internal static class CachedAttributeGetter<T> where T : Attribute

+  {

+    private static readonly Dictionary<ICustomAttributeProvider, T> TypeAttributeCache = new Dictionary<ICustomAttributeProvider, T>();

+

+    public static T GetAttribute(ICustomAttributeProvider type)

+    {

+      T attribute;

+

+      if (TypeAttributeCache.TryGetValue(type, out attribute))

+        return attribute;

+

+      // double check locking to avoid threading issues

+      lock (TypeAttributeCache)

+      {

+        if (TypeAttributeCache.TryGetValue(type, out attribute))

+          return attribute;

+

+        attribute = JsonTypeReflector.GetAttribute<T>(type);

+        TypeAttributeCache[type] = attribute;

+

+        return attribute;

+      }

+    }

+  }

+}