Minor revision on how LocalMetadata is accessed within the fluent API, added more tests and fixed build

Author: gmarz

src/Nest/Mapping/AttributeBased/ElasticsearchPropertyAttributeBase.cs

@@ -15,6 +15,7 @@ public abstract class ElasticsearchPropertyAttributeBase : Attribute, IProperty,
 
 		PropertyName IProperty.Name { get; set; }
 		TypeName IProperty.Type { get; set; }
+		IDictionary<string, object> IProperty.LocalMetadata { get; set; }
 
 		public string Name { get; set; }
 		public bool Ignore { get; set; }
@@ -32,8 +33,6 @@ protected ElasticsearchPropertyAttributeBase(Type type)
 		public static ElasticsearchPropertyAttributeBase From(MemberInfo memberInfo)
 		{
 			return memberInfo.GetCustomAttribute<ElasticsearchPropertyAttributeBase>(true);
-	}
-
-		IDictionary<string, object> IPropertyWithLocalMetadata.LocalMetadata { get; set; }
+		}
 	}
 }

src/Nest/Mapping/Types/PropertyDescriptorBase.cs

@@ -12,6 +12,7 @@ public abstract class PropertyDescriptorBase<TDescriptor, TInterface, T>
 	{
 		PropertyName IProperty.Name { get; set; }
 		TypeName IProperty.Type { get; set; }
+		IDictionary<string, object> IProperty.LocalMetadata { get; set; }
 
 		protected PropertyDescriptorBase(string type) { Self.Type = type; }
 
@@ -22,6 +23,7 @@ public abstract class PropertyDescriptorBase<TDescriptor, TInterface, T>
 		/// <summary>
 		/// Local property metadata that will NOT be stored in Elasticsearch with the mappings
 		/// </summary>
-		public IDictionary<string, object> LocalMetadata { get; set; }
+		public TDescriptor LocalMetadata(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector) =>
+			Assign(a => a.LocalMetadata = selector?.Invoke(new FluentDictionary<string, object>()));
 	}
 }

src/Tests/Mapping/LocalMetadata/LocalMetadataUsageTests.cs

@@ -0,0 +1,45 @@
+using Nest;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tests.Framework;
+using Tests.Framework.MockData;
+
+namespace Tests.Mapping.LocalMetadata
+{
+	public class LocalMetdataUsageTests : UsageTestBase<ITypeMapping, TypeMappingDescriptor<Project>, TypeMapping>
+	{
+		// Ensure local metadata is never serialized
+		protected override object ExpectJson => new
+		{
+			properties = new
+			{
+				numberOfCommits = new
+				{
+					type = "float"
+				}
+			}
+		};
+
+		protected override Func<TypeMappingDescriptor<Project>, ITypeMapping> Fluent => f => f
+			.Properties(ps => ps
+				.Number(t => t
+					.Name(p => p.NumberOfCommits)
+					.LocalMetadata(m => m
+						.Add("foo", "bar")
+					)
+				)
+			);
+
+
+		protected override TypeMapping Initializer => new TypeMapping
+		{
+			Properties = new Properties
+			{
+				{ "numberOfCommits", new NumberProperty { LocalMetadata = new Dictionary<string, object> { { "foo", "bar" } } } }
+			}
+		};
+	}
+}

src/Tests/Mapping/Metafields/LocalMetadataTests.cs renamed to src/Tests/Mapping/LocalMetadata/LocalMetadataVisitorTests.cs

@@ -4,13 +4,16 @@
 using Nest;
 using Tests.Mapping.Types.Core.Text;
 using Xunit;
+using Tests.Framework;
+using Tests.Framework.MockData;
+using Tests.Mapping.LocalMetadata.Extensions;
 
-namespace Tests.Mapping.Metafields
+namespace Tests.Mapping.LocalMetadata
 {
-    public class LocalMetadataTests
+	public class LocalMetadataVisitorTests
 	{
-		[Fact]
-		public void CanAssignAndAccessLocalMetadata()
+		[U]
+		public void CanAssignAndAccessLocalMetadataInitializer()
 		{
 			var descriptor = new TypeMappingDescriptor<TextTest>().Properties(p => p
 				.Text(t => t
@@ -25,8 +28,30 @@ public void CanAssignAndAccessLocalMetadata()
 
 			visitor.MetadataCount.Should().Be(1);
 		}
+
+		[U]
+		public void CanAssignAndAccessLocalMetadataFluent()
+		{
+			var descriptor = new TypeMappingDescriptor<TextTest>().Properties(p => p
+				.Text(t => t
+				.Name(o => o.Full)
+				.Norms()
+				.LocalMetadata(m => m
+					.Add("Test", "TestValue")
+				)
+			)) as ITypeMapping;
+
+			var visitor = new LocalMatadataVisitor();
+			var walker = new MappingWalker(visitor);
+			walker.Accept(descriptor.Properties);
+
+			visitor.MetadataCount.Should().Be(1);
+		}
 	}
+}
 
+namespace Tests.Mapping.LocalMetadata.Extensions
+{
 	public static class TestLocalMetadataMappingExtensions
 	{
 		public static TDescriptor AddTestLocalMetadata<TDescriptor>(this TDescriptor descriptor)

src/Tests/Tests.csproj

@@ -391,7 +391,8 @@
     <Compile Include="Ingest\PutPipeline\PutPipelineUrlTests.cs" />
     <Compile Include="Ingest\SimulatePipeline\SimulatePipelineApiTests.cs" />
     <Compile Include="Ingest\SimulatePipeline\SimulatePipelineUrlTests.cs" />
-    <Compile Include="Mapping\Metafields\LocalMetadataTests.cs" />
+    <Compile Include="Mapping\LocalMetadata\LocalMetadataUsageTests.cs" />
+    <Compile Include="Mapping\LocalMetadata\LocalMetadataVisitorTests.cs" />
     <Compile Include="Mapping\Types\Core\Keyword\KeywordMappingTests.cs" />
     <Compile Include="Mapping\Types\Core\Percolator\PercolatorMappingTests.cs" />
     <Compile Include="Mapping\Types\Core\Text\TextMappingTests.cs" />