Merge branch 'fix/1708'

Author: gmarz

Diff for: src/CodeGeneration/Nest.Litterateur/project.lock.json

@@ -4130,7 +4130,7 @@
     "System.Reflection.Metadata/1.1.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "RLIE4sSt2zngMLuqM6YmxBH99mTumtT4DNZE4+msfEaInUP5iCLQT+BHPl+2cjSAP1pdALyAjLB8RtCB+WGGWQ==",
+      "sha512": "a8VsRm/B0Ik1o5FumSMWmpwbG7cvIIajAYhzTTy9VB9XItByJDQHGZkQTIAdsvVJ6MI5O3uH/lb0izgQDlDIWA==",
       "files": [
         "lib/dotnet5.2/System.Reflection.Metadata.dll",
         "lib/dotnet5.2/System.Reflection.Metadata.xml",

Diff for: src/Nest/CommonAbstractions/Infer/Field/FieldResolver.cs

@@ -39,35 +39,52 @@ public string Resolve(Field field)
 			return f;
 		}
 
-		internal string Resolve(PropertyName property)
+		public string Resolve(PropertyName property)
 		{
-
 			if (property.IsConditionless()) return null;
 			if (!property.Name.IsNullOrEmpty())
+			{
+				if (property.Name.Contains("."))
+					throw new ArgumentException("Property names cannot contain dots.");
 				return property.Name;
+			}
 			string f;
 			if (this.Properties.TryGetValue(property, out f))
 				return f;
-			f = this.Resolve(property.Expression, property.Property);
+			f = this.ResolveToLastToken(property.Expression, property.Property);
 			this.Properties.TryAdd(property, f);
 			return f;
 		}
 
 		private string Resolve(Expression expression, MemberInfo member)
 		{
 			var name = expression != null
-				? this.ResolveExpression(expression)
+				? this.Resolve(expression)
 				: member != null
-					? this.ResolveMemberInfo(member)
+					? this.Resolve(member)
 					: null;
 
 			if (name == null)
-				throw new ArgumentException("Could not resolve a property name");
+				throw new ArgumentException("Could not resolve a name from the given Expression or MemberInfo.");
 
 			return name;
 		}
 
-		private string ResolveMemberInfo(MemberInfo info)
+		private string ResolveToLastToken(Expression expression, MemberInfo member)
+		{
+			var name = expression != null
+				? this.ResolveToLastToken(expression)
+				: member != null
+					? this.Resolve(member)
+					: null;
+
+			if (name == null)
+				throw new ArgumentException("Could not resolve a name from the given Expression or MemberInfo.");
+
+			return name;
+		}
+
+		private string Resolve(MemberInfo info)
 		{
 			if (info == null)
 				return null;
@@ -85,7 +102,7 @@ private string ResolveMemberInfo(MemberInfo info)
 			return _settings.Serializer?.CreatePropertyName(info) ?? _settings.DefaultFieldNameInferrer(name);
 		}
 
-		private string ResolveExpression(Expression expression)
+		private string Resolve(Expression expression)
 		{
 			var stack = new Stack<string>();
 			var properties = new Stack<ElasticsearchPropertyAttribute>();
@@ -98,10 +115,18 @@ private string ResolveExpression(Expression expression)
 				.ToString();
 		}
 
+		private string ResolveToLastToken(Expression expression)
+		{
+			var stack = new Stack<string>();
+			var properties = new Stack<ElasticsearchPropertyAttribute>();
+			Visit(expression, stack, properties);
+			return stack.Last();
+		}
+
 		protected override Expression VisitMemberAccess(MemberExpression expression, Stack<string> stack, Stack<ElasticsearchPropertyAttribute> properties)
 		{
 			if (stack == null) return base.VisitMemberAccess(expression, stack, properties);
-			var resolvedName = this.ResolveMemberInfo(expression.Member);
+			var resolvedName = this.Resolve(expression.Member);
 			stack.Push(resolvedName);
 			return base.VisitMemberAccess(expression, stack, properties);
 		}

Diff for: src/Tests/ClientConcepts/HighLevel/Inferrence/FieldNames/FieldInference.doc.cs

@@ -12,6 +12,7 @@
 using static Tests.Framework.RoundTripper;
 using static Nest.Infer;
 using Field = Nest.Field;
+using Xunit;
 
 namespace Tests.ClientConcepts.HighLevel.Inferrence.FieldNames
 {
@@ -331,9 +332,6 @@ public void PrecedenceIsAsExpected()
 				DefaultFieldNameInferrer = "shouting much?"
 			});
 
-		}
-		/**
-		*
-		*/
+		}	
 	}
 }

Diff for: src/Tests/ClientConcepts/HighLevel/Inferrence/PropertyNames/PropertyInference.doc.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Linq.Expressions;
+using Nest;
+using Tests.Framework;
+using Tests.Framework.MockData;
+using static Tests.Framework.RoundTripper;
+using Xunit;
+
+namespace Tests.ClientConcepts.HighLevel.Inferrence.PropertyNames
+{
+
+	public class PropertyNames
+	{
+		[U] public void PropertyNamesAreResolvedToLastToken()
+		{
+			Expression<Func<Project, object>> expression = p => p.Name.Suffix("raw");
+			Expect("raw").WhenSerializing<PropertyName>(expression);
+		}
+
+		[U] public void StringsContainingDotsIsAnException()
+		{
+			Assert.Throws<ArgumentException>(() => Expect("exception!").WhenSerializing<PropertyName>("name.raw"));
+		}
+	}
+}