Renames: IAggregationResult => IAggregate, Items => Buckets

Author: gmarz

src/Nest/Aggregations/Aggregate.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	/// <summary>
+	/// Represents the result of an aggregation on the response
+	/// </summary>
+	[ExactContractJsonConverter(typeof(AggregateJsonConverter))]
+	public interface IAggregate
+	{
+		IDictionary<string, object> Meta { get; set; }
+	}
+}

src/Nest/Aggregations/AggregationResultJsonConverter.cs renamed to src/Nest/Aggregations/AggregateJsonConverter.cs

@@ -8,26 +8,22 @@
 
 namespace Nest
 {
-	internal class AggregationResultJsonConverter<TReadAs> : ReadAsTypeJsonConverter<TReadAs>
-		where TReadAs : class
-	{ }
-
-	internal class AggregationResultJsonConverter : JsonConverter
+	internal class AggregateJsonConverter : JsonConverter
 	{
 		private static Regex _numeric = new Regex(@"^[\d.]+(\.[\d.]+)?$");
 
 		public override bool CanWrite => false;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) => this.ReadAggregation(reader, serializer);
 
-		public override bool CanConvert(Type objectType) => objectType == typeof(IAggregationResult);
+		public override bool CanConvert(Type objectType) => objectType == typeof(IAggregate);
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			throw new NotSupportedException();
 		}
 
-		private IAggregationResult ReadAggregation(JsonReader reader, JsonSerializer serializer)
+		private IAggregate ReadAggregation(JsonReader reader, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject)
 				return null;
@@ -36,7 +32,7 @@ private IAggregationResult ReadAggregation(JsonReader reader, JsonSerializer ser
 			if (reader.TokenType != JsonToken.PropertyName)
 				return null;
 
-			IAggregationResult result = null;
+			IAggregate result = null;
 
 			var property = reader.Value as string;
 			if (_numeric.IsMatch(property))
@@ -130,7 +126,7 @@ private Dictionary<string, object> GetMetadata(JsonReader reader)
 			return meta;
 		}
 
-		private IAggregationResult GetTopHitsMetric(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetTopHitsMetric(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var o = JObject.Load(reader);
@@ -141,16 +137,16 @@ private IAggregationResult GetTopHitsMetric(JsonReader reader, JsonSerializer se
 			var maxScore = o["max_score"].ToObject<double?>();
 			var hits = o["hits"].Children().OfType<JObject>().Select(s => s);
 			reader.Read();
-			return new TopHitsMetric(hits, serializer) { Total = total, MaxScore = maxScore };
+			return new TopHitsAggregate(hits, serializer) { Total = total, MaxScore = maxScore };
 		}
 
-		private IAggregationResult GetGeoBoundsMetric(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetGeoBoundsMetric(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var o = JObject.Load(reader);
 			if (o == null)
 				return null;
-			var geoBoundsMetric = new GeoBoundsMetric();
+			var geoBoundsMetric = new GeoBoundsAggregate();
 			JToken topLeftToken;
 			o.TryGetValue("top_left", out topLeftToken);
 			if (topLeftToken != null)
@@ -171,9 +167,9 @@ private IAggregationResult GetGeoBoundsMetric(JsonReader reader, JsonSerializer
 			return geoBoundsMetric;
 		}
 
-		private IAggregationResult GetPercentilesMetric(JsonReader reader, JsonSerializer serializer, bool oldFormat = false)
+		private IAggregate GetPercentilesMetric(JsonReader reader, JsonSerializer serializer, bool oldFormat = false)
 		{
-			var metric = new PercentilesMetric();
+			var metric = new PercentilesAggregate();
 			var percentileItems = new List<PercentileItem>();
 			if (reader.TokenType == JsonToken.StartObject)
 				reader.Read();
@@ -202,18 +198,18 @@ private IAggregationResult GetPercentilesMetric(JsonReader reader, JsonSerialize
 			return metric;
 		}
 
-		private IAggregationResult GetDocCountBucket(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetDocCountBucket(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var docCount = (reader.Value as long?).GetValueOrDefault(0);
-			var bucket = new DocCountBucket { DocCount = docCount };
+			var bucket = new SingleBucketAggregate { DocCount = docCount };
 			reader.Read();
 			if (reader.TokenType == JsonToken.PropertyName
 				&& ((string)reader.Value) == "buckets"
 				)
 			{
-				var b = this.GetBucket(reader, serializer) as BucketDto;
-				return new BucketDto
+				var b = this.GetBucket(reader, serializer) as BucketAggregateData;
+				return new BucketAggregateData
 				{
 					DocCount = docCount,
 					Items = b.Items
@@ -225,7 +221,7 @@ private IAggregationResult GetDocCountBucket(JsonReader reader, JsonSerializer s
 			return bucket;
 		}
 
-		private IAggregationResult GetStatsMetric(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetStatsMetric(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var count = (reader.Value as long?).GetValueOrDefault(0);
@@ -238,7 +234,7 @@ private IAggregationResult GetStatsMetric(JsonReader reader, JsonSerializer seri
 			reader.Read(); reader.Read();
 			var sum = (reader.Value as double?);
 
-			var statsMetric = new StatsMetric()
+			var statsMetric = new StatsAggregate()
 			{
 				Average = average,
 				Count = count,
@@ -264,9 +260,9 @@ private IAggregationResult GetStatsMetric(JsonReader reader, JsonSerializer seri
 			return GetExtendedStatsAggregation(statsMetric, reader);
 		}
 
-		private IAggregationResult GetExtendedStatsAggregation(StatsMetric statsMetric, JsonReader reader)
+		private IAggregate GetExtendedStatsAggregation(StatsAggregate statsMetric, JsonReader reader)
 		{
-			var extendedStatsMetric = new ExtendedStatsMetric()
+			var extendedStatsMetric = new ExtendedStatsAggregate()
 			{
 				Average = statsMetric.Average,
 				Count = statsMetric.Count,
@@ -320,12 +316,12 @@ private IAggregationResult GetExtendedStatsAggregation(StatsMetric statsMetric,
 			return extendedStatsMetric;
 		}
 
-		private IDictionary<string, IAggregationResult> GetNestedAggregations(JsonReader reader, JsonSerializer serializer)
+		private IDictionary<string, IAggregate> GetNestedAggregations(JsonReader reader, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.PropertyName)
 				return null;
 
-			var nestedAggs = new Dictionary<string, IAggregationResult>();
+			var nestedAggs = new Dictionary<string, IAggregate>();
 			var currentDepth = reader.Depth;
 			do
 			{
@@ -340,9 +336,9 @@ private IDictionary<string, IAggregationResult> GetNestedAggregations(JsonReader
 			return nestedAggs;
 		}
 
-		private IAggregationResult GetBucket(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetBucket(JsonReader reader, JsonSerializer serializer)
 		{
-			var bucket = new BucketDto();
+			var bucket = new BucketAggregateData();
 			var property = reader.Value as string;
 			if (property == "doc_count_error_upper_bound")
 			{
@@ -363,7 +359,7 @@ private IAggregationResult GetBucket(JsonReader reader, JsonSerializer serialize
 			if (reader.TokenType == JsonToken.StartObject)
 			{
 				reader.Read();
-				var aggs = new Dictionary<string, IAggregationResult>();
+				var aggs = new Dictionary<string, IAggregate>();
 				do
 				{
 					var name = reader.Value.ToString();
@@ -374,7 +370,7 @@ private IAggregationResult GetBucket(JsonReader reader, JsonSerializer serialize
 				} while (reader.TokenType != JsonToken.EndObject);
 
 				reader.Read();
-				return new FiltersBucket(aggs);
+				return new FiltersAggregate(aggs);
 			}
 
 			if (reader.TokenType != JsonToken.StartArray)
@@ -397,10 +393,10 @@ private IAggregationResult GetBucket(JsonReader reader, JsonSerializer serialize
 			return bucket;
 		}
 
-		private IAggregationResult GetValueMetric(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetValueMetric(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
-			var valueMetric = new ValueMetric()
+			var valueMetric = new ValueAggregate()
 			{
 				Value = (reader.Value as double?)
 			};
@@ -414,7 +410,7 @@ private IAggregationResult GetValueMetric(JsonReader reader, JsonSerializer seri
 				{
 					if (reader.TokenType == JsonToken.PropertyName && (reader.Value as string) == "keys")
 					{
-						var keyedValueMetric = new KeyedValueMetric
+						var keyedValueMetric = new KeyedValueAggregate
 						{
 							Value = valueMetric.Value
 						};
@@ -442,7 +438,7 @@ private IAggregationResult GetValueMetric(JsonReader reader, JsonSerializer seri
 			var scriptedMetric = serializer.Deserialize(reader);
 
 			if (scriptedMetric != null)
-				return new ScriptedValueMetric { _Value = scriptedMetric };
+				return new ScriptedMetricAggregate { _Value = scriptedMetric };
 
 			reader.Read();
 			return valueMetric;
@@ -563,7 +559,7 @@ private IBucketItem GetSignificantTermItem(JsonReader reader, JsonSerializer ser
 			reader.Read();
 			reader.Read();
 			var bgCount = reader.Value as long?;
-			var significantTermItem = new SignificantTermItem()
+			var significantTermItem = new SignificantTermsItem()
 			{
 				Key = keyItem.Key,
 				DocCount = keyItem.DocCount.GetValueOrDefault(0),

src/Nest/Aggregations/Aggregation.cs

@@ -3,6 +3,9 @@
 
 namespace Nest
 {
+	/// <summary>
+	/// Represents an aggregation on the request
+	/// </summary>
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IAggregation 
 	{

src/Nest/Aggregations/AggregationJsonConverter.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	internal class AggregationJsonConverter<TReadAs> : ReadAsTypeJsonConverter<TReadAs>
+		where TReadAs : class
+	{ }
+}