-Added DateTimeConverterBase

-Changed class converter to be resolved from contract
-Changed built in converters to be resolved once when the contract is created. Big performance gain!
This commit is contained in:
JamesNK
2009-12-26 18:51:39 +00:00
parent f574bfbf83
commit 9144bc6c80
29 changed files with 244 additions and 133 deletions
+15 -15
View File
@@ -54,18 +54,6 @@ namespace Newtonsoft.Json
private IReferenceResolver _referenceResolver;
private SerializationBinder _binder;
private static readonly IList<JsonConverter> BuiltInConverters = new List<JsonConverter>
{
#if !PocketPC && !SILVERLIGHT && !NET20
new EntityKeyMemberConverter(),
#endif
new BinaryConverter(),
#if !SILVERLIGHT
new DataSetConverter(),
new DataTableConverter()
#endif
};
/// <summary>
/// Occurs when the <see cref="JsonSerializer"/> errors during serialization and deserialization.
/// </summary>
@@ -368,6 +356,18 @@ namespace Newtonsoft.Json
return Deserialize(new JsonTextReader(reader), objectType);
}
/// <summary>
/// Deserializes the Json structure contained by the specified <see cref="JsonReader"/>
/// into an instance of the specified type.
/// </summary>
/// <param name="reader">The <see cref="JsonReader"/> containing the object.</param>
/// <typeparam name="T">The type of the object to deserialize.</typeparam>
/// <returns>The instance of <typeparamref name="T"/> being deserialized.</returns>
public T Deserialize<T>(JsonReader reader)
{
return (T)Deserialize(reader, typeof(T));
}
/// <summary>
/// Deserializes the Json structure contained by the specified <see cref="JsonReader"/>
/// into an instance of the specified type.
@@ -423,7 +423,9 @@ namespace Newtonsoft.Json
if (objectType == null)
throw new ArgumentNullException("objectType");
converter = JsonTypeReflector.GetJsonConverter(objectType, objectType);
JsonContract contract = ContractResolver.ResolveContract(objectType);
converter = contract.Converter;
return (converter != null);
}
@@ -431,8 +433,6 @@ namespace Newtonsoft.Json
{
if (HasMatchingConverter(_converters, type, out matchingConverter))
return true;
if (HasMatchingConverter(BuiltInConverters, type, out matchingConverter))
return true;
return false;
}