Merge pull request #735 from elasticsearch/fix/675

Fixed template mapping: type name wasn't properly inferred

Author: Mpdreamz

src/Nest/DSL/PutTemplateDescriptor.cs

@@ -54,16 +54,15 @@ public PutTemplateDescriptor AddMapping<T>(Func<PutMappingDescriptor<T>, PutMapp
 			where T : class
 		{
 			mappingSelector.ThrowIfNull("mappingSelector");
-			var rootObjectMappingDescriptor = mappingSelector(new PutMappingDescriptor<T>(this._connectionSettings));
-			rootObjectMappingDescriptor.ThrowIfNull("rootObjectMappingDescriptor");
+			var putMappingDescriptor = mappingSelector(new PutMappingDescriptor<T>(this._connectionSettings));
+			putMappingDescriptor.ThrowIfNull("rootObjectMappingDescriptor");
 
 			var inferrer = new ElasticInferrer(this._connectionSettings);
-			var typeName = inferrer.TypeName(rootObjectMappingDescriptor._Type);
+			var typeName = inferrer.TypeName(putMappingDescriptor._Type ?? typeof(T));
 			if (typeName == null)
 				return this;
-			this._TemplateMapping.Mappings[typeName] = rootObjectMappingDescriptor._Mapping;
+			this._TemplateMapping.Mappings[typeName] = putMappingDescriptor._Mapping;
 			return this;
-
 		}
 
 		public PutTemplateDescriptor AddWarmer<T>(Func<CreateWarmerDescriptor, CreateWarmerDescriptor> warmerSelector)

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

@@ -63,8 +63,7 @@ public void PutTemplateWithMappings()
 			this._client.DeleteTemplate("put-template-with-mappings");
 			var putResponse = this._client.PutTemplate("put-template-with-mappings",t => t
 				.Template("donotinfluencothertests")
-				.AddMapping<dynamic>(s=>s
-					.Type("mytype")
+				.AddMapping<ElasticsearchProject>(s=>s
 					.AllField(a=>a.Enabled(false))
 				)
 			);
@@ -78,9 +77,9 @@ public void PutTemplateWithMappings()
 
 			var mappings = templateResponse.TemplateMapping.Mappings;
 
-			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.IsTrue(mappings.ContainsKey("elasticsearchprojects"), "put-template-with-mappings template should have a `mytype` mapping");
+			Assert.NotNull(mappings["elasticsearchprojects"].AllFieldMapping, "`mytype` mapping should contain the _all field mapping");
+			Assert.AreEqual(false, mappings["elasticsearchprojects"].AllFieldMapping._Enabled, "_all { enabled } should be set to false");
 		}
 
 		[Test]