Fix using StringEnumConverter with naming strategy and specifie… (#2186)
This commit is contained in:
@@ -0,0 +1,76 @@
|
|||||||
|
#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
|
||||||
|
|
||||||
|
#if !NET20
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
using Newtonsoft.Json.Converters;
|
||||||
|
using Newtonsoft.Json.Serialization;
|
||||||
|
#if DNXCORE50
|
||||||
|
using Xunit;
|
||||||
|
using Test = Xunit.FactAttribute;
|
||||||
|
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
||||||
|
#else
|
||||||
|
using NUnit.Framework;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace Newtonsoft.Json.Tests.Issues
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class Issue2082
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void Test()
|
||||||
|
{
|
||||||
|
CamelCaseNamingStrategy namingStrategy = new CamelCaseNamingStrategy(processDictionaryKeys: true, overrideSpecifiedNames: false);
|
||||||
|
|
||||||
|
TestClass c = new TestClass { Value = TestEnum.UpperCaseName };
|
||||||
|
string json = JsonConvert.SerializeObject(c, new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
ContractResolver = new DefaultContractResolver
|
||||||
|
{
|
||||||
|
NamingStrategy = namingStrategy
|
||||||
|
},
|
||||||
|
Converters = new[] { new StringEnumConverter { NamingStrategy = namingStrategy } }
|
||||||
|
});
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{""value"":""UPPER_CASE_NAME""}", json);
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TestClass
|
||||||
|
{
|
||||||
|
public TestEnum Value { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum TestEnum
|
||||||
|
{
|
||||||
|
[EnumMember(Value = "UPPER_CASE_NAME")]
|
||||||
|
UpperCaseName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
@@ -54,6 +54,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
string[] names = Enum.GetNames(enumType);
|
string[] names = Enum.GetNames(enumType);
|
||||||
string[] resolvedNames = new string[names.Length];
|
string[] resolvedNames = new string[names.Length];
|
||||||
ulong[] values = new ulong[names.Length];
|
ulong[] values = new ulong[names.Length];
|
||||||
|
bool hasSpecifiedName;
|
||||||
|
|
||||||
for (int i = 0; i < names.Length; i++)
|
for (int i = 0; i < names.Length; i++)
|
||||||
{
|
{
|
||||||
@@ -63,10 +64,12 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
string resolvedName;
|
string resolvedName;
|
||||||
#if HAVE_DATA_CONTRACTS
|
#if HAVE_DATA_CONTRACTS
|
||||||
resolvedName = f.GetCustomAttributes(typeof(EnumMemberAttribute), true)
|
string specifiedName = f.GetCustomAttributes(typeof(EnumMemberAttribute), true)
|
||||||
.Cast<EnumMemberAttribute>()
|
.Cast<EnumMemberAttribute>()
|
||||||
.Select(a => a.Value)
|
.Select(a => a.Value)
|
||||||
.SingleOrDefault() ?? f.Name;
|
.SingleOrDefault();
|
||||||
|
hasSpecifiedName = specifiedName != null;
|
||||||
|
resolvedName = specifiedName ?? name;
|
||||||
|
|
||||||
if (Array.IndexOf(resolvedNames, resolvedName, 0, i) != -1)
|
if (Array.IndexOf(resolvedNames, resolvedName, 0, i) != -1)
|
||||||
{
|
{
|
||||||
@@ -74,10 +77,11 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
resolvedName = name;
|
resolvedName = name;
|
||||||
|
hasSpecifiedName = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
resolvedNames[i] = key.Value2 != null
|
resolvedNames[i] = key.Value2 != null
|
||||||
? key.Value2.GetPropertyName(resolvedName, false)
|
? key.Value2.GetPropertyName(resolvedName, hasSpecifiedName)
|
||||||
: resolvedName;
|
: resolvedName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user