Settings changes

Remove suggest threadpool
Remove WarmersEnabled, RequestCacheEnabled from Index settings. Add RequestsCacheEnabled
Remove TranslogWriteMode
Add tests to ensure all types in Nest and Elasticsearch.Net assemblies are in the root namespace

Closes #2009

Author: russcam

src/Nest/Cat/CatThreadPool/CatThreadPoolRecordJsonConverter.cs

@@ -7,27 +7,23 @@ namespace Nest
 {
 	internal class CatThreadPoolRecordJsonConverter : JsonConverter
 	{
-		public override bool CanWrite
-		{
-			get { return false; }
-		}
+		public override bool CanWrite => false;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			throw new NotSupportedException();
 		}
 
-		private static readonly string[] _threadPoolShortHands = new[]
-		{
+		private static readonly string[] _threadPoolShortHands = {
 			"b", "f", "g", "ge", "i", "ma", "m", "o", "p", "r", "s", "sn", "su", "w"
 		};
 
-		private static readonly string[] _fieldShortHands = new[]
-		{
+		private static readonly string[] _fieldShortHands = {
 			"t", "a", "s", "q", "qs", "r", "l", "c", "mi", "ma", "k"
 		};
-		private static IEnumerable<Tuple<string, string>> _combinations =
-			_threadPoolShortHands.SelectMany<string, string, Tuple<string, string>>(t => _fieldShortHands, Tuple.Create);
+
+		private static readonly IEnumerable<Tuple<string, string>> _combinations =
+			_threadPoolShortHands.SelectMany(t => _fieldShortHands, Tuple.Create);
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
 										JsonSerializer serializer)
@@ -136,11 +132,6 @@ private void SetThreadPool(string threadPool, CatThreadPoolRecord o, string fiel
 					if (o.Snapshot == null) o.Snapshot = new CatThreadPool();
 					this.SetFieldValue(o.Snapshot, field, value);
 					return;
-				case "suggest":
-				case "su":
-					if (o.Suggest == null) o.Suggest = new CatThreadPool();
-					this.SetFieldValue(o.Suggest, field, value);
-					return;
 				case "warmer":
 				case "w":
 					if (o.Warmer == null) o.Warmer = new CatThreadPool();
@@ -162,47 +153,47 @@ private void SetFieldValue(CatThreadPool pool, string field, string value)
 		{
 			switch(field)
 			{
-				case "type": 
+				case "type":
 				case "t":
 					pool.Type = value;
 					return;
-				case "active": 
+				case "active":
 				case "a":
 					pool.Active = value;
 					return;
-				case "size": 
+				case "size":
 				case "s":
 					pool.Size = value;
 					return;
-				case "queue": 
+				case "queue":
 				case "q":
 					pool.Queue = value;
 					return;
-				case "queueSize": 
+				case "queueSize":
 				case "qs":
 					pool.QueueSize = value;
 					return;
-				case "rejected": 
+				case "rejected":
 				case "r":
 					pool.Rejected = value;
 					return;
-				case "largest": 
+				case "largest":
 				case "l":
 					pool.Largest = value;
 					return;
-				case "completed": 
+				case "completed":
 				case "c":
 					pool.Completed = value;
 					return;
-				case "min": 
+				case "min":
 				case "mi":
 					pool.Min = value;
 					return;
-				case "max": 
+				case "max":
 				case "ma":
 					pool.Max = value;
 					return;
-				case "keepAlive": 
+				case "keepAlive":
 				case "k":
 					pool.KeepAlive = value;
 					return;
@@ -215,4 +206,4 @@ public override bool CanConvert(Type objectType)
 			return objectType == typeof(CatThreadPoolRecord);
 		}
 	}
-}
+}

src/Nest/CrossPlatform/SynchronizedCollection.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Collections;
 using System.Diagnostics;
-using Elasticsearch.Net;
+using Nest;
 
 namespace System.Collections.Generic
 {
@@ -310,4 +310,4 @@ static void VerifyValueType(object value)
 		}
 	}
 }
-#endif
+#endif

src/Nest/IndexModules/IndexSettings/Settings/DynamicIndexSettings.cs

@@ -8,13 +8,13 @@ namespace Nest
 	public interface IDynamicIndexSettings : IIsADictionary<string, object>
 	{
 		/// <summary>
-		///The number of replicas each primary shard has. Defaults to 1. 
+		///The number of replicas each primary shard has. Defaults to 1.
 		/// </summary>
 		int? NumberOfReplicas { get; set; }
 
 		/// <summary>
-		///Auto-expand the number of replicas based on the number of available nodes. 
-		/// Set to a dash delimited lower and upper bound (e.g. 0-5) or use all for the upper bound (e.g. 0-all). Defaults to false (i.e. disabled). 
+		///Auto-expand the number of replicas based on the number of available nodes.
+		/// Set to a dash delimited lower and upper bound (e.g. 0-5) or use all for the upper bound (e.g. 0-all). Defaults to false (i.e. disabled).
 		/// </summary>
 		//TODO SPECIAL TYPE FOR THIS INSTEAD OF JUST STRING
 		string AutoExpandReplicas { get; set; }
@@ -50,30 +50,19 @@ public interface IDynamicIndexSettings : IIsADictionary<string, object>
 		/// </summary>
 		int? Priority { get; set; }
 
-		/// <summary>
-		/// Index warmup can be disabled by setting index.warmer.enabled to false. This can be handy when 
-		/// doing initial bulk indexing: disable pre registered warmers to make indexing faster 
-		/// and less expensive and then enable it.
-		/// </summary>
-		bool? WarmersEnabled { get; set; }
-
-		/// <summary>
-		/// When a search request is run against an index or against many indices, each involved shard executes the search locally and
-	   ///  returns its local results to the coordinating node, which combines these shard-level results into a “global” result set.
-		///<para>
-		/// The shard-level request cache module caches the local results on each shard.This allows frequently used 
-		/// (and potentially heavy) search requests to return results almost instantly.</para>
-		/// </summary>
-		bool? RequestCacheEnabled { get; set; }
-
 		/// <summary>
 		/// A primary shard is only recovered only if there are
 		/// enough nodes available to allocate sufficient replicas to form a quorum.
 		/// </summary>
 		Union<int, RecoveryInitialShards> RecoveryInitialShards { get; set; }
 
 		/// <summary>
-		/// The allocation of replica shards which become unassigned because a node has left can be 
+		/// Enables the shard-level request cache. Not enabled by default.
+		/// </summary>
+		bool? RequestsCacheEnabled { get; set; }
+
+		/// <summary>
+		/// The allocation of replica shards which become unassigned because a node has left can be
 		/// delayed with this dynamic setting, which defaults to 1m.
 		/// </summary>
 		Time UnassignedNodeLeftDelayedTimeout { get; set; }
@@ -94,10 +83,13 @@ public interface IDynamicIndexSettings : IIsADictionary<string, object>
 		ISlowLog SlowLog { get; set; }
 
 		/// <summary>
-		/// Configure translog settings, EXPERT MODE ONLY!
+		/// Configure translog settings. This should only be used by experts who know what they're doing
 		/// </summary>
 		ITranslogSettings Translog { get; set; }
 
+		/// <summary>
+		/// Configure analysis
+		/// </summary>
 		IAnalysis Analysis { get; set; }
 	}
 
@@ -109,6 +101,9 @@ public DynamicIndexSettings(Dictionary<string, object> container)
 			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
 		{ }
 
+		/// <inheritdoc/>
+		public int? NumberOfReplicas { get; set; }
+
 		/// <inheritdoc/>
 		public string AutoExpandReplicas { get; set; }
 
@@ -120,40 +115,34 @@ public DynamicIndexSettings(Dictionary<string, object> container)
 
 		/// <inheritdoc/>
 		public bool? BlocksReadOnly { get; set; }
-		
+
 		/// <inheritdoc/>
 		public bool? BlocksWrite { get; set; }
-		
+
 		/// <inheritdoc/>
 		public int? Priority { get; set; }
-		
-		/// <inheritdoc/>
-		public bool? WarmersEnabled { get; set; }
-		
+
 		/// <inheritdoc/>
-		public bool? RequestCacheEnabled { get; set; }
-		
+		public bool? RequestsCacheEnabled { get; set; }
+
 		/// <inheritdoc/>
 		public IMergeSettings Merge { get; set; }
-		
-		/// <inheritdoc/>
-		public int? NumberOfReplicas { get; set; }
-		
+
 		/// <inheritdoc/>
 		public Union<int, RecoveryInitialShards> RecoveryInitialShards { get; set; }
-		
+
 		/// <inheritdoc/>
 		public Time RefreshInterval { get; set; }
-		
+
 		/// <inheritdoc/>
 		public int? RoutingAllocationTotalShardsPerNode { get; set; }
-		
+
 		/// <inheritdoc/>
 		public ISlowLog SlowLog { get; set; }
-		
+
 		/// <inheritdoc/>
 		public ITranslogSettings Translog { get; set; }
-		
+
 		/// <inheritdoc/>
 		public Time UnassignedNodeLeftDelayedTimeout { get; set; }
 
@@ -192,7 +181,7 @@ public TDescriptor Setting(string setting, object value)
 		public TDescriptor NumberOfReplicas(int? numberOfReplicas) => Assign(a => a.NumberOfReplicas = numberOfReplicas);
 
 		/// <inheritdoc/>
-		public TDescriptor AutoExpandReplicas(string AutoExpandReplicas) => Assign(a => a.AutoExpandReplicas = AutoExpandReplicas);
+		public TDescriptor AutoExpandReplicas(string autoExpandReplicas) => Assign(a => a.AutoExpandReplicas = autoExpandReplicas);
 
 		/// <inheritdoc/>
 		public TDescriptor BlocksMetadata(bool? blocksMetadata = true) => Assign(a => a.BlocksMetadata = blocksMetadata);
@@ -209,12 +198,6 @@ public TDescriptor Setting(string setting, object value)
 		/// <inheritdoc/>
 		public TDescriptor Priority(int? priority) => Assign(a => a.Priority = priority);
 
-		/// <inheritdoc/>
-		public TDescriptor WarmersEnabled(bool enabled = true) => Assign(a => a.WarmersEnabled = enabled);
-
-		/// <inheritdoc/>
-		public TDescriptor RequestCacheEnabled(bool enabled = true) => Assign(a => a.RequestCacheEnabled = enabled);
-
 		/// <inheritdoc/>
 		public TDescriptor Merge(Func<MergeSettingsDescriptor, IMergeSettings> merge) =>
 			Assign(a => a.Merge = merge?.Invoke(new MergeSettingsDescriptor()));
@@ -223,6 +206,10 @@ public TDescriptor Merge(Func<MergeSettingsDescriptor, IMergeSettings> merge) =>
 		public TDescriptor RecoveryInitialShards(Union<int, RecoveryInitialShards> initialShards) =>
 			Assign(a => a.RecoveryInitialShards = initialShards);
 
+		/// <inheritdoc/>
+		public TDescriptor RequestsCacheEnabled(bool? enable = true) =>
+			Assign(a => a.RequestsCacheEnabled = enable);
+
 		/// <inheritdoc/>
 		public TDescriptor RefreshInterval(Time time) => Assign(a => a.RefreshInterval = time);
 
@@ -245,5 +232,4 @@ public TDescriptor UnassignedNodeLeftDelayedTimeout(Time time) =>
 		public TDescriptor Analysis(Func<AnalysisDescriptor, IAnalysis> selector) =>
 			Assign(a => a.Analysis = selector?.Invoke(new AnalysisDescriptor()));
 	}
-
-}
+}