Merge pull request #1706 from elastic/fix/datehistogramitem

Separate types for histogram and date histogram items

Author: Mpdreamz

src/Nest/Aggregations/AggregationJsonConverter.cs

@@ -274,7 +274,7 @@ private IAggregation GetDateHistogramAggregation(JsonReader reader, JsonSerializ
 			var docCount = (reader.Value as long?).GetValueOrDefault(0);
 			reader.Read();
 
-			var dateHistogram = new HistogramItem() { Key = key, KeyAsString = keyAsString, DocCount = docCount };
+			var dateHistogram = new DateHistogramItem() { Key = key, KeyAsString = keyAsString, DocCount = docCount };
 			dateHistogram.Aggregations = this.GetNestedAggregations(reader, serializer);
 			return dateHistogram;
 

src/Nest/Aggregations/AggregationsHelper.cs

@@ -179,12 +179,12 @@ public Bucket<RangeItem> GeoDistance(string key)
 				: new Bucket<RangeItem> {Items = bucket.Items.OfType<RangeItem>().ToList()};
 		}
 
-		public Bucket<HistogramItem> DateHistogram(string key)
+		public Bucket<DateHistogramItem> DateHistogram(string key)
 		{
 			var bucket = this.TryGet<Bucket>(key);
 			return bucket == null 
 				? null 
-				: new Bucket<HistogramItem> {Items = bucket.Items.OfType<HistogramItem>().ToList()};
+				: new Bucket<DateHistogramItem> {Items = bucket.Items.OfType<DateHistogramItem>().ToList()};
 		}
 	}
 }

src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramItem.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	public class DateHistogramItem : HistogramItem
+	{
+		// Get a DateTime form of the returned key
+		public DateTime Date => new DateTime(1970, 1, 1).AddMilliseconds(0 + this.Key);
+	}
+}

src/Nest/Aggregations/Bucket/Histogram/HistogramItem.cs

@@ -10,12 +10,6 @@ public HistogramItem(IDictionary<string, IAggregation> aggregations) : base(aggr
 
 		public long Key { get; set; }
 		public string KeyAsString { get; set; }
-
-		/// <summary>
-		/// Get a DateTime form of the returned key, only make sense on date_histogram aggregations.
-		/// </summary>
-		public DateTime Date => new DateTime(1970, 1, 1).AddMilliseconds(0 + this.Key);
-
 		public long DocCount { get; set; }
 	}
 }

src/Nest/Nest.csproj

@@ -55,6 +55,7 @@
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Aggregations\Bucket\DateHistogram\DateHistogramItem.cs" />
     <Compile Include="Aggregations\Bucket\DocCountBucket.cs" />
     <Compile Include="Aggregations\Bucket\Sampler\SamplerAggregation.cs" />
     <Compile Include="Aggregations\Bucket\Sampler\SamplerAggregationExecutionHint.cs" />

src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: u
+mode: i
 # the elasticsearch version that should be started
 elasticsearch_version: 2.0.1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running