fix id properties configured on connection settings not utilizing idlook delegate cache

Author: Mpdreamz

src/Nest/ExposedInternals/ElasticInferrer.cs

@@ -47,7 +47,7 @@ public string DefaultIndex
 		public ElasticInferrer(IConnectionSettingsValues connectionSettings)
 		{
 			this._connectionSettings = connectionSettings;
-			this.IdResolver = new IdResolver();
+			this.IdResolver = new IdResolver(this._connectionSettings);
 			this.IndexNameResolver = new IndexNameResolver(this._connectionSettings);
 			this.TypeNameResolver = new TypeNameResolver(this._connectionSettings);
 			this.PropertyNameResolver = new PropertyNameResolver(this._connectionSettings);
@@ -128,11 +128,6 @@ public string Id<T>(T obj) where T : class
 		{
 			if (obj == null) return null;
 
-			string idProperty;
-			this._connectionSettings.IdProperties.TryGetValue(typeof(T), out idProperty);
-			if (!idProperty.IsNullOrEmpty())
-				return this.IdResolver.GetIdFor(obj, idProperty);
-			
 			return this.IdResolver.GetIdFor(obj);
 		}
 

src/Nest/Resolvers/IdResolver.cs

@@ -8,9 +8,16 @@ namespace Nest.Resolvers
 {
 	public class IdResolver
 	{
+		private readonly IConnectionSettingsValues _connectionSettings;
 		private static ConcurrentDictionary<Type, Func<object, string>> IdDelegates = new ConcurrentDictionary<Type, Func<object, string>>();
 		private static MethodInfo MakeDelegateMethodInfo = typeof(IdResolver).GetMethod("MakeDelegate", BindingFlags.Static | BindingFlags.NonPublic);
 
+		public IdResolver(IConnectionSettingsValues connectionSettings)
+		{
+			_connectionSettings = connectionSettings;
+		}
+
+
 		internal Func<T, string> CreateIdSelector<T>() where T : class
 		{
 			Func<T, string> idSelector = (@object) => this.GetIdFor(@object);
@@ -24,6 +31,7 @@ internal static Func<T, object> MakeDelegate<T, U>(MethodInfo @get)
 			return t => f(t);
 		}
 
+		[Obsolete("Scheduled to be removed in 2.0, is not cached and not used internally")]
 		public string GetIdFor<T>(T @object, string idProperty)
 		{
 			try
@@ -81,26 +89,31 @@ private PropertyInfo GetInferredId(Type type)
 		{
 			// if the type specifies through ElasticAttribute what the id prop is 
 			// use that no matter what
+
+			string propertyName;
+			this._connectionSettings.IdProperties.TryGetValue(type, out propertyName);
+			if (!propertyName.IsNullOrEmpty())
+				return GetPropertyCaseInsensitive(type, propertyName);
+
 			var esTypeAtt = ElasticAttributes.Type(type);
 			if (esTypeAtt != null && !string.IsNullOrWhiteSpace(esTypeAtt.IdProperty))
 				return GetPropertyCaseInsensitive(type, esTypeAtt.IdProperty);
 
-			var propertyName = "Id";
-
+			propertyName = "Id";
 			//Try Id on its own case insensitive
 			var idProperty = GetPropertyCaseInsensitive(type, propertyName);
 			if (idProperty != null)
 				return idProperty;
 
+			//TODO remove in 2.0 ?
 			//Try TypeNameId case insensitive
 			idProperty = GetPropertyCaseInsensitive(type, type.Name + propertyName);
 			if (idProperty != null)
 				return idProperty;
 
+			//TODO remove in 2.0 ?
 			//Try TypeName_Id case insensitive
 			idProperty = GetPropertyCaseInsensitive(type, type.Name + "_" + propertyName);
-			if (idProperty != null)
-				return idProperty;
 
 			return idProperty;
 		}

src/Tests/Nest.Tests.Unit/Internals/Inferno/IdLookupTests.cs

@@ -8,6 +8,13 @@ namespace Nest.Tests.Unit.Internals.Inferno
 	[TestFixture]
 	public class IdLookupTests
 	{
+		private IdResolver _idResolver;
+
+		public IdLookupTests()
+		{
+			this._idResolver = new IdResolver(new ConnectionSettings());
+		}
+
 		[ElasticType(IdProperty = "Guid")]
 		internal class AlternateIdClass
 		{
@@ -35,60 +42,60 @@ internal class InheritedIdClass : BaseIdClass { public string Name { get; set; }
 		public void TestAlternateIdLookup()
 		{
 			var expectedGuid = Guid.NewGuid();
-			var id = new IdResolver().GetIdFor(new AlternateIdClass { Guid = expectedGuid });
+			var id = this._idResolver.GetIdFor(new AlternateIdClass { Guid = expectedGuid });
 			StringAssert.AreEqualIgnoringCase(expectedGuid.ToString(), id);
 		}
 
 		[Test]
 		public void TestIntLookup()
 		{
 			var expected = 12;
-			var id = new IdResolver().GetIdFor(new IntIdClass { Id = expected });
+			var id = this._idResolver.GetIdFor(new IntIdClass { Id = expected });
 			StringAssert.AreEqualIgnoringCase(expected.ToString(CultureInfo.InvariantCulture), id);
 		}
 		[Test]
 		public void TestDecimalLookup()
 		{
 			var expected = 12m;
-			var id = new IdResolver().GetIdFor(new DecimalIdClass { Id = expected });
+			var id = this._idResolver.GetIdFor(new DecimalIdClass { Id = expected });
 			StringAssert.AreEqualIgnoringCase(expected.ToString(CultureInfo.InvariantCulture), id);
 		}
 		[Test]
 		public void TestFloatLookup()
 		{
 			var expected = 12f;
-			var id = new IdResolver().GetIdFor(new FloatIdClass { Id = expected });
+			var id = this._idResolver.GetIdFor(new FloatIdClass { Id = expected });
 			StringAssert.AreEqualIgnoringCase(expected.ToString(CultureInfo.InvariantCulture), id);
 		}
 		[Test]
 		public void TestLongLookup()
 		{
 			var expected = long.MaxValue;
-			var id = new IdResolver().GetIdFor(new LongIdClass { Id = expected });
+			var id = this._idResolver.GetIdFor(new LongIdClass { Id = expected });
 			StringAssert.AreEqualIgnoringCase(expected.ToString(CultureInfo.InvariantCulture), id);
 		}
 
 		[Test]
 		public void TestDoubleLookup()
 		{
 			var expected = 12d;
-			var id = new IdResolver().GetIdFor(new DoubleIdClass { Id = expected });
+			var id = this._idResolver.GetIdFor(new DoubleIdClass { Id = expected });
 			StringAssert.AreEqualIgnoringCase(expected.ToString(CultureInfo.InvariantCulture), id);
 		}
 		[Test]
 		public void TestCustomLookup()
 		{
 			var expected = new MyCustomClass();
-			var id = new IdResolver().GetIdFor(new CustomObjectIdClass { Id = expected });
+			var id = this._idResolver.GetIdFor(new CustomObjectIdClass { Id = expected });
 			StringAssert.AreEqualIgnoringCase(expected.ToString(), id);
 		}
 
 		[Test]
 		public void TestInheritedLookup()
 		{
 			var expected = new InheritedIdClass() { Id = 123 };
-			var id = new IdResolver().GetIdFor(expected);
-			id = new IdResolver().GetIdFor(expected);
+			var id = this._idResolver.GetIdFor(expected);
+			id = this._idResolver.GetIdFor(expected);
 			Assert.AreEqual(expected.Id.ToString(), id);
 		}
 
@@ -97,8 +104,8 @@ public void TestInheritedLookup()
 		public void TestHitsCache()
 		{
 			var expected = 12m;
-			var id = new IdResolver().GetIdFor(new DecimalIdClass { Id = expected });
-			id = new IdResolver().GetIdFor(new DecimalIdClass { Id = expected });
+			var id = this._idResolver.GetIdFor(new DecimalIdClass { Id = expected });
+			id = this._idResolver.GetIdFor(new DecimalIdClass { Id = expected });
 			StringAssert.AreEqualIgnoringCase(expected.ToString(), id);
 		}
 	}