Fix indexed geo shape Field property serialization

Author: gmarz

src/Nest/DSL/Filter/GeoIndexedShapeFilterDescriptor.cs

@@ -16,7 +16,7 @@ public interface IGeoIndexedShapeFilter : IGeoShapeBaseFilter
 	{
 
 		[JsonProperty("indexed_shape")]
-		GeoIndexedShapeVector IndexedShape { get; set; }
+		GeoIndexedShape IndexedShape { get; set; }
 	}
 
 	public class GeoIndexedShapeFilter : PlainFilter, IGeoIndexedShapeFilter
@@ -28,7 +28,7 @@ protected internal override void WrapInContainer(IFilterContainer container)
 
 		public PropertyPathMarker Field { get; set; }
 
-		public GeoIndexedShapeVector IndexedShape { get; set; }
+		public GeoIndexedShape IndexedShape { get; set; }
 	}
 
 	public class GeoIndexedShapeFilterDescriptor : FilterBase, IGeoIndexedShapeFilter
@@ -43,7 +43,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
-		GeoIndexedShapeVector IGeoIndexedShapeFilter.IndexedShape { get; set; }
+		GeoIndexedShape IGeoIndexedShapeFilter.IndexedShape { get; set; }
 
 		public GeoIndexedShapeFilterDescriptor Lookup<T>(string field, string id, string index = null, string type = null)
 		{
@@ -52,7 +52,7 @@ public GeoIndexedShapeFilterDescriptor Lookup<T>(string field, string id, string
 
 		private GeoIndexedShapeFilterDescriptor _SetShape<T>(PropertyPathMarker field, string id, string index, string type)
 		{
-			((IGeoIndexedShapeFilter)this).IndexedShape = new GeoIndexedShapeVector
+			((IGeoIndexedShapeFilter)this).IndexedShape = new GeoIndexedShape
 			{
 				Field = field,
 				Id = id,

src/Nest/Domain/DSL/GeoIndexedShapeVector.cs renamed to src/Nest/Domain/DSL/GeoIndexedShape.cs

@@ -4,10 +4,10 @@
 namespace Nest
 {
 	/// <summary>
-	/// An object to describe a geoshape vetor
+	/// An object to describe an indexed geoshape
 	/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html
 	/// </summary>
-	public class GeoIndexedShapeVector
+	public class GeoIndexedShape
 	{
 		[JsonProperty("id")]
 		public string Id { get; set; }
@@ -18,7 +18,7 @@ public class GeoIndexedShapeVector
 		[JsonProperty("index")]
 		public IndexNameMarker Index { get; set; }
 
-		[JsonProperty("shape_field_name")]
+		[JsonProperty("path")]
 		public PropertyPathMarker Field { get; set; }
 	}
 }

src/Nest/Nest.csproj

@@ -369,7 +369,7 @@
     <Compile Include="Extensions\TypeExtensions.cs" />
     <Compile Include="RawDispatch.generated.cs" />
     <Compile Include="RawDispatch.cs" />
-    <Compile Include="Domain\DSL\GeoIndexedShapeVector.cs" />
+    <Compile Include="Domain\DSL\GeoIndexedShape.cs" />
     <Compile Include="Domain\Mapping\Descriptors\CompletionMappingDescriptor.cs" />
     <Compile Include="Domain\Mapping\Types\CompletionMapping.cs" />
     <Compile Include="Domain\Responses\RootVersionInfoResponse.cs" />

src/Nest/Resolvers/Converters/Filters/GeoShapeFilterJsonReader.cs

@@ -63,11 +63,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 						else if (indexedShape != null)
 						{
 							IGeoIndexedShapeFilter f = new GeoIndexedShapeFilterDescriptor();
-							f.IndexedShape = new GeoIndexedShapeVector();
+							f.IndexedShape = new GeoIndexedShape();
 							var id = indexedShape["id"];
 							var index = indexedShape["index"];
 							var type = indexedShape["type"];
-							var shapeField = indexedShape["shape_field_name"];
+							var shapeField = indexedShape["path"];
 
 							if (id != null) f.IndexedShape.Id = id.Value<string>();
 							if (index != null) f.IndexedShape.Index = index.Value<string>();

src/Tests/Nest.Tests.Unit/Search/Filter/Singles/GeoIndexedShapeFilterJson.cs

@@ -30,7 +30,7 @@ public void GeoShapeFilter()
 								id: ""1"",
 								type: ""elasticsearchprojects"",
 								index: ""nest_test_data"",
-								shape_field_name: ""myGeoShape""
+								path: ""myGeoShape""
 							}
 						},
 						_cache: true,