Merge branch 'develop' of https://github.com/elasticsearch/elasticsearch-net into develop

Author: gmarz

src/Nest/Domain/Mapping/Descriptors/PropertiesDescriptor.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Elasticsearch.Net;
@@ -167,6 +168,16 @@ public PropertiesDescriptor<T> Completion(Func<CompletionMappingDescriptor<T>, C
             return this;
         }
 
+		public PropertiesDescriptor<T> Custom(IElasticType customMapping)
+		{
+			customMapping.ThrowIfNull("customMapping");
+			if (customMapping.Name.IsConditionless())
+                throw new Exception("Could not get field name for custom mapping");
+				
+
+			this.Properties.Add(customMapping.Name, customMapping);
+			return this;
+		}
 		//Reminder if you are adding a new mapping type, may one appear in the future
 		//Add them to PropertiesDescriptor, CorePropertiesDescriptor (if its a new core type), SingleMappingDescriptor
 	}

src/Tests/Nest.Tests.Unit/Core/Map/CustomMapping/ImagePluginMappingTests.cs

@@ -0,0 +1,58 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+
+namespace Nest.Tests.Unit.Core.Map.CustomMapping
+{
+	[TestFixture]
+	public class ImagePluginMappingTests : BaseJsonTests
+	{
+
+		public class ImagePluginType : IElasticType
+		{
+			public PropertyNameMarker Name { get; set; }
+			public TypeNameMarker Type { get { return "image";  } }
+
+
+			public IDictionary<string, object> Feature { get; set; }
+			public IDictionary<string, object> MetaData { get; set; }
+		}
+
+		[Test]
+		public void RepresentUnknowImageMappingPlugin()
+		{
+			var imagePluginMapping = new ImagePluginType()
+			{
+				Name = "my_img",
+				Feature = new Dictionary<string, object>
+				{
+					{ "CEDD", new { hash = "BIT_SAMPLING"} },
+					{ "JCD", new { hash = new [] {"BIT_SAMPLING", "LSH"}} }
+				},
+				MetaData = new Dictionary<string, object>
+				{
+					
+					{	"jpeg.image_width", new {
+							type = "string",
+							store = "yes"
+						}
+					},
+					{	"jpeg.image_height", new {
+							type= "string",
+							store= "yes"
+						}
+					}
+				}
+			};
+
+			var result = this._client.Map<ElasticsearchProject>(m => m
+				.Properties(p=>p
+					.Custom(imagePluginMapping)
+				)
+			);
+			this.JsonEquals(result.ConnectionStatus.Request, MethodInfo.GetCurrentMethod()); 
+		}
+	}
+}

src/Tests/Nest.Tests.Unit/Core/Map/CustomMapping/RepresentUnknowImageMappingPlugin.json

@@ -0,0 +1,31 @@
+{
+  "elasticsearchprojects": {
+    "properties": {
+      "my_img": {
+        "name": "my_img",
+        "type": "image",
+        "feature": {
+          "CEDD": {
+            "hash": "BIT_SAMPLING"
+          },
+          "JCD": {
+            "hash": [
+              "BIT_SAMPLING",
+              "LSH"
+            ]
+          }
+        },
+        "metaData": {
+          "jpeg.image_width": {
+            "type": "string",
+            "store": "yes"
+          },
+          "jpeg.image_height": {
+            "type": "string",
+            "store": "yes"
+          }
+        }
+      }
+    }
+  }
+}

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -122,6 +122,7 @@
     <Compile Include="Core\Bulk\BulkTests.cs" />
     <Compile Include="Core\Bulk\BulkUrlTests.cs" />
     <Compile Include="Core\Indices\Analysis\Analyzers\AnalyzerTests.cs" />
+    <Compile Include="Core\Map\CustomMapping\ImagePluginMappingTests.cs" />
     <Compile Include="Core\Map\MappingBehaviourTests.cs" />
     <None Include="Cluster\PutSettings\PutSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -150,6 +151,9 @@
     <None Include="Core\Indices\Analysis\Analyzers\PatternAnalyzerTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Core\Map\CustomMapping\RepresentUnknowImageMappingPlugin.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Core\Map\Properties\MultiFieldPropertyWithJustNamePath.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>