Address PR comments, changing response type for Has Privileges API calls

src/Nest/XPack/Security/Privileges/HasPrivileges/HasPrivilegesResponse.cs

@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
+	[JsonConverter(typeof(HasPrivilegesResponseJsonConverter))]
 	public interface IHasPrivilegesResponse : IResponse
 	{
 		[JsonProperty("username")]
@@ -12,25 +16,79 @@ public interface IHasPrivilegesResponse : IResponse
 		bool HasAllRequested { get; }
 
 		[JsonProperty("cluster")]
-		IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>> Cluster { get; }
+		IReadOnlyDictionary<string, bool> Clusters { get; }
 
 		[JsonProperty("index")]
-		IReadOnlyDictionary<string, IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>>> Index { get; }
+		IReadOnlyCollection<ResourcePrivileges> Indices { get; }
 
 		[JsonProperty("application")]
-		IReadOnlyDictionary<string, IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>>> Application { get; }
+		IReadOnlyDictionary<string, IReadOnlyCollection<ResourcePrivileges>> Applications { get; }
 	}
 
 	public class HasPrivilegesResponse : ResponseBase, IHasPrivilegesResponse
 	{
 		public string Username { get; internal set;  }
 		public bool HasAllRequested { get; internal set; }
-		public IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>> Cluster { get;internal set;  }
-		public IReadOnlyDictionary<string, IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>>> Index { get;internal set;  }
-		public IReadOnlyDictionary<string, IReadOnlyDictionary<string, IReadOnlyDictionary<string, bool>>> Application
+
+		public IReadOnlyDictionary<string, bool> Clusters { get; internal set; } = EmptyReadOnly<string, bool>.Dictionary;
+
+		public IReadOnlyCollection<ResourcePrivileges> Indices { get; internal set; } = EmptyReadOnly<ResourcePrivileges>.Collection;
+
+		public IReadOnlyDictionary<string, IReadOnlyCollection<ResourcePrivileges>> Applications { get; internal set; } =
+			EmptyReadOnly<string, IReadOnlyCollection<ResourcePrivileges>>.Dictionary;
+	}
+
+	public class ResourcePrivileges
+	{
+		public string Resource { get; internal set; }
+
+		public IReadOnlyDictionary<string, bool> Privileges { get; internal set; } = EmptyReadOnly<string, bool>.Dictionary;
+	}
+
+	internal class HasPrivilegesResponseJsonConverter : JsonConverter
+	{
+		public override bool CanConvert(Type objectType) => true;
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			get;
-			internal set;
+			var response = new HasPrivilegesResponse();
+			var jsonObject = JObject.Load(reader);
+
+			response.Username = jsonObject.Property("username").Value.Value<string>();
+			response.HasAllRequested = jsonObject.Property("has_all_requested").Value.Value<bool>();
+
+			response.Clusters = jsonObject.Property("cluster")
+				.Value.Value<JObject>()
+				.Properties()
+				.ToDictionary(c => c.Name, c => c.Value.Value<bool>());
+
+			response.Indices = jsonObject.Property("index")
+										 .Value.Value<JObject>()
+										 .Properties()
+										 .Select(o => new ResourcePrivileges
+										 {
+											 Resource = o.Name,
+											 Privileges = o.Value.Value<JObject>()
+												 .Properties()
+												 .ToDictionary(p => p.Name, p => p.Value.Value<bool>())
+										 }).ToList().AsReadOnly();
+
+			var apps = new Dictionary<string, IReadOnlyCollection<ResourcePrivileges>>();
+			foreach (var applicationProp in jsonObject.Property("application").Value.Value<JObject>())
+			{
+				apps.Add(applicationProp.Key, applicationProp.Value.Value<JObject>()
+					.Properties()
+					.Select(o => new ResourcePrivileges
+					{
+						Resource = o.Name,
+						Privileges = o.Value.Value<JObject>()
+							.Properties()
+							.ToDictionary(p => p.Name, p => p.Value.Value<bool>())
+					}).ToList().AsReadOnly());
+			}
+			response.Applications = apps;
+
+			return response;
 		}
 	}
 }

src/Tests/Tests/XPack/Security/Privileges/ApplicationPrivilegesApiTests.cs

@@ -210,14 +210,11 @@ [I] public async Task HasPrivilegesResponse() => await Assert<HasPrivilegesRespo
 		{
 			r.IsValid.Should().BeTrue();
 			r.ApiCall.HttpStatusCode.Should().Be(200);
-
 			r.Username.Should().Be($"user-{v}");
-
 			r.HasAllRequested.Should().Be(true);
-
-			r.Application.Should().NotBeEmpty();
+			r.Applications.Should().NotBeEmpty();
 			var app = $"app-{v}";
-			var hasApp = r.Application.TryGetValue(app, out var privilegesDict);
+			var hasApp = r.Applications.TryGetValue(app, out var privilegesDict);
 			hasApp.Should().BeTrue($"expect `{app}` to be returned");
 			privilegesDict.Should().NotBeNull($"expect `{app}`'s value not to be null");
 		});