CatFieldData is row-centric

Removal of total and each field is represented as a separate line
See elastic/elasticsearch#18068

Author: russcam

src/Nest/Cat/CatFielddata/CatFielddataRecord.cs

@@ -11,9 +11,7 @@ public class CatFielddataRecord : ICatRecord
 		public string Host { get; set; }
 		public string Ip { get; set; }
 		public string Node { get; set; }
-		public string Total { get; set; }
-
-		public IDictionary<string, string> FieldSizes { get; set; }
+		public string Field { get; set; }
+		public string Size { get; set; }
 	}
-	
-}
+}

src/Nest/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs

@@ -6,56 +6,48 @@ namespace Nest
 {
 	internal class CatFielddataRecordJsonConverter : JsonConverter
 	{
-		public override bool CanWrite
-		{
-			get { return false; }
-		}
+		public override bool CanWrite => false;
 
 		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)
 		{
-			var o = new CatFielddataRecord() { FieldSizes = new Dictionary<string, string>() };
+			var record = new CatFielddataRecord();
 			while (reader.Read())
 			{
 				var prop = reader.Value as string;
-				if (prop == null) return o;
+				if (prop == null) return record;
 
 				switch (prop)
 				{
 					case "id":
-						o.Id = reader.ReadAsString();
+						record.Id = reader.ReadAsString();
 						continue;
 					case "node":
 					case "n":
-						o.Node = reader.ReadAsString();
+						record.Node = reader.ReadAsString();
 						continue;
 					case "host":
-						o.Host = reader.ReadAsString();
+						record.Host = reader.ReadAsString();
 						continue;
 					case "ip":
-						o.Ip = reader.ReadAsString();
+						record.Ip = reader.ReadAsString();
 						continue;
-					case "total":
-						o.Total = reader.ReadAsString();
+					case "field":
+						record.Field = reader.ReadAsString();
 						continue;
-					default:
-						var value = reader.ReadAsString();
-						o.FieldSizes[prop] = value;
+					case "size":
+						record.Size = reader.ReadAsString();
 						continue;
 				}
 			}
-			return o;
+			return record;
 		}
 
-		public override bool CanConvert(Type objectType)
-		{
-			return objectType == typeof(CatFielddataRecord);
-		}
+		public override bool CanConvert(Type objectType) => objectType == typeof(CatFielddataRecord);
 	}
-}
+}

src/Tests/Cat/CatFielddata/CatFielddataApiTests.cs

@@ -1,8 +1,11 @@
-using Elasticsearch.Net;
+using System;
+using System.Linq;
+using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Framework;
 using Tests.Framework.Integration;
+using Tests.Framework.MockData;
 using Xunit;
 
 namespace Tests.Cat.CatFielddata
@@ -18,14 +21,39 @@ protected override LazyResponses ClientUsage() => Calls(
 			requestAsync: (client, r) => client.CatFielddataAsync(r)
 		);
 
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			// ensure some fielddata is loaded
+			var response = client.Search<Project>(s => s
+				.Query(q => q
+					.Terms(t => t
+						.Field(p => p.CuratedTags.First().Name)
+						.Terms(Tag.Generator.Generate(50).Select(ct => ct.Name))
+					)
+				)
+			);
+
+			if (!response.IsValid)
+				throw new Exception($"Failure setting up integration test. {response.DebugInformation}");
+		}
+
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/fielddata";
 
 		protected override void ExpectResponse(ICatResponse<CatFielddataRecord> response)
 		{
-			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Node));
+			response.Records.Should().NotBeEmpty();
+			foreach (var record in response.Records)
+			{
+				record.Node.Should().NotBeNullOrEmpty();
+				record.Id.Should().NotBeNullOrEmpty();
+				record.Host.Should().NotBeNullOrEmpty();
+				record.Ip.Should().NotBeNullOrEmpty();
+				record.Field.Should().NotBeNullOrEmpty();
+				record.Size.Should().NotBeNullOrEmpty();
+			}
 		}
 	}