Rename IBucketItem => IBucket

Author: gmarz

src/Nest/Aggregations/AggregateJsonConverter.cs

@@ -81,7 +81,7 @@ private IAggregate ReadAggregation(JsonReader reader, JsonSerializer serializer)
 			return result;
 		}
 
-		private IBucketItem ReadBucketItem(JsonReader reader, JsonSerializer serializer)
+		private IBucket ReadBucketItem(JsonReader reader, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject)
 				return null;
@@ -90,7 +90,7 @@ private IBucketItem ReadBucketItem(JsonReader reader, JsonSerializer serializer)
 			if (reader.TokenType != JsonToken.PropertyName)
 				return null;
 
-			IBucketItem item = null;
+			IBucket item = null;
 
 			var property = reader.Value as string;
 
@@ -356,7 +356,7 @@ private IAggregate GetBucket(JsonReader reader, JsonSerializer serializer)
 				bucket.SumOtherDocCount = reader.Value as long?;
 				reader.Read();
 			}
-			var items = new List<IBucketItem>();
+			var items = new List<IBucket>();
 			reader.Read();
 
 			if (reader.TokenType == JsonToken.StartObject)
@@ -382,7 +382,7 @@ private IAggregate GetBucket(JsonReader reader, JsonSerializer serializer)
 			if (reader.TokenType == JsonToken.EndArray)
 			{
 				reader.Read();
-				bucket.Items = Enumerable.Empty<IBucketItem>();
+				bucket.Items = Enumerable.Empty<IBucket>();
 				return bucket;
 			}
 			do
@@ -447,7 +447,7 @@ private IAggregate GetValueMetric(JsonReader reader, JsonSerializer serializer)
 			return valueMetric;
 		}
 
-		public IBucketItem GetRangeItem(JsonReader reader, JsonSerializer serializer, string key = null)
+		public IBucket GetRangeItem(JsonReader reader, JsonSerializer serializer, string key = null)
 		{
 			string fromAsString = null, toAsString = null;
 			long? docCount = null;
@@ -493,7 +493,7 @@ public IBucketItem GetRangeItem(JsonReader reader, JsonSerializer serializer, st
 				}
 			}
 
-			var bucket = new RangeItem
+			var bucket = new RangeBucket
 			{
 				Key = key,
 				From = fromDouble,
@@ -507,7 +507,7 @@ public IBucketItem GetRangeItem(JsonReader reader, JsonSerializer serializer, st
 			return bucket;
 		}
 
-		private IBucketItem GetDateHistrogramItem(JsonReader reader, JsonSerializer serializer)
+		private IBucket GetDateHistrogramItem(JsonReader reader, JsonSerializer serializer)
 		{
 			var keyAsString = reader.ReadAsString();
 			reader.Read(); reader.Read();
@@ -516,21 +516,21 @@ private IBucketItem GetDateHistrogramItem(JsonReader reader, JsonSerializer seri
 			var docCount = (reader.Value as long?).GetValueOrDefault(0);
 			reader.Read();
 
-			var dateHistogram = new DateHistogramItem() { Key = key, KeyAsString = keyAsString, DocCount = docCount };
+			var dateHistogram = new DateHistogramBucket() { Key = key, KeyAsString = keyAsString, DocCount = docCount };
 			dateHistogram.Aggregations = this.GetNestedAggregations(reader, serializer);
 			return dateHistogram;
 
 		}
 
-		private IBucketItem GetKeyedBucketItem(JsonReader reader, JsonSerializer serializer)
+		private IBucket GetKeyedBucketItem(JsonReader reader, JsonSerializer serializer)
 		{
 			var key = reader.ReadAsString();
 			reader.Read();
 			var property = reader.Value as string;
 			if (property == "from" || property == "to")
 				return GetRangeItem(reader, serializer, key);
 
-			var keyItem = new KeyedBucketItem {Key = key};
+			var keyItem = new KeyedBucket {Key = key};
 
 			if (property == "key_as_string")
 			{
@@ -555,14 +555,14 @@ private IBucketItem GetKeyedBucketItem(JsonReader reader, JsonSerializer seriali
 
 		}
 
-		private IBucketItem GetSignificantTermItem(JsonReader reader, JsonSerializer serializer, KeyedBucketItem keyItem)
+		private IBucket GetSignificantTermItem(JsonReader reader, JsonSerializer serializer, KeyedBucket keyItem)
 		{
 			reader.Read();
 			var score = reader.Value as double?;
 			reader.Read();
 			reader.Read();
 			var bgCount = reader.Value as long?;
-			var significantTermItem = new SignificantTermsItem()
+			var significantTermItem = new SignificantTermsBucket()
 			{
 				Key = keyItem.Key,
 				DocCount = keyItem.DocCount.GetValueOrDefault(0),
@@ -574,7 +574,7 @@ private IBucketItem GetSignificantTermItem(JsonReader reader, JsonSerializer ser
 			return significantTermItem;
 		}
 
-		private IBucketItem GetFiltersBucketItem(JsonReader reader, JsonSerializer serializer)
+		private IBucket GetFiltersBucketItem(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var filtersBucketItem = new FiltersBucketItem

src/Nest/Aggregations/AggregationsHelper.cs

@@ -97,7 +97,7 @@ public SignificantTermsAggregate SignificantTerms(string key)
 				: new SignificantTermsAggregate
 				{
 					DocCount = bucket.DocCount,
-					Buckets = bucket.Items.OfType<SignificantTermsItem>().ToList(),
+					Buckets = bucket.Items.OfType<SignificantTermsBucket>().ToList(),
 					Meta = bucket.Meta
 				};
 		}
@@ -111,22 +111,22 @@ public TermsAggregate Terms(string key)
 				{
 					DocCountErrorUpperBound = bucket.DocCountErrorUpperBound,
 					SumOtherDocCount = bucket.SumOtherDocCount,
-					Buckets = bucket.Items.OfType<KeyedBucketItem>().ToList(),
+					Buckets = bucket.Items.OfType<KeyedBucket>().ToList(),
 					Meta = bucket.Meta
 				};
 		}
 
-		public MultiBucketAggregate<HistogramItem> Histogram(string key)
+		public MultiBucketAggregate<HistogramBucket> Histogram(string key)
 		{
 			var bucket = this.TryGet<BucketAggregate>(key);
 			return bucket == null
 				? null
-				: new MultiBucketAggregate<HistogramItem>
+				: new MultiBucketAggregate<HistogramBucket>
 				{
-					Buckets = bucket.Items.OfType<HistogramItem>()
-						.Concat(bucket.Items.OfType<KeyedBucketItem>()
+					Buckets = bucket.Items.OfType<HistogramBucket>()
+						.Concat(bucket.Items.OfType<KeyedBucket>()
 							.Select(x =>
-								new HistogramItem
+								new HistogramBucket
 								{
 									Key = long.Parse(x.Key),
 									KeyAsString = x.Key,
@@ -140,17 +140,17 @@ public MultiBucketAggregate<HistogramItem> Histogram(string key)
 				};
 		}
 
-		public MultiBucketAggregate<KeyedBucketItem> GeoHash(string key) => GetBucket<KeyedBucketItem>(key);
+		public MultiBucketAggregate<KeyedBucket> GeoHash(string key) => GetBucket<KeyedBucket>(key);
 
-		public MultiBucketAggregate<RangeItem> Range(string key) => GetBucket<RangeItem>(key);
+		public MultiBucketAggregate<RangeBucket> Range(string key) => GetBucket<RangeBucket>(key);
 
-		public MultiBucketAggregate<RangeItem> DateRange(string key) => GetBucket<RangeItem>(key);
+		public MultiBucketAggregate<RangeBucket> DateRange(string key) => GetBucket<RangeBucket>(key);
 
-		public MultiBucketAggregate<RangeItem> IpRange(string key) => GetBucket<RangeItem>(key);
+		public MultiBucketAggregate<RangeBucket> IpRange(string key) => GetBucket<RangeBucket>(key);
 
-		public MultiBucketAggregate<RangeItem> GeoDistance(string key) => GetBucket<RangeItem>(key);
+		public MultiBucketAggregate<RangeBucket> GeoDistance(string key) => GetBucket<RangeBucket>(key);
 
-		public MultiBucketAggregate<DateHistogramItem> DateHistogram(string key) => GetBucket<DateHistogramItem>(key);
+		public MultiBucketAggregate<DateHistogramBucket> DateHistogram(string key) => GetBucket<DateHistogramBucket>(key);
 
 		private TAggregation TryGet<TAggregation>(string key)
 			where TAggregation : class, IAggregate
@@ -159,14 +159,14 @@ private TAggregation TryGet<TAggregation>(string key)
 			return this.Aggregations.TryGetValue(key, out agg) ? agg as TAggregation : null;
 		}
 
-		private MultiBucketAggregate<TBucketItem> GetBucket<TBucketItem>(string key)
-			where TBucketItem : IBucketItem
+		private MultiBucketAggregate<TBucket> GetBucket<TBucket>(string key)
+			where TBucket : IBucket
 		{
 			var bucket = this.TryGet<BucketAggregate>(key);
 			if (bucket == null) return null;
-			return new MultiBucketAggregate<TBucketItem>
+			return new MultiBucketAggregate<TBucket>
 			{
-				Buckets = bucket.Items.OfType<TBucketItem>().ToList(),
+				Buckets = bucket.Items.OfType<TBucket>().ToList(),
 				Meta = bucket.Meta
 			};
 		}

src/Nest/Aggregations/Bucket/Bucket.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	public interface IBucket { }
+
+	public abstract class BucketBase : AggregationsHelper, IBucket
+	{
+		protected BucketBase() { }
+		protected BucketBase(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }
+	}
+}

src/Nest/Aggregations/Bucket/BucketAggregate.cs

@@ -11,13 +11,13 @@ protected BucketAggregateBase(IDictionary<string, IAggregate> aggregations) : ba
 		public IDictionary<string, object> Meta { get; set; }
 	}
 
-	public class MultiBucketAggregate<TBucketItem> : BucketAggregateBase
-		where TBucketItem : IBucketItem
+	public class MultiBucketAggregate<TBucket> : BucketAggregateBase
+		where TBucket : IBucket
 	{
 		public MultiBucketAggregate() { }
 		public MultiBucketAggregate(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }
 
-		public IList<TBucketItem> Buckets { get; set; }
+		public IList<TBucket> Buckets { get; set; }
 	}
 
 	public class SingleBucketAggregate : BucketAggregateBase
@@ -31,7 +31,7 @@ public SingleBucketAggregate(IDictionary<string, IAggregate> aggregations) : bas
 	// Intermediate object used for deserialization
 	public class BucketAggregate : IAggregate
 	{
-		public IEnumerable<IBucketItem> Items { get; set; }
+		public IEnumerable<IBucket> Items { get; set; }
 		public long? DocCountErrorUpperBound { get; set; }
 		public long? SumOtherDocCount { get; set; }
 		public IDictionary<string, object> Meta { get; set; }

src/Nest/Aggregations/Bucket/BucketItem.cs

@@ -6,7 +6,7 @@
 
 namespace Nest
 {
-	public class DateHistogramItem : HistogramItem
+	public class DateHistogramBucket : HistogramBucket
 	{
 		// Get a DateTime form of the returned key
 		public DateTime Date => new DateTime(1970, 1, 1).AddMilliseconds(0 + this.Key);

src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramItem.cs renamed to src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramBucket.cs

@@ -4,7 +4,7 @@
 
 namespace Nest
 {
-	public class FiltersBucketItem : BucketItemBase
+	public class FiltersBucketItem : BucketBase
 	{
 		public FiltersBucketItem() { }
 		public FiltersBucketItem(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }

src/Nest/Aggregations/Bucket/Filters/FiltersAggregate.cs

@@ -3,10 +3,10 @@
 
 namespace Nest
 {
-	public class HistogramItem : BucketItemBase, IBucketItem
+	public class HistogramBucket : BucketBase, IBucket
 	{
-		public HistogramItem() { }
-		public HistogramItem(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }
+		public HistogramBucket() { }
+		public HistogramBucket(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }
 
 		public long Key { get; set; }
 		public string KeyAsString { get; set; }

src/Nest/Aggregations/Bucket/Histogram/HistogramItem.cs renamed to src/Nest/Aggregations/Bucket/Histogram/HistogramBucket.cs

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

src/Nest/Aggregations/Bucket/KeyedBucket.cs

@@ -2,10 +2,10 @@
 
 namespace Nest
 {
-	public class RangeItem : BucketItemBase, IBucketItem
+	public class RangeBucket : BucketBase, IBucket
 	{
-		public RangeItem() { }
-		public RangeItem(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }
+		public RangeBucket() { }
+		public RangeBucket(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }
 
 		public string Key { get; set; }
 		public double? From { get; set; }