Add support for NamingStrategy to StringEnumConverter (#1885)

This commit is contained in:
James Newton-King
2018-10-21 18:27:00 +13:00
committed by GitHub
parent faaa23eb9e
commit d48558b53b
14 changed files with 380 additions and 171 deletions
@@ -824,7 +824,7 @@ namespace Newtonsoft.Json.Utilities
}
#endif
public static TypeNameKey SplitFullyQualifiedTypeName(string fullyQualifiedTypeName)
public static StructMultiKey<string, string> SplitFullyQualifiedTypeName(string fullyQualifiedTypeName)
{
int? assemblyDelimiterIndex = GetAssemblyDelimiterIndex(fullyQualifiedTypeName);
@@ -842,7 +842,7 @@ namespace Newtonsoft.Json.Utilities
assemblyName = null;
}
return new TypeNameKey(assemblyName, typeName);
return new StructMultiKey<string, string>(assemblyName, typeName);
}
private static int? GetAssemblyDelimiterIndex(string fullyQualifiedTypeName)
@@ -1094,36 +1094,4 @@ namespace Newtonsoft.Json.Utilities
return Activator.CreateInstance(type);
}
}
internal readonly struct TypeNameKey : IEquatable<TypeNameKey>
{
internal readonly string AssemblyName;
internal readonly string TypeName;
public TypeNameKey(string assemblyName, string typeName)
{
AssemblyName = assemblyName;
TypeName = typeName;
}
public override int GetHashCode()
{
return (AssemblyName?.GetHashCode() ?? 0) ^ (TypeName?.GetHashCode() ?? 0);
}
public override bool Equals(object obj)
{
if (!(obj is TypeNameKey key))
{
return false;
}
return Equals(key);
}
public bool Equals(TypeNameKey other)
{
return (AssemblyName == other.AssemblyName && TypeName == other.TypeName);
}
}
}