Merge branch 'fix/master-remove-idictionary'

Author: russcam

src/Nest/Aggregations/AggregationContainer.cs

@@ -5,10 +5,10 @@
 
 namespace Nest
 {
-	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))]
+	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, IAggregationContainer>))]
 	public class AggregationDictionary : IsADictionaryBase<string, IAggregationContainer>
 	{
-		public AggregationDictionary() : base() { }
+		public AggregationDictionary() {}
 		public AggregationDictionary(IDictionary<string, IAggregationContainer> container) : base(container) { }
 		public AggregationDictionary(Dictionary<string, AggregationContainer> container)
 			: base(container.ToDictionary(kv => kv.Key, kv => (IAggregationContainer)kv.Value))
@@ -50,7 +50,7 @@ public static implicit operator AggregationDictionary(AggregationBase aggregator
 	public interface IAggregationContainer
 	{
 		[JsonProperty("meta")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		IDictionary<string, object> Meta { get; set; }
 
 		[JsonProperty("avg")]
@@ -153,17 +153,17 @@ public interface IAggregationContainer
 		IMinBucketAggregation MinBucket { get; set; }
 
 		[JsonProperty("sum_bucket")]
-		ISumBucketAggregation SumBucket { get; set; }
-
-		[JsonProperty("stats_bucket")]
-		IStatsBucketAggregation StatsBucket { get; set; }
-
-		[JsonProperty("extended_stats_bucket")]
-		IExtendedStatsBucketAggregation ExtendedStatsBucket { get; set; }
-
-		[JsonProperty("percentiles_bucket")]
-		IPercentilesBucketAggregation PercentilesBucket { get; set; }
-
+		ISumBucketAggregation SumBucket { get; set; }
+
+		[JsonProperty("stats_bucket")]
+		IStatsBucketAggregation StatsBucket { get; set; }
+
+		[JsonProperty("extended_stats_bucket")]
+		IExtendedStatsBucketAggregation ExtendedStatsBucket { get; set; }
+
+		[JsonProperty("percentiles_bucket")]
+		IPercentilesBucketAggregation PercentilesBucket { get; set; }
+
 		[JsonProperty("moving_avg")]
 		IMovingAverageAggregation MovingAverage { get; set; }
 
@@ -180,8 +180,8 @@ public interface IAggregationContainer
 		IBucketSelectorAggregation BucketSelector { get; set; }
 
 		[JsonProperty("sampler")]
-		ISamplerAggregation Sampler { get; set; }
-
+		ISamplerAggregation Sampler { get; set; }
+
 		[JsonProperty("geo_centroid")]
 		IGeoCentroidAggregation GeoCentroid { get; set; }
 
@@ -256,14 +256,14 @@ public class AggregationContainer : IAggregationContainer
 
 		public IMinBucketAggregation MinBucket { get; set; }
 
-		public ISumBucketAggregation SumBucket { get; set; }
-
-		public IStatsBucketAggregation StatsBucket { get; set; }
-
-		public IExtendedStatsBucketAggregation ExtendedStatsBucket { get; set; }
-
-		public IPercentilesBucketAggregation PercentilesBucket { get; set; }
-
+		public ISumBucketAggregation SumBucket { get; set; }
+
+		public IStatsBucketAggregation StatsBucket { get; set; }
+
+		public IExtendedStatsBucketAggregation ExtendedStatsBucket { get; set; }
+
+		public IPercentilesBucketAggregation PercentilesBucket { get; set; }
+
 		public IMovingAverageAggregation MovingAverage { get; set; }
 
 		public ICumulativeSumAggregation CumulativeSum { get; set; }
@@ -274,8 +274,8 @@ public class AggregationContainer : IAggregationContainer
 
 		public IBucketSelectorAggregation BucketSelector { get; set; }
 
-		public ISamplerAggregation Sampler { get; set; }
-
+		public ISamplerAggregation Sampler { get; set; }
+
 		public IGeoCentroidAggregation GeoCentroid { get; set; }
 
 		public IMatrixStatsAggregation MatrixStats { get; set; }
@@ -373,14 +373,14 @@ public class AggregationContainerDescriptor<T> : DescriptorBase<AggregationConta
 
 		IMinBucketAggregation IAggregationContainer.MinBucket { get; set; }
 
-		ISumBucketAggregation IAggregationContainer.SumBucket { get; set; }
-
-		IStatsBucketAggregation IAggregationContainer.StatsBucket { get; set; }
-
-		IExtendedStatsBucketAggregation IAggregationContainer.ExtendedStatsBucket { get; set; }
-
-		IPercentilesBucketAggregation IAggregationContainer.PercentilesBucket { get; set; }
-
+		ISumBucketAggregation IAggregationContainer.SumBucket { get; set; }
+
+		IStatsBucketAggregation IAggregationContainer.StatsBucket { get; set; }
+
+		IExtendedStatsBucketAggregation IAggregationContainer.ExtendedStatsBucket { get; set; }
+
+		IPercentilesBucketAggregation IAggregationContainer.PercentilesBucket { get; set; }
+
 		IMovingAverageAggregation IAggregationContainer.MovingAverage { get; set; }
 
 		ICumulativeSumAggregation IAggregationContainer.CumulativeSum { get; set; }
@@ -391,7 +391,7 @@ public class AggregationContainerDescriptor<T> : DescriptorBase<AggregationConta
 
 		IBucketSelectorAggregation IAggregationContainer.BucketSelector { get; set; }
 
-		ISamplerAggregation IAggregationContainer.Sampler { get; set; }
+		ISamplerAggregation IAggregationContainer.Sampler { get; set; }
 
 		IGeoCentroidAggregation IAggregationContainer.GeoCentroid { get; set; }
 
@@ -531,20 +531,20 @@ public AggregationContainerDescriptor<T> MinBucket(string name,
 
 		public AggregationContainerDescriptor<T> SumBucket(string name,
 			Func<SumBucketAggregationDescriptor, ISumBucketAggregation> selector) =>
-			_SetInnerAggregation(name, selector, (a, d) => a.SumBucket = d);
-
-		public AggregationContainerDescriptor<T> StatsBucket(string name,
-			Func<StatsBucketAggregationDescriptor, IStatsBucketAggregation> selector) =>
-			_SetInnerAggregation(name, selector, (a, d) => a.StatsBucket = d);
-
-		public AggregationContainerDescriptor<T> ExtendedStatsBucket(string name,
-			Func<ExtendedStatsBucketAggregationDescriptor, IExtendedStatsBucketAggregation> selector) =>
-			_SetInnerAggregation(name, selector, (a, d) => a.ExtendedStatsBucket = d);
-
-		public AggregationContainerDescriptor<T> PercentilesBucket(string name,
-			Func<PercentilesBucketAggregationDescriptor, IPercentilesBucketAggregation> selector) =>
-			_SetInnerAggregation(name, selector, (a, d) => a.PercentilesBucket = d);
-
+			_SetInnerAggregation(name, selector, (a, d) => a.SumBucket = d);
+
+		public AggregationContainerDescriptor<T> StatsBucket(string name,
+			Func<StatsBucketAggregationDescriptor, IStatsBucketAggregation> selector) =>
+			_SetInnerAggregation(name, selector, (a, d) => a.StatsBucket = d);
+
+		public AggregationContainerDescriptor<T> ExtendedStatsBucket(string name,
+			Func<ExtendedStatsBucketAggregationDescriptor, IExtendedStatsBucketAggregation> selector) =>
+			_SetInnerAggregation(name, selector, (a, d) => a.ExtendedStatsBucket = d);
+
+		public AggregationContainerDescriptor<T> PercentilesBucket(string name,
+			Func<PercentilesBucketAggregationDescriptor, IPercentilesBucketAggregation> selector) =>
+			_SetInnerAggregation(name, selector, (a, d) => a.PercentilesBucket = d);
+
 		public AggregationContainerDescriptor<T> MovingAverage(string name,
 			Func<MovingAverageAggregationDescriptor, IMovingAverageAggregation> selector) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.MovingAverage = d);
@@ -567,16 +567,16 @@ public AggregationContainerDescriptor<T> BucketSelector(string name,
 
 		public AggregationContainerDescriptor<T> Sampler(string name,
 			Func<SamplerAggregationDescriptor<T>, ISamplerAggregation> selector) =>
-			_SetInnerAggregation(name, selector, (a, d) => a.Sampler = d);
-
-		public AggregationContainerDescriptor<T> GeoCentroid(string name,
-			Func<GeoCentroidAggregationDescriptor<T>, IGeoCentroidAggregation> selector) =>
-			_SetInnerAggregation(name, selector, (a, d) => a.GeoCentroid = d);
-
-		public AggregationContainerDescriptor<T> MatrixStats(string name,
-			Func<MatrixStatsAggregationDescriptor<T>, IMatrixStatsAggregation> selector) =>
-			_SetInnerAggregation(name, selector, (a, d) => a.MatrixStats = d);
-
+			_SetInnerAggregation(name, selector, (a, d) => a.Sampler = d);
+
+		public AggregationContainerDescriptor<T> GeoCentroid(string name,
+			Func<GeoCentroidAggregationDescriptor<T>, IGeoCentroidAggregation> selector) =>
+			_SetInnerAggregation(name, selector, (a, d) => a.GeoCentroid = d);
+
+		public AggregationContainerDescriptor<T> MatrixStats(string name,
+			Func<MatrixStatsAggregationDescriptor<T>, IMatrixStatsAggregation> selector) =>
+			_SetInnerAggregation(name, selector, (a, d) => a.MatrixStats = d);
+
 		/// <summary>
 		/// Fluent methods do not assign to properties on `this` directly but on IAggregationContainers inside `this.Aggregations[string, IContainer]
 		/// </summary>
@@ -588,27 +588,27 @@ Func<TAggregator, TAggregatorInterface> selector
 			where TAggregator : IAggregation, TAggregatorInterface, new()
 			where TAggregatorInterface : IAggregation
 		{
-			var aggregator = selector(new TAggregator());
-
-			//create new isolated container for new aggregator and assign to the right property
+			var aggregator = selector(new TAggregator());
+
+			//create new isolated container for new aggregator and assign to the right property
 			var container = new AggregationContainer() { Meta = aggregator.Meta };
 
-			assignToProperty(container, aggregator);
-
-			//create aggregations dictionary on `this` if it does not exist already
+			assignToProperty(container, aggregator);
+
+			//create aggregations dictionary on `this` if it does not exist already
 			IAggregationContainer self = this;
-			if (self.Aggregations == null) self.Aggregations = new Dictionary<string, IAggregationContainer>();
-
-			//if the aggregator is a bucket aggregator (meaning it contains nested aggregations);
+			if (self.Aggregations == null) self.Aggregations = new Dictionary<string, IAggregationContainer>();
+
+			//if the aggregator is a bucket aggregator (meaning it contains nested aggregations);
 			var bucket = aggregator as IBucketAggregation;
 			if (bucket != null && bucket.Aggregations.HasAny())
-			{
-				//make sure we copy those aggregations to the isolated container's
-				//own .Aggregations container (the one that gets serialized to "aggs")
+			{
+				//make sure we copy those aggregations to the isolated container's
+				//own .Aggregations container (the one that gets serialized to "aggs")
 				IAggregationContainer d = container;
 				d.Aggregations = bucket.Aggregations;
-			}
-			//assign the aggregations container under Aggregations ("aggs" in the json)
+			}
+			//assign the aggregations container under Aggregations ("aggs" in the json)
 			self.Aggregations[key] = container;
 			return this;
 		}
@@ -618,31 +618,31 @@ public void Accept(IAggregationVisitor visitor)
 			if (visitor.Scope == AggregationVisitorScope.Unknown) visitor.Scope = AggregationVisitorScope.Aggregation;
 			new AggregationWalker().Walk(this, visitor);
 		}
-
-		//always evaluate to false so that each side of && equation is evaluated
-		public static bool operator false(AggregationContainerDescriptor<T> a) => false;
-
-		//always evaluate to false so that each side of && equation is evaluated
-		public static bool operator true(AggregationContainerDescriptor<T> a) => false;
-
-
-		public static AggregationContainerDescriptor<T> operator &(AggregationContainerDescriptor<T> left, AggregationContainerDescriptor<T> right)
-		{
-			var d = new AggregationContainerDescriptor<T>();
-			var leftAggs = (IDictionary<string, IAggregationContainer>)((IAggregationContainer)left).Aggregations;
-			var rightAggs = (IDictionary<string, IAggregationContainer>)((IAggregationContainer)right).Aggregations;
-			foreach(var kv in rightAggs)
-			{
-				if (leftAggs.ContainsKey(kv.Key))
-				{
-					var message = $"Can not merge two {nameof(AggregationContainerDescriptor<T>)}'s";
-					message += $" {kv.Key} is defined in both";
-					throw new Exception(message);
-				}
-				leftAggs.Add(kv.Key, kv.Value);
-			}
-			((IAggregationContainer)d).Aggregations = ((IAggregationContainer)left).Aggregations;
-			return d;
+
+		//always evaluate to false so that each side of && equation is evaluated
+		public static bool operator false(AggregationContainerDescriptor<T> a) => false;
+
+		//always evaluate to false so that each side of && equation is evaluated
+		public static bool operator true(AggregationContainerDescriptor<T> a) => false;
+
+
+		public static AggregationContainerDescriptor<T> operator &(AggregationContainerDescriptor<T> left, AggregationContainerDescriptor<T> right)
+		{
+			var d = new AggregationContainerDescriptor<T>();
+			var leftAggs = (IDictionary<string, IAggregationContainer>)((IAggregationContainer)left).Aggregations;
+			var rightAggs = (IDictionary<string, IAggregationContainer>)((IAggregationContainer)right).Aggregations;
+			foreach(var kv in rightAggs)
+			{
+				if (leftAggs.ContainsKey(kv.Key))
+				{
+					var message = $"Can not merge two {nameof(AggregationContainerDescriptor<T>)}'s";
+					message += $" {kv.Key} is defined in both";
+					throw new Exception(message);
+				}
+				leftAggs.Add(kv.Key, kv.Value);
+			}
+			((IAggregationContainer)d).Aggregations = ((IAggregationContainer)left).Aggregations;
+			return d;
 		}
 	}
-}
+}

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

@@ -13,7 +13,7 @@ public interface INamedFiltersContainer : IIsADictionary<string, IQueryContainer
 
 	public class NamedFiltersContainer: IsADictionaryBase<string, IQueryContainer>, INamedFiltersContainer
 	{
-		public NamedFiltersContainer() : base() { }
+		public NamedFiltersContainer() {}
 		public NamedFiltersContainer(IDictionary<string, IQueryContainer> container) : base(container) { }
 		public NamedFiltersContainer(Dictionary<string, QueryContainer> container)
 			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => (IQueryContainer)kv.Value))

src/Nest/Aggregations/Pipeline/BucketsPath.cs

@@ -10,7 +10,7 @@ public interface IBucketsPath { }
 
 	public class SingleBucketsPath : IBucketsPath
 	{
-		public string BucketsPath { get; private set; }
+		public string BucketsPath { get; }
 
 		public SingleBucketsPath(string bucketsPath)
 		{
@@ -24,7 +24,7 @@ public interface IMultiBucketsPath : IIsADictionary<string, string>, IBucketsPat
 
 	public class MultiBucketsPath : IsADictionaryBase<string, string>, IMultiBucketsPath
 	{
-		public MultiBucketsPath() : base() { }
+		public MultiBucketsPath() {}
 		public MultiBucketsPath(IDictionary<string, string> container) : base(container) { }
 		public MultiBucketsPath(Dictionary<string, string> container)
 			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))

src/Nest/Analysis/Analyzers/Analyzers.cs

@@ -10,7 +10,7 @@ public interface IAnalyzers : IIsADictionary<string, IAnalyzer> { }
 
 	public class Analyzers : IsADictionaryBase<string, IAnalyzer>, IAnalyzers
 	{
-		public Analyzers() : base() { }
+		public Analyzers() {}
 		public Analyzers(IDictionary<string, IAnalyzer> container) : base(container) { }
 		public Analyzers(Dictionary<string, IAnalyzer> container)
 			: base(container.ToDictionary(kv => kv.Key, kv => kv.Value))

src/Nest/Analysis/CharFilters/CharFilters.cs

@@ -10,11 +10,11 @@ public interface ICharFilters : IIsADictionary<string, ICharFilter> { }
 
 	public class CharFilters : IsADictionaryBase<string, ICharFilter>, ICharFilters
 	{
-		public CharFilters() : base() { }
+		public CharFilters() {}
 		public CharFilters(IDictionary<string, ICharFilter> container) : base(container) { }
 		public CharFilters(Dictionary<string, ICharFilter> container)
 			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+		{}
 
 		public void Add(string name, ICharFilter analyzer) => BackingDictionary.Add(name, analyzer);
 	}

src/Nest/Analysis/TokenFilters/TokenFilters.cs

@@ -10,11 +10,11 @@ public interface ITokenFilters : IIsADictionary<string, ITokenFilter> { }
 
 	public class TokenFilters : IsADictionaryBase<string, ITokenFilter>, ITokenFilters
 	{
-		public TokenFilters() : base() { }
+		public TokenFilters() {}
 		public TokenFilters(IDictionary<string, ITokenFilter> container) : base(container) { }
 		public TokenFilters(Dictionary<string, ITokenFilter> container)
 			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+		{}
 
 		public void Add(string name, ITokenFilter analyzer) => BackingDictionary.Add(name, analyzer);
 	}

src/Nest/Analysis/Tokenizers/Tokenizers.cs

@@ -10,11 +10,11 @@ public interface ITokenizers : IIsADictionary<string, ITokenizer> { }
 
 	public class Tokenizers : IsADictionaryBase<string, ITokenizer>, ITokenizers
 	{
-		public Tokenizers() : base() { }
+		public Tokenizers() {}
 		public Tokenizers(IDictionary<string, ITokenizer> container) : base(container) { }
 		public Tokenizers(Dictionary<string, ITokenizer> container)
 			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+		{}
 
 		public void Add(string name, ITokenizer analyzer) => BackingDictionary.Add(name, analyzer);
 	}
@@ -24,7 +24,7 @@ public class TokenizersDescriptor :IsADictionaryDescriptorBase<TokenizersDescrip
 		public TokenizersDescriptor() : base(new Tokenizers()) { }
 
 		public TokenizersDescriptor UserDefined(string name, ITokenizer analyzer) => Assign(name, analyzer);
-		
+
 		/// <summary>
 		/// A tokenizer of type edgeNGram.
 		/// </summary>

src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs

@@ -36,7 +36,7 @@ public interface IClusterAllocationExplainResponse : IResponse
 		long RemainingDelayInMilliseconds { get; }
 
 		[JsonProperty("nodes")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, NodeAllocationExplanation>))]
 		IReadOnlyDictionary<string, NodeAllocationExplanation> Nodes { get; }
 	}
 

src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs

@@ -47,7 +47,7 @@ public class ClusterHealthResponse : ResponseBase, IClusterHealthResponse
 		[JsonProperty(PropertyName="number_of_pending_tasks")]
 		public int NumberOfPendingTasks { get; internal set; }
 		[JsonProperty(PropertyName = "indices")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, IndexHealthStats>))]
 		public IReadOnlyDictionary<string, IndexHealthStats> Indices { get; internal set; } = EmptyReadOnly<string, IndexHealthStats>.Dictionary;
 	}
 }