Rename AggregationJsonConverter => AggregationResultJsonConverter

gmarz · gmarz · commit 6eeb88970b36 · 2016-01-28T15:03:59.000-05:00
diff --git a/src/Nest/Aggregations/Aggregation.cs b/src/Nest/Aggregations/Aggregation.cs
@@ -3,11 +3,6 @@
 
 namespace Nest
 {
-	[ExactContractJsonConverter(typeof(AggregationJsonConverter))]
-	public interface IAggregationResult
-	{
-	}
-
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IAggregation 
 	{
diff --git a/src/Nest/Aggregations/AggregationResult.cs b/src/Nest/Aggregations/AggregationResult.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	[ExactContractJsonConverter(typeof(AggregationResultJsonConverter))]
+	public interface IAggregationResult
+	{
+	}
+}
diff --git a/src/Nest/Aggregations/AggregationResultJsonConverter.cs b/src/Nest/Aggregations/AggregationResultJsonConverter.cs
@@ -8,13 +8,13 @@
 
 namespace Nest
 {
-	internal class AggregationJsonConverter<TReadAs> : ReadAsTypeJsonConverter<TReadAs>
+	internal class AggregationResultJsonConverter<TReadAs> : ReadAsTypeJsonConverter<TReadAs>
 		where TReadAs : class
 	{
 
 	}
 
-	internal class AggregationJsonConverter : JsonConverter
+	internal class AggregationResultJsonConverter : JsonConverter
 	{
 		private static Regex _numeric = new Regex(@"^[\d.]+(\.[\d.]+)?$");
 
diff --git a/src/Nest/Aggregations/Bucket/Children/ChildrenAggregation.cs b/src/Nest/Aggregations/Bucket/Children/ChildrenAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<ChildrenAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<ChildrenAggregation>))]
 	public interface IChildrenAggregation : IBucketAggregation
 	{
 		[JsonProperty("type")]
diff --git a/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs b/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs
@@ -6,7 +6,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<DateHistogramAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<DateHistogramAggregation>))]
 	public interface IDateHistogramAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs b/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs
@@ -7,7 +7,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<DateRangeAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<DateRangeAggregation>))]
 	public interface IDateRangeAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/Filters/FiltersAggregation.cs b/src/Nest/Aggregations/Bucket/Filters/FiltersAggregation.cs
@@ -6,7 +6,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<FiltersAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<FiltersAggregation>))]
 	public interface IFiltersAggregation : IBucketAggregation
 	{
 		[JsonProperty("filters")]
diff --git a/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs b/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs
@@ -7,7 +7,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<GeoDistanceAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<GeoDistanceAggregation>))]
 	public interface IGeoDistanceAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregation.cs b/src/Nest/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<GeoHashGridAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<GeoHashGridAggregation>))]
 	public interface IGeoHashGridAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/Global/GlobalAggregation.cs b/src/Nest/Aggregations/Bucket/Global/GlobalAggregation.cs
@@ -4,7 +4,7 @@ namespace Nest
 {
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<GlobalAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<GlobalAggregation>))]
 	public interface IGlobalAggregation : IBucketAggregation { }
 
 	public class GlobalAggregation : BucketAggregationBase, IGlobalAggregation
diff --git a/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs b/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<HistogramAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<HistogramAggregation>))]
 	public interface IHistogramAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs b/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs
@@ -7,7 +7,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<IpRangeAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<IpRangeAggregation>))]
 	public interface IIpRangeAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/Missing/MissingAggregation.cs b/src/Nest/Aggregations/Bucket/Missing/MissingAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<MissingAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<MissingAggregation>))]
 	public interface IMissingAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/Nested/NestedAggregation.cs b/src/Nest/Aggregations/Bucket/Nested/NestedAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<NestedAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<NestedAggregation>))]
 	public interface INestedAggregation : IBucketAggregation
 	{
 		[JsonProperty("path")] 
diff --git a/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs b/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs
@@ -7,7 +7,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<RangeAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<RangeAggregation>))]
 	public interface IRangeAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/ReverseNested/ReverseNestedAggregation.cs b/src/Nest/Aggregations/Bucket/ReverseNested/ReverseNestedAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<ReverseNestedAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<ReverseNestedAggregation>))]
 	public interface IReverseNestedAggregation : IBucketAggregation
 	{
 		[JsonProperty("path")]
diff --git a/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregation.cs b/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<SamplerAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<SamplerAggregation>))]
 	public interface ISamplerAggregation : IBucketAggregation
 	{
 		[JsonProperty("shard_size")]
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregation.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregation.cs
@@ -6,7 +6,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<SignificantTermsAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<SignificantTermsAggregation>))]
 	public interface ISignificantTermsAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsAggregation.cs b/src/Nest/Aggregations/Bucket/Terms/TermsAggregation.cs
@@ -6,7 +6,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<TermsAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<TermsAggregation>))]
 	public interface ITermsAggregation : IBucketAggregation
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Aggregations/Metric/Average/AverageAggregation.cs b/src/Nest/Aggregations/Metric/Average/AverageAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<AverageAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<AverageAggregation>))]
 	public interface IAverageAggregation : IMetricAggregation { }
 
 	public class AverageAggregation : MetricAggregationBase, IAverageAggregation
diff --git a/src/Nest/Aggregations/Metric/Cardinality/CardinalityAggregation.cs b/src/Nest/Aggregations/Metric/Cardinality/CardinalityAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<CardinalityAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<CardinalityAggregation>))]
 	public interface ICardinalityAggregation : IMetricAggregation
 	{
 		[JsonProperty("precision_threshold")]
diff --git a/src/Nest/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregation.cs b/src/Nest/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<ExtendedStatsAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<ExtendedStatsAggregation>))]
 	public interface IExtendedStatsAggregation : IMetricAggregation { }
 
 	public class ExtendedStatsAggregation : MetricAggregationBase, IExtendedStatsAggregation
diff --git a/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregation.cs b/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<GeoBoundsAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<GeoBoundsAggregation>))]
 	public interface IGeoBoundsAggregation : IMetricAggregation
 	{
 		[JsonProperty("wrap_longitude")]
diff --git a/src/Nest/Aggregations/Metric/Max/MaxAggregation.cs b/src/Nest/Aggregations/Metric/Max/MaxAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<MaxAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<MaxAggregation>))]
 	public interface IMaxAggregation : IMetricAggregation { }
 
 	public class MaxAggregation : MetricAggregationBase, IMaxAggregation
diff --git a/src/Nest/Aggregations/Metric/Min/MinAggregation.cs b/src/Nest/Aggregations/Metric/Min/MinAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<MinAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<MinAggregation>))]
 	public interface IMinAggregation : IMetricAggregation { }
 
 	public class MinAggregation : MetricAggregationBase, IMinAggregation
diff --git a/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregation.cs b/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<ScriptedMetricAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<ScriptedMetricAggregation>))]
 	public interface IScriptedMetricAggregation : IMetricAggregation
 	{
 		[JsonProperty("init_script")]
diff --git a/src/Nest/Aggregations/Metric/Stats/StatsAggregation.cs b/src/Nest/Aggregations/Metric/Stats/StatsAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<StatsAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<StatsAggregation>))]
 	public interface IStatsAggregator : IMetricAggregation { }
 
 	public class StatsAggregation : MetricAggregationBase, IStatsAggregator
diff --git a/src/Nest/Aggregations/Metric/Sum/SumAggregation.cs b/src/Nest/Aggregations/Metric/Sum/SumAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<SumAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<SumAggregation>))]
 	public interface ISumAggregation : IMetricAggregation { }
 
 	public class SumAggregation : MetricAggregationBase, ISumAggregation
diff --git a/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregation.cs b/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregation.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<TopHitsAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<TopHitsAggregation>))]
 	public interface ITopHitsAggregation : IMetricAggregation
 	{
 		[JsonProperty("from")]
diff --git a/src/Nest/Aggregations/Metric/ValueCount/ValueCountAggregation.cs b/src/Nest/Aggregations/Metric/ValueCount/ValueCountAggregation.cs
@@ -4,7 +4,7 @@ namespace Nest
 {
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<ValueCountAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<ValueCountAggregation>))]
 	public interface IValueCountAggregation : IMetricAggregation { }
 
 	public class ValueCountAggregation : MetricAggregationBase, IValueCountAggregation
diff --git a/src/Nest/Aggregations/Pipeline/AverageBucket/AverageBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/AverageBucket/AverageBucketAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<AverageBucketAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<AverageBucketAggregation>))]
 	public interface IAverageBucketAggregation : IPipelineAggregation { }
 
 	public class AverageBucketAggregation
diff --git a/src/Nest/Aggregations/Pipeline/BucketScript/BucketScriptAggregation.cs b/src/Nest/Aggregations/Pipeline/BucketScript/BucketScriptAggregation.cs
@@ -4,7 +4,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<BucketScriptAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<BucketScriptAggregation>))]
 	public interface IBucketScriptAggregation : IPipelineAggregation
 	{
 		[JsonProperty("script")]
diff --git a/src/Nest/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregation.cs b/src/Nest/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregation.cs
@@ -4,7 +4,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<BucketSelectorAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<BucketSelectorAggregation>))]
 	public interface IBucketSelectorAggregation : IPipelineAggregation
 	{
 		[JsonProperty("script")]
diff --git a/src/Nest/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregation.cs b/src/Nest/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<CumulativeSumAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<CumulativeSumAggregation>))]
 	public interface ICumulativeSumAggregation : IPipelineAggregation { }
 
 	public class CumulativeSumAggregation
diff --git a/src/Nest/Aggregations/Pipeline/Derivative/DerivativeAggregation.cs b/src/Nest/Aggregations/Pipeline/Derivative/DerivativeAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<DerivativeAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<DerivativeAggregation>))]
 	public interface IDerivativeAggregation : IPipelineAggregation { }
 
 	public class DerivativeAggregation : PipelineAggregationBase, IDerivativeAggregation
diff --git a/src/Nest/Aggregations/Pipeline/MaxBucket/MaxBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/MaxBucket/MaxBucketAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<MaxBucketAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<MaxBucketAggregation>))]
 	public interface IMaxBucketAggregation : IPipelineAggregation { }
 
 	public class MaxBucketAggregation
diff --git a/src/Nest/Aggregations/Pipeline/MinBucket/MinBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/MinBucket/MinBucketAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<MinBucketAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<MinBucketAggregation>))]
 	public interface IMinBucketAggregation : IPipelineAggregation { }
 
 	public class MinBucketAggregation
diff --git a/src/Nest/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregation.cs b/src/Nest/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<SerialDifferencingAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<SerialDifferencingAggregation>))]
 	public interface ISerialDifferencingAggregation : IPipelineAggregation
 	{
 		[JsonProperty("lag")]
diff --git a/src/Nest/Aggregations/Pipeline/SumBucket/SumBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/SumBucket/SumBucketAggregation.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[ContractJsonConverter(typeof(AggregationJsonConverter<SumBucketAggregation>))]
+	[ContractJsonConverter(typeof(AggregationResultJsonConverter<SumBucketAggregation>))]
 	public interface ISumBucketAggregation : IPipelineAggregation { }
 
 	public class SumBucketAggregation

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,6 @@`
`3`	`3`
`4`	`4`	`namespace Nest`
`5`	`5`	`{`
`6`		`- [ExactContractJsonConverter(typeof(AggregationJsonConverter))]`
`7`		`- public interface IAggregationResult`
`8`		`- {`
`9`		`- }`
`10`		`-`
`11`	`6`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`12`	`7`	`public interface IAggregation`
`13`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@`
`8`	`8`
`9`	`9`	`namespace Nest`
`10`	`10`	`{`
`11`		`- internal class AggregationJsonConverter<TReadAs> : ReadAsTypeJsonConverter<TReadAs>`
	`11`	`+ internal class AggregationResultJsonConverter<TReadAs> : ReadAsTypeJsonConverter<TReadAs>`
`12`	`12`	`where TReadAs : class`
`13`	`13`	`{`
`14`	`14`
`15`	`15`	`}`
`16`	`16`
`17`		`- internal class AggregationJsonConverter : JsonConverter`
	`17`	`+ internal class AggregationResultJsonConverter : JsonConverter`
`18`	`18`	`{`
`19`	`19`	`private static Regex _numeric = new Regex(@"^[\d.]+(\.[\d.]+)?$");`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Nest`
`6`	`6`	`{`
`7`	`7`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`8`		`- [ContractJsonConverter(typeof(AggregationJsonConverter<ChildrenAggregation>))]`
	`8`	`+ [ContractJsonConverter(typeof(AggregationResultJsonConverter<ChildrenAggregation>))]`
`9`	`9`	`public interface IChildrenAggregation : IBucketAggregation`
`10`	`10`	`{`
`11`	`11`	`[JsonProperty("type")]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace Nest`
`7`	`7`	`{`
`8`	`8`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`9`		`- [ContractJsonConverter(typeof(AggregationJsonConverter<DateHistogramAggregation>))]`
	`9`	`+ [ContractJsonConverter(typeof(AggregationResultJsonConverter<DateHistogramAggregation>))]`
`10`	`10`	`public interface IDateHistogramAggregation : IBucketAggregation`
`11`	`11`	`{`
`12`	`12`	`[JsonProperty("field")]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace Nest`
`8`	`8`	`{`
`9`	`9`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`10`		`- [ContractJsonConverter(typeof(AggregationJsonConverter<DateRangeAggregation>))]`
	`10`	`+ [ContractJsonConverter(typeof(AggregationResultJsonConverter<DateRangeAggregation>))]`
`11`	`11`	`public interface IDateRangeAggregation : IBucketAggregation`
`12`	`12`	`{`
`13`	`13`	`[JsonProperty("field")]`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace Nest`
`4`	`4`	`{`
`5`	`5`
`6`	`6`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`7`		`- [ContractJsonConverter(typeof(AggregationJsonConverter<GlobalAggregation>))]`
	`7`	`+ [ContractJsonConverter(typeof(AggregationResultJsonConverter<GlobalAggregation>))]`
`8`	`8`	`public interface IGlobalAggregation : IBucketAggregation { }`
`9`	`9`
`10`	`10`	`public class GlobalAggregation : BucketAggregationBase, IGlobalAggregation`