Rename BucketAggregateData => BucketAggregate, and make public again

Author: gmarz

src/Nest/Aggregations/AggregateJsonConverter.cs

@@ -211,8 +211,8 @@ private IAggregate GetDocCountBucket(JsonReader reader, JsonSerializer serialize
 			reader.Read();
 			if (reader.TokenType == JsonToken.PropertyName && (string)reader.Value == "buckets")
 			{
-				var b = this.GetBucket(reader, serializer) as BucketAggregateData;
-				return new BucketAggregateData
+				var b = this.GetBucket(reader, serializer) as BucketAggregate;
+				return new BucketAggregate
 				{
 					DocCount = docCount,
 					Items = b.Items
@@ -341,7 +341,7 @@ private IDictionary<string, IAggregate> GetNestedAggregations(JsonReader reader,
 
 		private IAggregate GetBucket(JsonReader reader, JsonSerializer serializer)
 		{
-			var bucket = new BucketAggregateData();
+			var bucket = new BucketAggregate();
 			var property = reader.Value as string;
 			if (property == "doc_count_error_upper_bound")
 			{

src/Nest/Aggregations/AggregationsHelper.cs

@@ -69,7 +69,7 @@ public FiltersAggregate Filters(string key)
 			if (named != null)
 				return named;
 
-			var anonymous = this.TryGet<BucketAggregateData>(key);
+			var anonymous = this.TryGet<BucketAggregate>(key);
 			return anonymous != null 
 				? new FiltersAggregate { Buckets = anonymous.Items.OfType<FiltersBucketItem>().ToList(), Meta = anonymous.Meta } 
 				: null;
@@ -91,7 +91,7 @@ public FiltersAggregate Filters(string key)
 
 		public SignificantTermsAggregate SignificantTerms(string key)
 		{
-			var bucket = this.TryGet<BucketAggregateData>(key);
+			var bucket = this.TryGet<BucketAggregate>(key);
 			return bucket == null
 				? null
 				: new SignificantTermsAggregate
@@ -104,7 +104,7 @@ public SignificantTermsAggregate SignificantTerms(string key)
 
 		public TermsAggregate Terms(string key)
 		{
-			var bucket = this.TryGet<BucketAggregateData>(key);
+			var bucket = this.TryGet<BucketAggregate>(key);
 			return bucket == null
 				? null
 				: new TermsAggregate
@@ -118,7 +118,7 @@ public TermsAggregate Terms(string key)
 
 		public MultiBucketAggregate<HistogramItem> Histogram(string key)
 		{
-			var bucket = this.TryGet<BucketAggregateData>(key);
+			var bucket = this.TryGet<BucketAggregate>(key);
 			return bucket == null
 				? null
 				: new MultiBucketAggregate<HistogramItem>
@@ -162,7 +162,7 @@ private TAggregation TryGet<TAggregation>(string key)
 		private MultiBucketAggregate<TBucketItem> GetBucket<TBucketItem>(string key)
 			where TBucketItem : IBucketItem
 		{
-			var bucket = this.TryGet<BucketAggregateData>(key);
+			var bucket = this.TryGet<BucketAggregate>(key);
 			if (bucket == null) return null;
 			return new MultiBucketAggregate<TBucketItem>
 			{

src/Nest/Aggregations/Bucket/BucketAggregate.cs

@@ -29,8 +29,7 @@ public SingleBucketAggregate(IDictionary<string, IAggregate> aggregations) : bas
 	}
 
 	// Intermediate object used for deserialization
-	// TODO we should get rid of this and refactor AggregateJsonConverter
-	internal class BucketAggregateData : IAggregate
+	public class BucketAggregate : IAggregate
 	{
 		public IEnumerable<IBucketItem> Items { get; set; }
 		public long? DocCountErrorUpperBound { get; set; }