zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-05 03:30:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix deserialization of enums with custom attributes

Browse Source
This commit is contained in:
Martin Scholz
2016-06-22 11:44:20 +02:00
parent bdc222132b
commit 4c05be81d4
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit/Http/SimpleJsonSerializer.cs
+15 -6
View File
@@ -80,17 +80,15 @@ namespace Octokit.Internal
{
var type = p.GetType();
var name = Enum.GetName(type, p);
#if NETFX_CORE
var attr = type.GetTypeInfo().GetCustomAttribute<ParameterAttribute>();
#else
var attr = type.GetField(name)
var attr = type.GetRuntimeField(name)
.GetCustomAttributes(false)
.OfType<ParameterAttribute>()
.SingleOrDefault();
#endif
if (attr != null)
return attr.Value;
return p.ToString().ToLowerInvariant();
}
@@ -105,6 +103,17 @@ namespace Octokit.Internal
{
if (ReflectionUtils.GetTypeInfo(type).IsEnum)
{
//first try to get all custom attributes
var fields = type.GetRuntimeFields();
foreach (var field in fields)
{
var attribute = (ParameterAttribute)field.GetCustomAttribute(typeof(ParameterAttribute));
if (attribute != null)
{
if (attribute.Value.Equals(value))
return field.GetValue(null);
}
}
// remove '-' from values coming in to be able to enum utf-8
stringValue = RemoveHyphenAndUnderscore(stringValue);
return Enum.Parse(type, stringValue, ignoreCase: true);