Can now map complex _all field mappings fluently

Author: Mpdreamz

src/Nest/DSL/PutMappingDescriptor.cs

@@ -95,9 +95,9 @@ public PutMappingDescriptor<T> SetParent<K>() where K : class
 			return this;
 		}
 
-		public PutMappingDescriptor<T> DisableAllField(bool disabled = true)
+		public PutMappingDescriptor<T> AllField(Func<AllFieldMapping, AllFieldMapping> allFieldSelector)
 		{
-			this._Mapping.AllFieldMapping = new AllFieldMapping().SetDisabled(disabled);
+			this._Mapping.AllFieldMapping = allFieldSelector(new AllFieldMapping());
 			return this;
 		}
 

src/Nest/Domain/Mapping/SpecialFields/AllFieldMapping.cs

@@ -4,17 +4,58 @@ namespace Nest
 {
     public class AllFieldMapping
     {
-		public AllFieldMapping()
+
+		[JsonProperty("enabled")]
+		public bool? _Enabled { get; internal set; }
+		
+		[JsonProperty("store")]
+		public bool? _Store { get; internal set; }
+
+		[JsonProperty("term_vector")]
+		public TermVectorOption?  _TermVector { get; internal set; }
+
+		[JsonProperty("analyzer")]
+		public string _Analyzer { get; internal set; }
+
+		[JsonProperty("index_analyzer")]
+		public string _IndexAnalyzer { get; internal set; }
+
+		[JsonProperty("search_analyzer")]
+		public string _SearchAnalyzer { get; internal set; }
+
+		public AllFieldMapping Enabled(bool enabled = true)
 		{
-			this.Enabled = true;
+			this._Enabled = enabled;
+			return this;
 		}
 
-		[JsonProperty("enabled")]
-		public bool Enabled { get; internal set; }
+		public AllFieldMapping Store(bool store = true)
+		{
+			this._Store = store;
+			return this;
+		}
+
+		public AllFieldMapping TermVector(TermVectorOption option)
+		{
+			this._TermVector = option;
+			return this;
+		}
+
+		public AllFieldMapping Analyzer(string analyzer)
+		{
+			this._Analyzer = analyzer;
+			return this;
+		}
+
+		public AllFieldMapping IndexAnalyzer(string analyzer)
+		{
+			this._IndexAnalyzer = analyzer;
+			return this;
+		}
 
-		public AllFieldMapping SetDisabled(bool disabled = true)
+		public AllFieldMapping SearchAnalyzer(string analyzer)
 		{
-			this.Enabled = !disabled;
+			this._SearchAnalyzer = analyzer;
 			return this;
 		}
     }

src/Tests/Nest.Tests.Integration/Core/Map/RootProperties/MapRootObjectPropertiesTests.cs

@@ -20,7 +20,7 @@ public void RootPropertiesShouldSerialize()
 				.DateDetection(true)
 				.NumericDetection(true)
 				.SetParent<Person>() //makes no sense but i needed a type :)
-				.DisableAllField(true)
+				.AllField(a=>a.Enabled(false))
 				.DisableIndexField(true)
 				.DisableSizeField(true)
 				.Dynamic()

src/Tests/Nest.Tests.Integration/Template/TemplateTests.cs

@@ -65,7 +65,7 @@ public void PutTemplateWithMappings()
 				.Template("donotinfluencothertests")
 				.AddMapping<dynamic>(s=>s
 					.Type("mytype")
-					.DisableAllField()
+					.AllField(a=>a.Enabled(false))
 				)
 			);
 			Assert.IsTrue(putResponse.Acknowledged);
@@ -80,7 +80,7 @@ public void PutTemplateWithMappings()
 
 			Assert.IsTrue(mappings.ContainsKey("mytype"), "put-template-with-mappings template should have a `mytype` mapping");
 			Assert.NotNull(mappings["mytype"].AllFieldMapping, "`mytype` mapping should contain the _all field mapping");
-			Assert.AreEqual(false, mappings["mytype"].AllFieldMapping.Enabled, "_all { enabled } should be set to false");
+			Assert.AreEqual(false, mappings["mytype"].AllFieldMapping._Enabled, "_all { enabled } should be set to false");
 		}
 
 		[Test]

src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs

@@ -36,7 +36,12 @@ public void MapFluentFull()
 				//Allows us to map the exceptions to the rule and be less verbose.
 				.MapFromAttributes()
 				.SetParent<Person>() //makes no sense but i needed a type :)
-				.DisableAllField(false)
+				.AllField(a=>a
+					.Enabled() 
+					.IndexAnalyzer("nGram_analyzer")
+					.SearchAnalyzer("whitespace_analyzer")
+					.TermVector(TermVectorOption.with_positions_offsets)
+				)
 				.DisableIndexField(false)
 				.DisableSizeField(false)
 				.Dynamic()
@@ -87,6 +92,7 @@ public void MapFluentFull()
 					.Add("attr1", "value1")
 					.Add("attr2", new { attr3 = "value3" })
 				)
+				
 				.DynamicTemplates(d=>d
 					.Add(t=>t
 						.Name("template_1")
@@ -118,14 +124,8 @@ public void MapFluentFull()
 					)
 				)
 				.Properties(props => props
-					.String(s=>s
-						.Name("_all")
-						.IndexAnalyzer("nGram_analyzer")
-						.SearchAnalyzer("whitespace_analyzer")
-					)
 					.String(s => s
 						.Name(p => p.Name)
-						
 						.IndexName("my_crazy_name_i_want_in_lucene")
 						.IncludeInAll()
 						.Index(FieldIndexOption.analyzed)

src/Tests/Nest.Tests.Unit/Core/Map/RootProperties/MapRootObjectPropertiesTests.cs

@@ -22,7 +22,7 @@ public void RootPropertiesShouldSerialize()
 				.DateDetection(true)
 				.NumericDetection(true)
 				.SetParent<Person>() //makes no sense but i needed a type :)
-				.DisableAllField(true)
+				.AllField(a=>a.Enabled(false))
 				.DisableIndexField(true)
 				.DisableSizeField(true)
 				.Dynamic()