Internalize intermediate bucket object, more sensible base classes

Author: gmarz

src/Nest/Aggregations/AggregationResult.cs

@@ -8,6 +8,6 @@ namespace Nest
 	[ExactContractJsonConverter(typeof(AggregationResultJsonConverter))]
 	public interface IAggregationResult
 	{
-		Dictionary<string, object> Meta { get; set; }
+		IDictionary<string, object> Meta { get; set; }
 	}
 }

src/Nest/Aggregations/AggregationResultJsonConverter.cs

@@ -181,18 +181,17 @@ private IAggregationResult GetSingleBucketAggregation(JsonReader reader, JsonSer
 		{
 			reader.Read();
 			var docCount = (reader.Value as long?).GetValueOrDefault(0);
-			var bucket = new SingleBucket() { DocCount = docCount };
+			var bucket = new SingleBucket { DocCount = docCount };
 			reader.Read();
 			if (reader.TokenType == JsonToken.PropertyName
 				&& ((string)reader.Value) == "buckets"
 				)
 			{
 				var b = this.GetBucketAggregation(reader, serializer) as Bucket;
-				return new DocCountBucket()
+				return new Bucket
 				{
 					DocCount = docCount,
 					Items = b.Items
-
 				};
 			}
 

src/Nest/Aggregations/AggregationsHelper.cs

@@ -89,7 +89,7 @@ public FiltersBucket Filters(string key)
 
 		public DocCountBucket<SignificantTermItem> SignificantTerms(string key)
 		{
-			var bucket = this.TryGet<DocCountBucket>(key);
+			var bucket = this.TryGet<Bucket>(key);
 			return bucket == null
 				? null
 				: new DocCountBucket<SignificantTermItem>

src/Nest/Aggregations/Bucket/Bucket.cs

@@ -3,19 +3,19 @@
 
 namespace Nest
 {
+	public interface IBucketItem { }
+
 	public interface IBucket : IAggregationResult
 	{
 		IDictionary<string, IAggregationResult> Aggregations { get; }
 	}
 
-	public interface IBucketItem { }
-
-	public class Bucket : IAggregationResult
+	public abstract class BucketBase : AggregationsHelper, IBucket
 	{
-		public IEnumerable<IAggregationResult> Items { get; set; }
-		public long? DocCountErrorUpperBound { get; set; }
-		public long? SumOtherDocCount { get; set; }
-		public Dictionary<string, object> Meta { get; set; }
+		protected BucketBase() { }
+		protected BucketBase(IDictionary<string, IAggregationResult> aggregations) : base(aggregations) { }
+
+		public IDictionary<string, object> Meta { get; set; }
 	}
 
 	public class Bucket<TBucketItem> : BucketBase
@@ -27,11 +27,13 @@ public Bucket(IDictionary<string, IAggregationResult> aggregations) : base(aggre
 		public IList<TBucketItem> Items { get; set; }
 	}
 
-	public abstract class BucketBase : AggregationsHelper, IBucket
+	// Intermediate object used for deserialization
+	internal class Bucket : IAggregationResult
 	{
-		protected BucketBase() { }
-		protected BucketBase(IDictionary<string, IAggregationResult> aggregations) : base(aggregations) { }
-
-		public Dictionary<string, object> Meta { get; set; }
+		public IEnumerable<IAggregationResult> Items { get; set; }
+		public long? DocCountErrorUpperBound { get; set; }
+		public long? SumOtherDocCount { get; set; }
+		public IDictionary<string, object> Meta { get; set; }
+		public long DocCount { get; set; }
 	}
 }

src/Nest/Aggregations/Bucket/DocCountBucket.cs

@@ -7,21 +7,12 @@ public interface IDocCountBucket : IBucket
 		long DocCount { get; }
 	}
 
-	public class DocCountBucket<TBucketItem> : BucketBase, IDocCountBucket
+	public class DocCountBucket<TBucketItem> : Bucket<TBucketItem>, IDocCountBucket
 		where TBucketItem : IBucketItem
 	{
 		public DocCountBucket() { }
 		public DocCountBucket(IDictionary<string, IAggregationResult> aggregations) : base(aggregations) { }
 
-		public IList<TBucketItem> Items { get; set; }
-
 		public long DocCount { get; internal set; }
 	}
-
-	public class DocCountBucket : BucketBase, IAggregationResult
-	{
-		public long DocCount { get; set; }
-		public IEnumerable<IAggregationResult> Items { get; set; }
-
-	}
 }

src/Nest/Aggregations/Bucket/KeyedBucket.cs

@@ -2,13 +2,12 @@
 
 namespace Nest
 {
-	public class KeyedBucket : BucketBase, IBucketItem
+	public class KeyedBucket : SingleBucket, IBucketItem
 	{
 		public KeyedBucket() { }
 		public KeyedBucket(IDictionary<string, IAggregationResult> aggregations) : base(aggregations) { }
 
 		public string Key { get; set; }
 		public string KeyAsString { get; set; }
-		public long DocCount { get; set; }
 	}
 }

src/Nest/Aggregations/Bucket/SingleBucket.cs

@@ -3,13 +3,12 @@
 
 namespace Nest
 {
-	public class SingleBucket : BucketBase
+	public class Bucket : BucketBase
 	{
-		public SingleBucket() { }
+		public Bucket() { }
 
-		public SingleBucket(IDictionary<string, IAggregationResult> aggregations) : base(aggregations) { }
+		public Bucket(IDictionary<string, IAggregationResult> aggregations) : base(aggregations) { }
 
-		[JsonProperty("doc_count")]
 		public long DocCount { get; set; }
 	}
 }

src/Nest/Aggregations/Metric/Metric.cs

@@ -9,6 +9,6 @@ public interface IMetric : IAggregationResult
 
 	public abstract class MetricBase : IMetric
 	{
-		public Dictionary<string, object> Meta { get; set; }
+		public IDictionary<string, object> Meta { get; set; }
 	}
 }

src/Nest_Net45/Aggregations/Bucket/SingleBucket.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	public class SingleBucket : BucketBase
+	{
+		public SingleBucket() { }
+
+		public SingleBucket(IDictionary<string, IAggregationResult> aggregations) : base(aggregations) { }
+
+		public long DocCount { get; set; }
+	}
+}