-Fixed EntityKeyMemberConverter not using property name resolve
-Added DiscriminatedUnionConverter
This commit is contained in:
@@ -23,6 +23,7 @@
|
|||||||
// OTHER DEALINGS IN THE SOFTWARE.
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
using Newtonsoft.Json.Serialization;
|
||||||
#if !(NET35 || NET20 || NETFX_CORE || PORTABLE || PORTABLE40)
|
#if !(NET35 || NET20 || NETFX_CORE || PORTABLE || PORTABLE40)
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -125,6 +126,96 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Assert.AreEqual(expected, json);
|
Assert.AreEqual(expected, json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeEntityCamelCase()
|
||||||
|
{
|
||||||
|
Folder rootFolder = CreateEntitiesTestData();
|
||||||
|
|
||||||
|
JsonSerializerSettings settings = new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
Formatting = Formatting.Indented,
|
||||||
|
ContractResolver = new CamelCasePropertyNamesContractResolver(),
|
||||||
|
Converters = { new IsoDateTimeConverter() }
|
||||||
|
};
|
||||||
|
|
||||||
|
string json = JsonConvert.SerializeObject(rootFolder, Formatting.None, settings);
|
||||||
|
|
||||||
|
Console.WriteLine(json);
|
||||||
|
|
||||||
|
string expected = @"{
|
||||||
|
""$id"": ""1"",
|
||||||
|
""folderId"": ""a4e8ba80-eb24-4591-bb1c-62d3ad83701e"",
|
||||||
|
""name"": ""Root folder"",
|
||||||
|
""description"": ""Description!"",
|
||||||
|
""createdDate"": ""2000-12-10T10:50:00Z"",
|
||||||
|
""files"": [],
|
||||||
|
""childFolders"": [
|
||||||
|
{
|
||||||
|
""$id"": ""2"",
|
||||||
|
""folderId"": ""484936e2-7cbb-4592-93ff-b2103e5705e4"",
|
||||||
|
""name"": ""Child folder"",
|
||||||
|
""description"": ""Description!"",
|
||||||
|
""createdDate"": ""2001-11-20T10:50:00Z"",
|
||||||
|
""files"": [
|
||||||
|
{
|
||||||
|
""$id"": ""3"",
|
||||||
|
""fileId"": ""cc76d734-49f1-4616-bb38-41514228ac6c"",
|
||||||
|
""name"": ""File 1"",
|
||||||
|
""description"": ""Description!"",
|
||||||
|
""createdDate"": ""2002-10-30T10:50:00Z"",
|
||||||
|
""folder"": {
|
||||||
|
""$ref"": ""2""
|
||||||
|
},
|
||||||
|
""entityKey"": {
|
||||||
|
""$id"": ""4"",
|
||||||
|
""entitySetName"": ""File"",
|
||||||
|
""entityContainerName"": ""DataServicesTestDatabaseEntities"",
|
||||||
|
""entityKeyValues"": [
|
||||||
|
{
|
||||||
|
""key"": ""FileId"",
|
||||||
|
""type"": ""System.Guid"",
|
||||||
|
""value"": ""cc76d734-49f1-4616-bb38-41514228ac6c""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
""childFolders"": [],
|
||||||
|
""parentFolder"": {
|
||||||
|
""$ref"": ""1""
|
||||||
|
},
|
||||||
|
""entityKey"": {
|
||||||
|
""$id"": ""5"",
|
||||||
|
""entitySetName"": ""Folder"",
|
||||||
|
""entityContainerName"": ""DataServicesTestDatabaseEntities"",
|
||||||
|
""entityKeyValues"": [
|
||||||
|
{
|
||||||
|
""key"": ""FolderId"",
|
||||||
|
""type"": ""System.Guid"",
|
||||||
|
""value"": ""484936e2-7cbb-4592-93ff-b2103e5705e4""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
""parentFolder"": null,
|
||||||
|
""entityKey"": {
|
||||||
|
""$id"": ""6"",
|
||||||
|
""entitySetName"": ""Folder"",
|
||||||
|
""entityContainerName"": ""DataServicesTestDatabaseEntities"",
|
||||||
|
""entityKeyValues"": [
|
||||||
|
{
|
||||||
|
""key"": ""FolderId"",
|
||||||
|
""type"": ""System.Guid"",
|
||||||
|
""value"": ""a4e8ba80-eb24-4591-bb1c-62d3ad83701e""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}";
|
||||||
|
|
||||||
|
Assert.AreEqual(expected, json);
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void DeserializeEntity()
|
public void DeserializeEntity()
|
||||||
{
|
{
|
||||||
@@ -227,6 +318,76 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void SerializeMultiValueEntityKey()
|
public void SerializeMultiValueEntityKey()
|
||||||
|
{
|
||||||
|
EntityKey e = new EntityKey("DataServicesTestDatabaseEntities.Folder",
|
||||||
|
new List<EntityKeyMember>
|
||||||
|
{
|
||||||
|
new EntityKeyMember("GuidId", new Guid("A4E8BA80-EB24-4591-BB1C-62D3AD83701E")),
|
||||||
|
new EntityKeyMember("IntId", int.MaxValue),
|
||||||
|
new EntityKeyMember("LongId", long.MaxValue),
|
||||||
|
new EntityKeyMember("StringId", "String!"),
|
||||||
|
new EntityKeyMember("DateTimeId", new DateTime(2000, 12, 10, 10, 50, 0, DateTimeKind.Utc))
|
||||||
|
});
|
||||||
|
|
||||||
|
JsonSerializerSettings settings = new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
Formatting = Formatting.Indented,
|
||||||
|
ContractResolver = new CamelCasePropertyNamesContractResolver()
|
||||||
|
};
|
||||||
|
|
||||||
|
string json = JsonConvert.SerializeObject(e, settings);
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""$id"": ""1"",
|
||||||
|
""entitySetName"": ""Folder"",
|
||||||
|
""entityContainerName"": ""DataServicesTestDatabaseEntities"",
|
||||||
|
""entityKeyValues"": [
|
||||||
|
{
|
||||||
|
""key"": ""GuidId"",
|
||||||
|
""type"": ""System.Guid"",
|
||||||
|
""value"": ""a4e8ba80-eb24-4591-bb1c-62d3ad83701e""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""key"": ""IntId"",
|
||||||
|
""type"": ""System.Int32"",
|
||||||
|
""value"": ""2147483647""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""key"": ""LongId"",
|
||||||
|
""type"": ""System.Int64"",
|
||||||
|
""value"": ""9223372036854775807""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""key"": ""StringId"",
|
||||||
|
""type"": ""System.String"",
|
||||||
|
""value"": ""String!""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""key"": ""DateTimeId"",
|
||||||
|
""type"": ""System.DateTime"",
|
||||||
|
""value"": ""12/10/2000 10:50:00""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}", json);
|
||||||
|
|
||||||
|
EntityKey newKey = JsonConvert.DeserializeObject<EntityKey>(json);
|
||||||
|
Assert.IsFalse(ReferenceEquals(e, newKey));
|
||||||
|
|
||||||
|
Assert.AreEqual(5, newKey.EntityKeyValues.Length);
|
||||||
|
Assert.AreEqual("GuidId", newKey.EntityKeyValues[0].Key);
|
||||||
|
Assert.AreEqual(new Guid("A4E8BA80-EB24-4591-BB1C-62D3AD83701E"), newKey.EntityKeyValues[0].Value);
|
||||||
|
Assert.AreEqual("IntId", newKey.EntityKeyValues[1].Key);
|
||||||
|
Assert.AreEqual(int.MaxValue, newKey.EntityKeyValues[1].Value);
|
||||||
|
Assert.AreEqual("LongId", newKey.EntityKeyValues[2].Key);
|
||||||
|
Assert.AreEqual(long.MaxValue, newKey.EntityKeyValues[2].Value);
|
||||||
|
Assert.AreEqual("StringId", newKey.EntityKeyValues[3].Key);
|
||||||
|
Assert.AreEqual("String!", newKey.EntityKeyValues[3].Value);
|
||||||
|
Assert.AreEqual("DateTimeId", newKey.EntityKeyValues[4].Key);
|
||||||
|
Assert.AreEqual(new DateTime(2000, 12, 10, 10, 50, 0, DateTimeKind.Utc), newKey.EntityKeyValues[4].Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeMultiValueEntityKeyCameCase()
|
||||||
{
|
{
|
||||||
EntityKey e = new EntityKey("DataServicesTestDatabaseEntities.Folder",
|
EntityKey e = new EntityKey("DataServicesTestDatabaseEntities.Folder",
|
||||||
new List<EntityKeyMember>
|
new List<EntityKeyMember>
|
||||||
|
|||||||
@@ -0,0 +1,215 @@
|
|||||||
|
#region License
|
||||||
|
// Copyright (c) 2007 James Newton-King
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person
|
||||||
|
// obtaining a copy of this software and associated documentation
|
||||||
|
// files (the "Software"), to deal in the Software without
|
||||||
|
// restriction, including without limitation the rights to use,
|
||||||
|
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the
|
||||||
|
// Software is furnished to do so, subject to the following
|
||||||
|
// conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be
|
||||||
|
// included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data.Odbc;
|
||||||
|
using System.Reflection;
|
||||||
|
using Newtonsoft.Json.Serialization;
|
||||||
|
using System.Globalization;
|
||||||
|
using Newtonsoft.Json.Utilities;
|
||||||
|
|
||||||
|
namespace Newtonsoft.Json.Converters
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Converts a F# discriminated union type to and from JSON.
|
||||||
|
/// </summary>
|
||||||
|
public class DiscriminatedUnionConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private static bool _initialized;
|
||||||
|
private static MethodCall<object, object> _isUnion;
|
||||||
|
private static MethodCall<object, object> _getUnionFields;
|
||||||
|
private static MethodCall<object, object> _getUnionCases;
|
||||||
|
private static MethodCall<object, object> _makeUnion;
|
||||||
|
private static Func<object, object> _getUnionCaseInfoName;
|
||||||
|
private static Func<object, object> _getUnionCaseInfo;
|
||||||
|
private static Func<object, object> _getUnionCaseFields;
|
||||||
|
private static MethodCall<object, object> _getUnionCaseInfoFields;
|
||||||
|
|
||||||
|
private const string CasePropertyName = "Case";
|
||||||
|
private const string FieldsPropertyName = "Fields";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Writes the JSON representation of the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
|
||||||
|
/// <param name="value">The value.</param>
|
||||||
|
/// <param name="serializer">The calling serializer.</param>
|
||||||
|
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
DefaultContractResolver resolver = serializer.ContractResolver as DefaultContractResolver;
|
||||||
|
|
||||||
|
Type t = value.GetType();
|
||||||
|
|
||||||
|
object result = _getUnionFields(null, value, t, null);
|
||||||
|
object info = _getUnionCaseInfo(result);
|
||||||
|
object fields = _getUnionCaseFields(result);
|
||||||
|
object caseName = _getUnionCaseInfoName(info);
|
||||||
|
|
||||||
|
writer.WriteStartObject();
|
||||||
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(CasePropertyName) : CasePropertyName);
|
||||||
|
writer.WriteValue((string)caseName);
|
||||||
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(FieldsPropertyName) : FieldsPropertyName);
|
||||||
|
serializer.Serialize(writer, fields);
|
||||||
|
writer.WriteEndObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Reads the JSON representation of the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
|
||||||
|
/// <param name="objectType">Type of the object.</param>
|
||||||
|
/// <param name="existingValue">The existing value of object being read.</param>
|
||||||
|
/// <param name="serializer">The calling serializer.</param>
|
||||||
|
/// <returns>The object value.</returns>
|
||||||
|
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
if (reader.TokenType == JsonToken.Null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
IEnumerable cases = (IEnumerable)_getUnionCases(null, objectType, null);
|
||||||
|
|
||||||
|
ReadAndAssertProperty(reader, CasePropertyName);
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
string caseName = reader.Value.ToString();
|
||||||
|
|
||||||
|
object matchingCaseInfo = null;
|
||||||
|
foreach (object c in cases)
|
||||||
|
{
|
||||||
|
if ((string)_getUnionCaseInfoName(c) == caseName)
|
||||||
|
{
|
||||||
|
matchingCaseInfo = c;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (matchingCaseInfo == null)
|
||||||
|
throw new JsonSerializationException("No union type found with the name '{0}'.".FormatWith(CultureInfo.InvariantCulture, caseName));
|
||||||
|
|
||||||
|
ReadAndAssertProperty(reader, FieldsPropertyName);
|
||||||
|
// start array
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
// first value
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
PropertyInfo[] fieldProperties = (PropertyInfo[])_getUnionCaseInfoFields(matchingCaseInfo);
|
||||||
|
List<object> fieldValues = new List<object>();
|
||||||
|
foreach (PropertyInfo field in fieldProperties)
|
||||||
|
{
|
||||||
|
fieldValues.Add(serializer.Deserialize(reader, field.PropertyType));
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
}
|
||||||
|
|
||||||
|
// end object
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
return _makeUnion(null, matchingCaseInfo, fieldValues.ToArray(), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines whether this instance can convert the specified object type.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="objectType">Type of the object.</param>
|
||||||
|
/// <returns>
|
||||||
|
/// <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
|
||||||
|
/// </returns>
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
if (typeof(IEnumerable).IsAssignableFrom(objectType))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// all fsharp objects have CompilationMappingAttribute
|
||||||
|
// get the fsharp assembly from the attribute and initialize latebound methods
|
||||||
|
object[] attributes = objectType.GetCustomAttributes(true);
|
||||||
|
bool isFSharpType = false;
|
||||||
|
foreach (object attribute in attributes)
|
||||||
|
{
|
||||||
|
Type attributeType = attribute.GetType();
|
||||||
|
if (attributeType.Name == "CompilationMappingAttribute")
|
||||||
|
{
|
||||||
|
EnsureInitialized(attributeType);
|
||||||
|
|
||||||
|
isFSharpType = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isFSharpType)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return (bool)_isUnion(null, objectType, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void EnsureInitialized(Type attributeType)
|
||||||
|
{
|
||||||
|
if (!_initialized)
|
||||||
|
{
|
||||||
|
_initialized = true;
|
||||||
|
|
||||||
|
Assembly fsharpCoreAssembly = attributeType.Assembly;
|
||||||
|
Type fsharpType = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.FSharpType");
|
||||||
|
|
||||||
|
MethodInfo isUnionMethodInfo = fsharpType.GetMethod("IsUnion", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_isUnion = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(isUnionMethodInfo);
|
||||||
|
|
||||||
|
MethodInfo getUnionCasesMethodInfo = fsharpType.GetMethod("GetUnionCases", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_getUnionCases = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(getUnionCasesMethodInfo);
|
||||||
|
|
||||||
|
Type fsharpValue = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.FSharpValue");
|
||||||
|
|
||||||
|
MethodInfo getUnionFieldsMethodInfo = fsharpValue.GetMethod("GetUnionFields", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_getUnionFields = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(getUnionFieldsMethodInfo);
|
||||||
|
|
||||||
|
_getUnionCaseInfo = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(getUnionFieldsMethodInfo.ReturnType.GetProperty("Item1"));
|
||||||
|
_getUnionCaseFields = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(getUnionFieldsMethodInfo.ReturnType.GetProperty("Item2"));
|
||||||
|
|
||||||
|
MethodInfo makeUnionMethodInfo = fsharpValue.GetMethod("MakeUnion", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_makeUnion = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(makeUnionMethodInfo);
|
||||||
|
|
||||||
|
Type unionCaseInfo = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.UnionCaseInfo");
|
||||||
|
|
||||||
|
_getUnionCaseInfoName = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(unionCaseInfo.GetProperty("Name"));
|
||||||
|
_getUnionCaseInfoFields = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(unionCaseInfo.GetMethod("GetFields"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ReadAndAssertProperty(JsonReader reader, string propertyName)
|
||||||
|
{
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
if (reader.TokenType != JsonToken.PropertyName || !string.Equals(reader.Value.ToString(), propertyName, StringComparison.OrdinalIgnoreCase))
|
||||||
|
throw new JsonSerializationException("Expected JSON property '{0}'.".FormatWith(CultureInfo.InvariantCulture, propertyName));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ReadAndAssert(JsonReader reader)
|
||||||
|
{
|
||||||
|
if (!reader.Read())
|
||||||
|
throw new JsonSerializationException("Unexpected end.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,215 @@
|
|||||||
|
#region License
|
||||||
|
// Copyright (c) 2007 James Newton-King
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person
|
||||||
|
// obtaining a copy of this software and associated documentation
|
||||||
|
// files (the "Software"), to deal in the Software without
|
||||||
|
// restriction, including without limitation the rights to use,
|
||||||
|
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the
|
||||||
|
// Software is furnished to do so, subject to the following
|
||||||
|
// conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be
|
||||||
|
// included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data.Odbc;
|
||||||
|
using System.Reflection;
|
||||||
|
using Newtonsoft.Json.Serialization;
|
||||||
|
using System.Globalization;
|
||||||
|
using Newtonsoft.Json.Utilities;
|
||||||
|
|
||||||
|
namespace Newtonsoft.Json.Converters
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Converts a F# union type to and from JSON.
|
||||||
|
/// </summary>
|
||||||
|
public class DiscriminatedUnionTypeConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private static bool _initialized;
|
||||||
|
private static MethodCall<object, object> _isUnion;
|
||||||
|
private static MethodCall<object, object> _getUnionFields;
|
||||||
|
private static MethodCall<object, object> _getUnionCases;
|
||||||
|
private static MethodCall<object, object> _makeUnion;
|
||||||
|
private static Func<object, object> _getUnionCaseInfoName;
|
||||||
|
private static Func<object, object> _getUnionCaseInfo;
|
||||||
|
private static Func<object, object> _getUnionCaseFields;
|
||||||
|
private static MethodCall<object, object> _getUnionCaseInfoFields;
|
||||||
|
|
||||||
|
private const string CasePropertyName = "Case";
|
||||||
|
private const string FieldsPropertyName = "Fields";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Writes the JSON representation of the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
|
||||||
|
/// <param name="value">The value.</param>
|
||||||
|
/// <param name="serializer">The calling serializer.</param>
|
||||||
|
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
DefaultContractResolver resolver = serializer.ContractResolver as DefaultContractResolver;
|
||||||
|
|
||||||
|
Type t = value.GetType();
|
||||||
|
|
||||||
|
object result = _getUnionFields(null, value, t, null);
|
||||||
|
object info = _getUnionCaseInfo(result);
|
||||||
|
object fields = _getUnionCaseFields(result);
|
||||||
|
object caseName = _getUnionCaseInfoName(info);
|
||||||
|
|
||||||
|
writer.WriteStartObject();
|
||||||
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(CasePropertyName) : CasePropertyName);
|
||||||
|
writer.WriteValue((string)caseName);
|
||||||
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(FieldsPropertyName) : FieldsPropertyName);
|
||||||
|
serializer.Serialize(writer, fields);
|
||||||
|
writer.WriteEndObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Reads the JSON representation of the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
|
||||||
|
/// <param name="objectType">Type of the object.</param>
|
||||||
|
/// <param name="existingValue">The existing value of object being read.</param>
|
||||||
|
/// <param name="serializer">The calling serializer.</param>
|
||||||
|
/// <returns>The object value.</returns>
|
||||||
|
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
if (reader.TokenType == JsonToken.Null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
IEnumerable cases = (IEnumerable)_getUnionCases(null, objectType, null);
|
||||||
|
|
||||||
|
ReadAndAssertProperty(reader, CasePropertyName);
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
string caseName = reader.Value.ToString();
|
||||||
|
|
||||||
|
object matchingCaseInfo = null;
|
||||||
|
foreach (object c in cases)
|
||||||
|
{
|
||||||
|
if ((string)_getUnionCaseInfoName(c) == caseName)
|
||||||
|
{
|
||||||
|
matchingCaseInfo = c;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (matchingCaseInfo == null)
|
||||||
|
throw new JsonSerializationException("No union type found with the name '{0}'.".FormatWith(CultureInfo.InvariantCulture, caseName));
|
||||||
|
|
||||||
|
ReadAndAssertProperty(reader, FieldsPropertyName);
|
||||||
|
// start array
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
// first value
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
PropertyInfo[] fieldProperties = (PropertyInfo[])_getUnionCaseInfoFields(matchingCaseInfo);
|
||||||
|
List<object> fieldValues = new List<object>();
|
||||||
|
foreach (PropertyInfo field in fieldProperties)
|
||||||
|
{
|
||||||
|
fieldValues.Add(serializer.Deserialize(reader, field.PropertyType));
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
}
|
||||||
|
|
||||||
|
// end object
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
return _makeUnion(null, matchingCaseInfo, fieldValues.ToArray(), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines whether this instance can convert the specified object type.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="objectType">Type of the object.</param>
|
||||||
|
/// <returns>
|
||||||
|
/// <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
|
||||||
|
/// </returns>
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
if (typeof(IEnumerable).IsAssignableFrom(objectType))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// all fsharp objects have CompilationMappingAttribute
|
||||||
|
// get the fsharp assembly from the attribute and initialize latebound methods
|
||||||
|
object[] attributes = objectType.GetCustomAttributes(true);
|
||||||
|
bool isFSharpType = false;
|
||||||
|
foreach (object attribute in attributes)
|
||||||
|
{
|
||||||
|
Type attributeType = attribute.GetType();
|
||||||
|
if (attributeType.Name == "CompilationMappingAttribute")
|
||||||
|
{
|
||||||
|
EnsureInitialized(attributeType);
|
||||||
|
|
||||||
|
isFSharpType = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isFSharpType)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return (bool)_isUnion(null, objectType, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void EnsureInitialized(Type attributeType)
|
||||||
|
{
|
||||||
|
if (!_initialized)
|
||||||
|
{
|
||||||
|
_initialized = true;
|
||||||
|
|
||||||
|
Assembly fsharpCoreAssembly = attributeType.Assembly;
|
||||||
|
Type fsharpType = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.FSharpType");
|
||||||
|
|
||||||
|
MethodInfo isUnionMethodInfo = fsharpType.GetMethod("IsUnion", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_isUnion = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(isUnionMethodInfo);
|
||||||
|
|
||||||
|
MethodInfo getUnionCasesMethodInfo = fsharpType.GetMethod("GetUnionCases", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_getUnionCases = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(getUnionCasesMethodInfo);
|
||||||
|
|
||||||
|
Type fsharpValue = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.FSharpValue");
|
||||||
|
|
||||||
|
MethodInfo getUnionFieldsMethodInfo = fsharpValue.GetMethod("GetUnionFields", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_getUnionFields = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(getUnionFieldsMethodInfo);
|
||||||
|
|
||||||
|
_getUnionCaseInfo = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(getUnionFieldsMethodInfo.ReturnType.GetProperty("Item1"));
|
||||||
|
_getUnionCaseFields = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(getUnionFieldsMethodInfo.ReturnType.GetProperty("Item2"));
|
||||||
|
|
||||||
|
MethodInfo makeUnionMethodInfo = fsharpValue.GetMethod("MakeUnion", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_makeUnion = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(makeUnionMethodInfo);
|
||||||
|
|
||||||
|
Type unionCaseInfo = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.UnionCaseInfo");
|
||||||
|
|
||||||
|
_getUnionCaseInfoName = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(unionCaseInfo.GetProperty("Name"));
|
||||||
|
_getUnionCaseInfoFields = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(unionCaseInfo.GetMethod("GetFields"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ReadAndAssertProperty(JsonReader reader, string propertyName)
|
||||||
|
{
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
if (reader.TokenType != JsonToken.PropertyName || !string.Equals(reader.Value.ToString(), propertyName, StringComparison.OrdinalIgnoreCase))
|
||||||
|
throw new JsonSerializationException("Expected JSON property '{0}'.".FormatWith(CultureInfo.InvariantCulture, propertyName));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ReadAndAssert(JsonReader reader)
|
||||||
|
{
|
||||||
|
if (!reader.Read())
|
||||||
|
throw new JsonSerializationException("Unexpected end.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -44,6 +44,10 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
private const string EntityKeyMemberFullTypeName = "System.Data.EntityKeyMember";
|
private const string EntityKeyMemberFullTypeName = "System.Data.EntityKeyMember";
|
||||||
|
|
||||||
|
private const string KeyPropertyName = "Key";
|
||||||
|
private const string TypePropertyName = "Type";
|
||||||
|
private const string ValuePropertyName = "Value";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Writes the JSON representation of the object.
|
/// Writes the JSON representation of the object.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -52,16 +56,18 @@ namespace Newtonsoft.Json.Converters
|
|||||||
/// <param name="serializer">The calling serializer.</param>
|
/// <param name="serializer">The calling serializer.</param>
|
||||||
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||||
{
|
{
|
||||||
|
DefaultContractResolver resolver = serializer.ContractResolver as DefaultContractResolver;
|
||||||
|
|
||||||
IEntityKeyMember entityKeyMember = DynamicWrapper.CreateWrapper<IEntityKeyMember>(value);
|
IEntityKeyMember entityKeyMember = DynamicWrapper.CreateWrapper<IEntityKeyMember>(value);
|
||||||
Type keyType = (entityKeyMember.Value != null) ? entityKeyMember.Value.GetType() : null;
|
Type keyType = (entityKeyMember.Value != null) ? entityKeyMember.Value.GetType() : null;
|
||||||
|
|
||||||
writer.WriteStartObject();
|
writer.WriteStartObject();
|
||||||
writer.WritePropertyName("Key");
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(KeyPropertyName) : KeyPropertyName);
|
||||||
writer.WriteValue(entityKeyMember.Key);
|
writer.WriteValue(entityKeyMember.Key);
|
||||||
writer.WritePropertyName("Type");
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(TypePropertyName) : TypePropertyName);
|
||||||
writer.WriteValue((keyType != null) ? keyType.FullName : null);
|
writer.WriteValue((keyType != null) ? keyType.FullName : null);
|
||||||
|
|
||||||
writer.WritePropertyName("Value");
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(ValuePropertyName) : ValuePropertyName);
|
||||||
|
|
||||||
if (keyType != null)
|
if (keyType != null)
|
||||||
{
|
{
|
||||||
@@ -83,7 +89,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
ReadAndAssert(reader);
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
if (reader.TokenType != JsonToken.PropertyName || reader.Value.ToString() != propertyName)
|
if (reader.TokenType != JsonToken.PropertyName || !string.Equals(reader.Value.ToString(), propertyName, StringComparison.OrdinalIgnoreCase))
|
||||||
throw new JsonSerializationException("Expected JSON property '{0}'.".FormatWith(CultureInfo.InvariantCulture, propertyName));
|
throw new JsonSerializationException("Expected JSON property '{0}'.".FormatWith(CultureInfo.InvariantCulture, propertyName));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,17 +111,17 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
IEntityKeyMember entityKeyMember = DynamicWrapper.CreateWrapper<IEntityKeyMember>(Activator.CreateInstance(objectType));
|
IEntityKeyMember entityKeyMember = DynamicWrapper.CreateWrapper<IEntityKeyMember>(Activator.CreateInstance(objectType));
|
||||||
|
|
||||||
ReadAndAssertProperty(reader, "Key");
|
ReadAndAssertProperty(reader, KeyPropertyName);
|
||||||
ReadAndAssert(reader);
|
ReadAndAssert(reader);
|
||||||
entityKeyMember.Key = reader.Value.ToString();
|
entityKeyMember.Key = reader.Value.ToString();
|
||||||
|
|
||||||
ReadAndAssertProperty(reader, "Type");
|
ReadAndAssertProperty(reader, TypePropertyName);
|
||||||
ReadAndAssert(reader);
|
ReadAndAssert(reader);
|
||||||
string type = reader.Value.ToString();
|
string type = reader.Value.ToString();
|
||||||
|
|
||||||
Type t = Type.GetType(type);
|
Type t = Type.GetType(type);
|
||||||
|
|
||||||
ReadAndAssertProperty(reader, "Value");
|
ReadAndAssertProperty(reader, ValuePropertyName);
|
||||||
ReadAndAssert(reader);
|
ReadAndAssert(reader);
|
||||||
entityKeyMember.Value = serializer.Deserialize(reader, t);
|
entityKeyMember.Value = serializer.Deserialize(reader, t);
|
||||||
|
|
||||||
@@ -133,9 +139,8 @@ namespace Newtonsoft.Json.Converters
|
|||||||
/// </returns>
|
/// </returns>
|
||||||
public override bool CanConvert(Type objectType)
|
public override bool CanConvert(Type objectType)
|
||||||
{
|
{
|
||||||
return (objectType.AssignableToTypeName(EntityKeyMemberFullTypeName));
|
return objectType.AssignableToTypeName(EntityKeyMemberFullTypeName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@@ -0,0 +1,215 @@
|
|||||||
|
#region License
|
||||||
|
// Copyright (c) 2007 James Newton-King
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person
|
||||||
|
// obtaining a copy of this software and associated documentation
|
||||||
|
// files (the "Software"), to deal in the Software without
|
||||||
|
// restriction, including without limitation the rights to use,
|
||||||
|
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the
|
||||||
|
// Software is furnished to do so, subject to the following
|
||||||
|
// conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be
|
||||||
|
// included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data.Odbc;
|
||||||
|
using System.Reflection;
|
||||||
|
using Newtonsoft.Json.Serialization;
|
||||||
|
using System.Globalization;
|
||||||
|
using Newtonsoft.Json.Utilities;
|
||||||
|
|
||||||
|
namespace Newtonsoft.Json.Converters
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Converts a F# union type to and from JSON.
|
||||||
|
/// </summary>
|
||||||
|
public class UnionTypeConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private static bool _initialized;
|
||||||
|
private static MethodCall<object, object> _isUnionMethod;
|
||||||
|
private static MethodCall<object, object> _getUnionFieldsMethod;
|
||||||
|
private static MethodCall<object, object> _getUnionCasesMethod;
|
||||||
|
private static MethodCall<object, object> _makeUnionMethod;
|
||||||
|
private static Func<object, object> _getUnionCaseInfoName;
|
||||||
|
private static Func<object, object> _getUnionCaseInfo;
|
||||||
|
private static Func<object, object> _getUnionCaseFields;
|
||||||
|
private static MethodCall<object, object> _getUnionCaseInfoFields;
|
||||||
|
|
||||||
|
private const string CasePropertyName = "Case";
|
||||||
|
private const string FieldsPropertyName = "Fields";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Writes the JSON representation of the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
|
||||||
|
/// <param name="value">The value.</param>
|
||||||
|
/// <param name="serializer">The calling serializer.</param>
|
||||||
|
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
DefaultContractResolver resolver = serializer.ContractResolver as DefaultContractResolver;
|
||||||
|
|
||||||
|
Type t = value.GetType();
|
||||||
|
|
||||||
|
object result = _getUnionFieldsMethod(null, value, t, null);
|
||||||
|
object info = _getUnionCaseInfo(result);
|
||||||
|
object fields = _getUnionCaseFields(result);
|
||||||
|
object caseName = _getUnionCaseInfoName(info);
|
||||||
|
|
||||||
|
writer.WriteStartObject();
|
||||||
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(CasePropertyName) : CasePropertyName);
|
||||||
|
writer.WriteValue((string)caseName);
|
||||||
|
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(FieldsPropertyName) : FieldsPropertyName);
|
||||||
|
serializer.Serialize(writer, fields);
|
||||||
|
writer.WriteEndObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Reads the JSON representation of the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
|
||||||
|
/// <param name="objectType">Type of the object.</param>
|
||||||
|
/// <param name="existingValue">The existing value of object being read.</param>
|
||||||
|
/// <param name="serializer">The calling serializer.</param>
|
||||||
|
/// <returns>The object value.</returns>
|
||||||
|
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
if (reader.TokenType == JsonToken.Null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
IEnumerable cases = (IEnumerable)_getUnionCasesMethod(null, objectType, null);
|
||||||
|
|
||||||
|
ReadAndAssertProperty(reader, CasePropertyName);
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
string caseName = reader.Value.ToString();
|
||||||
|
|
||||||
|
object matchingCaseInfo = null;
|
||||||
|
foreach (object c in cases)
|
||||||
|
{
|
||||||
|
if ((string)_getUnionCaseInfoName(c) == caseName)
|
||||||
|
{
|
||||||
|
matchingCaseInfo = c;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (matchingCaseInfo == null)
|
||||||
|
throw new JsonSerializationException("No union type found with the name '{0}'.".FormatWith(CultureInfo.InvariantCulture, caseName));
|
||||||
|
|
||||||
|
ReadAndAssertProperty(reader, FieldsPropertyName);
|
||||||
|
// start array
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
// first value
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
PropertyInfo[] fieldProperties = (PropertyInfo[])_getUnionCaseInfoFields(matchingCaseInfo);
|
||||||
|
List<object> fieldValues = new List<object>();
|
||||||
|
foreach (PropertyInfo field in fieldProperties)
|
||||||
|
{
|
||||||
|
fieldValues.Add(serializer.Deserialize(reader, field.PropertyType));
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
}
|
||||||
|
|
||||||
|
// end object
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
return _makeUnionMethod(null, matchingCaseInfo, fieldValues.ToArray(), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines whether this instance can convert the specified object type.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="objectType">Type of the object.</param>
|
||||||
|
/// <returns>
|
||||||
|
/// <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
|
||||||
|
/// </returns>
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
if (typeof(IEnumerable).IsAssignableFrom(objectType))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// all fsharp objects have CompilationMappingAttribute
|
||||||
|
// get the fsharp assembly from the attribute and initialize latebound methods
|
||||||
|
object[] attributes = objectType.GetCustomAttributes(true);
|
||||||
|
bool isFSharpType = false;
|
||||||
|
foreach (object attribute in attributes)
|
||||||
|
{
|
||||||
|
Type attributeType = attribute.GetType();
|
||||||
|
if (attributeType.Name == "CompilationMappingAttribute")
|
||||||
|
{
|
||||||
|
EnsureInitialized(attributeType);
|
||||||
|
|
||||||
|
isFSharpType = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isFSharpType)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return (bool)_isUnionMethod(null, objectType, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void EnsureInitialized(Type attributeType)
|
||||||
|
{
|
||||||
|
if (!_initialized)
|
||||||
|
{
|
||||||
|
_initialized = true;
|
||||||
|
|
||||||
|
Assembly fsharpCoreAssembly = attributeType.Assembly;
|
||||||
|
Type fsharpType = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.FSharpType");
|
||||||
|
|
||||||
|
MethodInfo isUnionMethodInfo = fsharpType.GetMethod("IsUnion", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_isUnionMethod = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(isUnionMethodInfo);
|
||||||
|
|
||||||
|
MethodInfo getUnionCasesMethodInfo = fsharpType.GetMethod("GetUnionCases", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_getUnionCasesMethod = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(getUnionCasesMethodInfo);
|
||||||
|
|
||||||
|
Type fsharpValue = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.FSharpValue");
|
||||||
|
|
||||||
|
MethodInfo getUnionFieldsMethodInfo = fsharpValue.GetMethod("GetUnionFields", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_getUnionFieldsMethod = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(getUnionFieldsMethodInfo);
|
||||||
|
|
||||||
|
_getUnionCaseInfo = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(getUnionFieldsMethodInfo.ReturnType.GetProperty("Item1"));
|
||||||
|
_getUnionCaseFields = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(getUnionFieldsMethodInfo.ReturnType.GetProperty("Item2"));
|
||||||
|
|
||||||
|
MethodInfo makeUnionMethodInfo = fsharpValue.GetMethod("MakeUnion", BindingFlags.Public | BindingFlags.Static);
|
||||||
|
_makeUnionMethod = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(makeUnionMethodInfo);
|
||||||
|
|
||||||
|
Type unionCaseInfo = fsharpCoreAssembly.GetType("Microsoft.FSharp.Reflection.UnionCaseInfo");
|
||||||
|
|
||||||
|
_getUnionCaseInfoName = JsonTypeReflector.ReflectionDelegateFactory.CreateGet<object>(unionCaseInfo.GetProperty("Name"));
|
||||||
|
_getUnionCaseInfoFields = JsonTypeReflector.ReflectionDelegateFactory.CreateMethodCall<object>(unionCaseInfo.GetMethod("GetFields"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ReadAndAssertProperty(JsonReader reader, string propertyName)
|
||||||
|
{
|
||||||
|
ReadAndAssert(reader);
|
||||||
|
|
||||||
|
if (reader.TokenType != JsonToken.PropertyName || !string.Equals(reader.Value.ToString(), propertyName, StringComparison.OrdinalIgnoreCase))
|
||||||
|
throw new JsonSerializationException("Expected JSON property '{0}'.".FormatWith(CultureInfo.InvariantCulture, propertyName));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ReadAndAssert(JsonReader reader)
|
||||||
|
{
|
||||||
|
if (!reader.Read())
|
||||||
|
throw new JsonSerializationException("Unexpected end.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace Newtonsoft.Json.Linq.JsonPath
|
||||||
|
{
|
||||||
|
internal enum QueryOperator
|
||||||
|
{
|
||||||
|
None,
|
||||||
|
Equals,
|
||||||
|
NotEquals,
|
||||||
|
Exists,
|
||||||
|
LessThan,
|
||||||
|
LessThanOrEquals,
|
||||||
|
GreaterThan,
|
||||||
|
GreaterThanOrEquals,
|
||||||
|
And,
|
||||||
|
Or
|
||||||
|
}
|
||||||
|
|
||||||
|
internal abstract class QueryExpression
|
||||||
|
{
|
||||||
|
public QueryOperator Operator { get; set; }
|
||||||
|
|
||||||
|
public abstract bool IsMatch(JToken t);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal class CompositeExpression : QueryExpression
|
||||||
|
{
|
||||||
|
public List<QueryExpression> Expressions { get; set; }
|
||||||
|
|
||||||
|
public CompositeExpression()
|
||||||
|
{
|
||||||
|
Expressions = new List<QueryExpression>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool IsMatch(JToken t)
|
||||||
|
{
|
||||||
|
switch (Operator)
|
||||||
|
{
|
||||||
|
case QueryOperator.And:
|
||||||
|
foreach (QueryExpression e in Expressions)
|
||||||
|
{
|
||||||
|
if (!e.IsMatch(t))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
case QueryOperator.Or:
|
||||||
|
foreach (QueryExpression e in Expressions)
|
||||||
|
{
|
||||||
|
if (e.IsMatch(t))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal class BooleanQueryExpression : QueryExpression
|
||||||
|
{
|
||||||
|
public List<PathFilter> Path { get; set; }
|
||||||
|
public JValue Value { get; set; }
|
||||||
|
|
||||||
|
public override bool IsMatch(JToken t)
|
||||||
|
{
|
||||||
|
IEnumerable<JToken> pathResult = JPath.Evaluate(Path, t, false);
|
||||||
|
|
||||||
|
foreach (JToken r in pathResult)
|
||||||
|
{
|
||||||
|
JValue v = r as JValue;
|
||||||
|
switch (Operator)
|
||||||
|
{
|
||||||
|
case QueryOperator.Equals:
|
||||||
|
if (v != null && v.Equals(Value))
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case QueryOperator.NotEquals:
|
||||||
|
if (v != null && !v.Equals(Value))
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case QueryOperator.GreaterThan:
|
||||||
|
if (v != null && v.CompareTo(Value) > 0)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case QueryOperator.GreaterThanOrEquals:
|
||||||
|
if (v != null && v.CompareTo(Value) >= 0)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case QueryOperator.LessThan:
|
||||||
|
if (v != null && v.CompareTo(Value) < 0)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case QueryOperator.LessThanOrEquals:
|
||||||
|
if (v != null && v.CompareTo(Value) <= 0)
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case QueryOperator.Exists:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,109 +4,6 @@ using System.Linq;
|
|||||||
|
|
||||||
namespace Newtonsoft.Json.Linq.JsonPath
|
namespace Newtonsoft.Json.Linq.JsonPath
|
||||||
{
|
{
|
||||||
internal enum QueryOperator
|
|
||||||
{
|
|
||||||
None,
|
|
||||||
Equals,
|
|
||||||
NotEquals,
|
|
||||||
Exists,
|
|
||||||
LessThan,
|
|
||||||
LessThanOrEquals,
|
|
||||||
GreaterThan,
|
|
||||||
GreaterThanOrEquals,
|
|
||||||
And,
|
|
||||||
Or
|
|
||||||
}
|
|
||||||
|
|
||||||
internal abstract class QueryExpression
|
|
||||||
{
|
|
||||||
public QueryOperator Operator { get; set; }
|
|
||||||
|
|
||||||
public abstract bool IsMatch(JToken t);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal class CompositeExpression : QueryExpression
|
|
||||||
{
|
|
||||||
public List<QueryExpression> Expressions { get; set; }
|
|
||||||
|
|
||||||
public CompositeExpression()
|
|
||||||
{
|
|
||||||
Expressions = new List<QueryExpression>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool IsMatch(JToken t)
|
|
||||||
{
|
|
||||||
switch (Operator)
|
|
||||||
{
|
|
||||||
case QueryOperator.And:
|
|
||||||
foreach (QueryExpression e in Expressions)
|
|
||||||
{
|
|
||||||
if (!e.IsMatch(t))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
case QueryOperator.Or:
|
|
||||||
foreach (QueryExpression e in Expressions)
|
|
||||||
{
|
|
||||||
if (e.IsMatch(t))
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
default:
|
|
||||||
throw new ArgumentOutOfRangeException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal class BooleanQueryExpression : QueryExpression
|
|
||||||
{
|
|
||||||
public List<PathFilter> Path { get; set; }
|
|
||||||
public JValue Value { get; set; }
|
|
||||||
|
|
||||||
public override bool IsMatch(JToken t)
|
|
||||||
{
|
|
||||||
IEnumerable<JToken> pathResult = JPath.Evaluate(Path, t, false);
|
|
||||||
|
|
||||||
foreach (JToken r in pathResult)
|
|
||||||
{
|
|
||||||
JValue v = r as JValue;
|
|
||||||
switch (Operator)
|
|
||||||
{
|
|
||||||
case QueryOperator.Equals:
|
|
||||||
if (v != null && v.Equals(Value))
|
|
||||||
return true;
|
|
||||||
break;
|
|
||||||
case QueryOperator.NotEquals:
|
|
||||||
if (v != null && !v.Equals(Value))
|
|
||||||
return true;
|
|
||||||
break;
|
|
||||||
case QueryOperator.GreaterThan:
|
|
||||||
if (v != null && v.CompareTo(Value) > 0)
|
|
||||||
return true;
|
|
||||||
break;
|
|
||||||
case QueryOperator.GreaterThanOrEquals:
|
|
||||||
if (v != null && v.CompareTo(Value) >= 0)
|
|
||||||
return true;
|
|
||||||
break;
|
|
||||||
case QueryOperator.LessThan:
|
|
||||||
if (v != null && v.CompareTo(Value) < 0)
|
|
||||||
return true;
|
|
||||||
break;
|
|
||||||
case QueryOperator.LessThanOrEquals:
|
|
||||||
if (v != null && v.CompareTo(Value) <= 0)
|
|
||||||
return true;
|
|
||||||
break;
|
|
||||||
case QueryOperator.Exists:
|
|
||||||
return true;
|
|
||||||
default:
|
|
||||||
throw new ArgumentOutOfRangeException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal class QueryFilter : PathFilter
|
internal class QueryFilter : PathFilter
|
||||||
{
|
{
|
||||||
public QueryExpression Expression { get; set; }
|
public QueryExpression Expression { get; set; }
|
||||||
|
|||||||
@@ -60,6 +60,7 @@
|
|||||||
<Compile Include="Converters\DataSetConverter.cs" />
|
<Compile Include="Converters\DataSetConverter.cs" />
|
||||||
<Compile Include="Converters\DataTableConverter.cs" />
|
<Compile Include="Converters\DataTableConverter.cs" />
|
||||||
<Compile Include="Converters\DateTimeConverterBase.cs" />
|
<Compile Include="Converters\DateTimeConverterBase.cs" />
|
||||||
|
<Compile Include="Converters\DiscriminatedUnionConverter.cs" />
|
||||||
<Compile Include="Converters\EntityKeyMemberConverter.cs" />
|
<Compile Include="Converters\EntityKeyMemberConverter.cs" />
|
||||||
<Compile Include="Converters\ExpandoObjectConverter.cs" />
|
<Compile Include="Converters\ExpandoObjectConverter.cs" />
|
||||||
<Compile Include="Converters\IsoDateTimeConverter.cs" />
|
<Compile Include="Converters\IsoDateTimeConverter.cs" />
|
||||||
@@ -121,6 +122,7 @@
|
|||||||
<Compile Include="Linq\JPropertyKeyedCollection.cs" />
|
<Compile Include="Linq\JPropertyKeyedCollection.cs" />
|
||||||
<Compile Include="Linq\JRaw.cs" />
|
<Compile Include="Linq\JRaw.cs" />
|
||||||
<Compile Include="Linq\JsonPath\PathFilter.cs" />
|
<Compile Include="Linq\JsonPath\PathFilter.cs" />
|
||||||
|
<Compile Include="Linq\JsonPath\QueryExpression.cs" />
|
||||||
<Compile Include="Linq\JsonPath\QueryFilter.cs" />
|
<Compile Include="Linq\JsonPath\QueryFilter.cs" />
|
||||||
<Compile Include="Linq\JsonPath\ScanFilter.cs" />
|
<Compile Include="Linq\JsonPath\ScanFilter.cs" />
|
||||||
<Compile Include="Linq\JToken.cs" />
|
<Compile Include="Linq\JToken.cs" />
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
#if !(NET35 || NET20 || PORTABLE40)
|
#if !(NET35 || NET20 || PORTABLE40)
|
||||||
new ExpandoObjectConverter(),
|
new ExpandoObjectConverter(),
|
||||||
#endif
|
#endif
|
||||||
#if (!(PORTABLE40))
|
#if !(PORTABLE40)
|
||||||
new XmlNodeConverter(),
|
new XmlNodeConverter(),
|
||||||
#endif
|
#endif
|
||||||
#if !(NETFX_CORE || PORTABLE40 || PORTABLE)
|
#if !(NETFX_CORE || PORTABLE40 || PORTABLE)
|
||||||
@@ -112,11 +112,12 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
new DataTableConverter(),
|
new DataTableConverter(),
|
||||||
#endif
|
#endif
|
||||||
#if NETFX_CORE
|
#if NETFX_CORE
|
||||||
new JsonValueConverter(),
|
new JsonValueConverter(),
|
||||||
#endif
|
#endif
|
||||||
new KeyValuePairConverter(),
|
new KeyValuePairConverter(),
|
||||||
new BsonObjectIdConverter(),
|
new BsonObjectIdConverter(),
|
||||||
new RegexConverter()
|
new RegexConverter(),
|
||||||
|
new DiscriminatedUnionConverter()
|
||||||
};
|
};
|
||||||
|
|
||||||
private static Dictionary<ResolverContractKey, JsonContract> _sharedContractCache;
|
private static Dictionary<ResolverContractKey, JsonContract> _sharedContractCache;
|
||||||
|
|||||||
Reference in New Issue
Block a user