Skip to content

Commit

Permalink
Fix deserialization of enums
Browse files Browse the repository at this point in the history
  • Loading branch information
0xced committed Jul 4, 2024
1 parent 6a87013 commit 5150c42
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
36 changes: 36 additions & 0 deletions src/Docker.DotNet/JsonEnumMemberConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;

namespace Docker.DotNet;

// Adapted from https://github.com/dotnet/runtime/issues/74385#issuecomment-1705083109
internal sealed class JsonEnumMemberConverter<TEnum> : JsonStringEnumConverter<TEnum> where TEnum : struct, Enum
{
public JsonEnumMemberConverter() : base(namingPolicy: ResolveNamingPolicy())
{
}

private static JsonNamingPolicy ResolveNamingPolicy()
{
var map = typeof(TEnum).GetFields(BindingFlags.Public | BindingFlags.Static)
.Select(f => (f.Name, AttributeName: f.GetCustomAttribute<EnumMemberAttribute>()?.Value))
.Where(pair => pair.AttributeName != null)
.ToDictionary(e => e.Name, e => e.AttributeName);

return map.Count > 0 ? new EnumMemberNamingPolicy(map) : null;
}

private sealed class EnumMemberNamingPolicy : JsonNamingPolicy
{
private readonly IReadOnlyDictionary<string, string> _map;

public EnumMemberNamingPolicy(IReadOnlyDictionary<string, string> map) => _map = map;

public override string ConvertName(string name) => _map.TryGetValue(name, out var newName) ? newName : name;
}
}
5 changes: 3 additions & 2 deletions src/Docker.DotNet/JsonSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
using System.Net.Http.Json;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using Docker.DotNet.Models;

namespace Docker.DotNet
{
Expand All @@ -21,9 +21,10 @@ internal class JsonSerializer
{
Converters =
{
new JsonEnumMemberConverter<TaskState>(),
new JsonEnumMemberConverter<RestartPolicyKind>(),
new JsonDateTimeConverter(),
new JsonNullableDateTimeConverter(),
new JsonStringEnumConverter(),
new JsonBase64Converter(),
},
};
Expand Down

0 comments on commit 5150c42

Please sign in to comment.