moved all Resolvement of typenames/indexnames/id's into ElasticInferrer which is exposed as .Infer on IElasticClient

Author: Mpdreamz

src/Nest.Tests.Integration/Core/Bulk/BulkPercolateTests.cs

@@ -48,12 +48,12 @@ public void BulkIndexWithPercolate()
 
 			indexResponses.First().Id.Should().BeEquivalentTo("2");
 			indexResponses.First().Index.Should().BeEquivalentTo(ElasticsearchConfiguration.DefaultIndex);
-			indexResponses.First().Type.Should().BeEquivalentTo(this.GetTypeNameFor<ElasticSearchProject>());
+			indexResponses.First().Type.Should().BeEquivalentTo(this._client.Infer.TypeName<ElasticSearchProject>());
 			indexResponses.First().Matches.Should().NotBeNull();
 
 			indexResponses.ElementAt(1).Id.Should().BeEquivalentTo("3");
 			indexResponses.ElementAt(1).Index.Should().BeEquivalentTo(ElasticsearchConfiguration.DefaultIndex);
-			indexResponses.ElementAt(1).Type.Should().BeEquivalentTo(this.GetTypeNameFor<ElasticSearchProject>());
+			indexResponses.ElementAt(1).Type.Should().BeEquivalentTo(this._client.Infer.TypeName<ElasticSearchProject>());
 			indexResponses.First().Matches.Should().BeNull();
 
 			// cleanup

src/Nest.Tests.Integration/Core/Bulk/BulkTests.cs

@@ -33,17 +33,17 @@ public void Bulk()
 			deleteResponses.Should().HaveCount(1);
 			deleteResponses.First().Id.Should().BeEquivalentTo("4");
 			deleteResponses.First().Index.Should().BeEquivalentTo(ElasticsearchConfiguration.DefaultIndex);
-			deleteResponses.First().Type.Should().BeEquivalentTo(this.GetTypeNameFor<ElasticSearchProject>());
+			deleteResponses.First().Type.Should().BeEquivalentTo(this._client.Infer.TypeName<ElasticSearchProject>());
 
 			createResponses.Should().HaveCount(1);
 			createResponses.First().Id.Should().BeEquivalentTo("123123");
 			createResponses.First().Index.Should().BeEquivalentTo(ElasticsearchConfiguration.DefaultIndex);
-			createResponses.First().Type.Should().BeEquivalentTo(this.GetTypeNameFor<ElasticSearchProject>());
+			createResponses.First().Type.Should().BeEquivalentTo(this._client.Infer.TypeName<ElasticSearchProject>());
 
 			indexResponses.Should().HaveCount(1);
 			indexResponses.First().Id.Should().BeEquivalentTo("2");
 			indexResponses.First().Index.Should().BeEquivalentTo(ElasticsearchConfiguration.DefaultIndex);
-			indexResponses.First().Type.Should().BeEquivalentTo(this.GetTypeNameFor<ElasticSearchProject>());
+			indexResponses.First().Type.Should().BeEquivalentTo(this._client.Infer.TypeName<ElasticSearchProject>());
 		}
 
 		[Test]

src/Nest.Tests.Integration/IntegrationTests.cs

@@ -21,19 +21,9 @@ protected virtual void ResetIndexes()
 
 		}
 
-		protected string GetTypeNameFor<T>() where T : class
-		{
-			return this.GetTypeNameFor(typeof (T));
-		}
-		protected string GetTypeNameFor(Type t)
-		{
-			return new TypeNameResolver().GetTypeNameFor(t).Resolve(this._settings);
-		}
-
-
 		protected IQueryResponse<T> SearchRaw<T>(string query) where T : class
 		{
-			var index = this._client.GetIndexNameFor<T>();
+			var index = this._client.Infer.IndexName<T>();
 			var typeName = this._client.GetTypeNameFor<T>();
 			var connectionStatus = this._client.Raw.SearchPost(index, typeName, query);
 			return connectionStatus.Deserialize<QueryResponse<T>>();

src/Nest.Tests.Integration/Search/CountTests.cs

@@ -54,7 +54,7 @@ public void SimpleQueryWithIndicesCount()
 			//does a match_all on the default specified index
 			var index = ElasticsearchConfiguration.DefaultIndex;
 			var indices = new[] { index, index + "_clone" };
-			var types = new[] { this.GetTypeNameFor<ElasticSearchProject>() };
+			var types = new[] { this._client.Infer.TypeName<ElasticSearchProject>() };
 			var countResults = this._client.Count<ElasticSearchProject>(indices, types, q => q
 				.Fuzzy(fq => fq
 					.PrefixLength(4)

src/Nest.Tests.Integration/Warmers/WarmersTests.cs

@@ -10,7 +10,6 @@ namespace Nest.Tests.Integration.Warmers
 	[TestFixture]
 	public class WarmersTests : IntegrationTests
 	{
-		TypeNameResolver typeNameResolver = new TypeNameResolver();
 		[Test]
 		public void SimplePutAndGet()
 		{
@@ -37,7 +36,7 @@ public void SimplePutAndGet()
 			warmerResponse.Indices[_settings.DefaultIndex].Should().ContainKey("warmer_simpleputandget");
 			var warmerMapping = warmerResponse.Indices[_settings.DefaultIndex]["warmer_simpleputandget"];
 			warmerMapping.Name.Should().Be("warmer_simpleputandget");
-			var typeName = typeNameResolver.GetTypeNameFor<ElasticSearchProject>().Resolve(_settings);
+			var typeName = _client.Infer.TypeName<ElasticSearchProject>();
 			warmerMapping.Types.Select(s => s.Resolve(_settings)).Contains(typeName).Should().Be(true);
 			warmerMapping.Source.Should().Contain("\"strange-value\"");
 		}

src/Nest.Tests.Unit/Core/AttributeBasedMap/BaseAttributeMappingTests.cs

@@ -12,7 +12,7 @@ protected string CreateMapFor<T>() where T : class
 		}
 		protected string CreateMapFor(Type t)
 		{
-			var type = new TypeNameResolver().GetTypeNameFor(t);
+			var type = TypeNameMarker.Create(t);
 			var writer = new TypeMappingWriter(t, type, TestElasticClient.Settings, 10);
 
 			return writer.MapFromAttributes();

src/Nest/DSL/BulkCreateDescriptor.cs

@@ -20,12 +20,12 @@ public BulkCreateDescriptor()
 			this._typeNameResolver = new TypeNameResolver();
 		}
 
-		internal override string GetIdForObject(IdResolver resolver)
+		internal override string GetIdForObject(ElasticInferrer inferrer)
 		{
 			if (!this._Id.IsNullOrEmpty())
 				return this._Id;
 
-			return resolver.GetIdFor<T>((T)_Object);
+			return inferrer.Id((T)_Object);
 
 		}
 

src/Nest/DSL/BulkDeleteDescriptor.cs

@@ -20,12 +20,12 @@ public BulkDeleteDescriptor()
 			this._typeNameResolver = new TypeNameResolver();
 		}
 
-		internal override string GetIdForObject(IdResolver resolver)
+		internal override string GetIdForObject(ElasticInferrer inferrer)
 		{
 			if (!this._Id.IsNullOrEmpty())
 				return this._Id;
 
-			return resolver.GetIdFor<T>((T)_Object);
+			return inferrer.Id((T)_Object);
 
 		}
 

src/Nest/DSL/BulkIndexDescriptor.cs

@@ -20,12 +20,12 @@ public BulkIndexDescriptor()
 			this._typeNameResolver = new TypeNameResolver();
 		}
 
-		internal override string GetIdForObject(IdResolver resolver)
+		internal override string GetIdForObject(ElasticInferrer inferrer)
 		{
 			if (!this._Id.IsNullOrEmpty())
 				return this._Id;
 
-			return resolver.GetIdFor<T>((T)_Object);
+			return inferrer.Id((T)_Object);
 
 		}
 

src/Nest/DSL/BulkUpdateDescriptor.cs

@@ -57,12 +57,12 @@ internal override object GetBody()
 			};
 		}
 
-		internal override string GetIdForObject(IdResolver resolver)
+		internal override string GetIdForObject(ElasticInferrer inferrer)
 		{
 			if (!this._Id.IsNullOrEmpty())
 				return this._Id;
 
-			return resolver.GetIdFor<T>((T)_Object);
+			return inferrer.Id((T)_Object);
 
 		}