Merge branch 'master' of github.com:elastic/elasticsearch-net

Author: Mpdreamz

src/Benchmarking/project.lock.json

@@ -24,7 +24,7 @@
     "url": "https://github.com/elastic/elasticsearch-net"
   },
   "copyright": "2014-2016 Elasticsearch BV",
-  "version": "2.1.0-ci20160129160552",
+  "version": "2.1.0-ci20160129221525",
   "compilationOptions": {
     "warningsAsErrors": false
   },
@@ -60,9 +60,15 @@
         ]
       },
       "frameworkAssemblies": {
-        "System": "",
-        "System.Runtime": "",
-        "System.Runtime.Serialization": ""
+        "System": {
+          "type": "build"
+        },
+        "System.Runtime": {
+          "type": "build"
+        },
+        "System.Runtime.Serialization": {
+          "type": "build"
+        }
       }
     },
     "net45": {
@@ -72,9 +78,15 @@
         ]
       },
       "frameworkAssemblies": {
-        "System": "",
-        "System.Runtime": "",
-        "System.Runtime.Serialization": ""
+        "System": {
+          "type": "build"
+        },
+        "System.Runtime": {
+          "type": "build"
+        },
+        "System.Runtime.Serialization": {
+          "type": "build"
+        }
       }
     },
     "dotnet5.1": {

src/Elasticsearch.Net/project.json

@@ -1739,7 +1739,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
+      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Elasticsearch.Net/project.lock.json

@@ -153,7 +153,7 @@ public TConnectionSettings MapIdPropertyFor<TDocument>(Expression<Func<TDocument
 		{
 			objectPath.ThrowIfNull(nameof(objectPath));
 
-			var memberInfo = new MemberInfoResolver(this, objectPath);
+			var memberInfo = new MemberInfoResolver(objectPath);
 			var fieldName = memberInfo.Members.Single().Name;
 
 			if (this._idProperties.ContainsKey(typeof(TDocument)))
@@ -186,7 +186,7 @@ private void ApplyPropertyMappings<TDocument>(IList<IClrTypePropertyMapping<TDoc
 			foreach (var mapping in mappings)
 			{
 				var e = mapping.Property;
-				var memberInfoResolver = new MemberInfoResolver(this, e);
+				var memberInfoResolver = new MemberInfoResolver(e);
 				if (memberInfoResolver.Members.Count > 1)
 					throw new ArgumentException("MapFieldNameFor can only map direct properties");
 

src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettings.cs

@@ -7,22 +7,20 @@ namespace Nest
 	/// <summary>
 	/// Resolves member infos in an expression, instance may NOT be shared.
 	/// </summary>
-	public class MemberInfoResolver : FieldResolver
+	public class MemberInfoResolver : ExpressionVisitor
 	{
 		private readonly IList<MemberInfo> _members = new List<MemberInfo>();
 		public IList<MemberInfo> Members { get { return _members; } }
 
-		public MemberInfoResolver(IConnectionSettingsValues settings, Expression expression) : base(settings)
+		public MemberInfoResolver(Expression expression)
 		{
-			var stack = new Stack<string>();
-			var properties = new Stack<ElasticsearchPropertyAttribute>();
-			base.Visit(expression, stack, properties);
+			base.Visit(expression);
 		}
 
-		protected override Expression VisitMemberAccess(MemberExpression expression, Stack<string> stack, Stack<ElasticsearchPropertyAttribute> properties)
+		protected override Expression VisitMember(MemberExpression expression)
 		{
 			this._members.Add(expression.Member);
-			return base.VisitMemberAccess(expression, stack, properties);
+			return base.VisitMember(expression);
 		}
 	}
 }