Fix Query DSL usage tests (#3804)

This commit removes the lenient assertion within QueryDslUsagesTestsBase that allowed parsing exceptions in Elasticsearch to pass. This was a temporary solution whilst upgrading the client to work with Elasticsearch 7.x.

Add an IGeoShape property to Project called LocationShape, and always seeds it with a PointGeoShape. Rename Location to LocationPoint

Update the GeoShapeFormatter to skip over the value of a field within JSON when it is not the type field. String allocations for property names are reduced by comparing fields to static byte fields.

Fix the serialized ordering of lat lon values in the geo_shape query using an envelope, since server side validation only allows valid envelopes.

Skip multi_point and circle geo_shape queries for now as both result in 400 error responses.

Do not set id when MoreLikeThis query input is a document

GeoPolygon query requires a minimum of 3 coordinates

Author: russcam

src/CodeGeneration/DocGenerator/StringExtensions.cs

@@ -62,7 +62,7 @@ public static class StringExtensions
 			{ "Script.Map", "\"if (doc['state'].value == \\\"Stable\\\") { params._agg.commits.add(doc['numberOfCommits'].value) }\"" },
 			{ "Script.Combine", "\"def sum = 0.0; for (c in params._agg.commits) { sum += c } return sum\"" },
 			{ "Script.Reduce", "\"def sum = 0.0; for (a in params._aggs) { sum += a } return sum\"" },
-			{ "EnvelopeCoordinates", @"new [] { new [] { 45.0, -45.0 }, new [] { -45.0, 45.0 }}" },
+			{ "EnvelopeCoordinates", @"new [] { new [] { -45.0, 45.0 }, new [] { 45.0, -45.0 }}" },
 			{ "CircleCoordinates", @"new [] { 45.0, -45.0 }" },
 			{ "MultiPointCoordinates", @"new [] { new [] {38.897676, -77.03653}, new [] {38.889939, -77.009051} }" },
 			{
@@ -117,12 +117,6 @@ public static class StringExtensions
 			},
 			{ "LineStringCoordinates", @"new [] { new [] {38.897676, -77.03653}, new [] {38.889939, -77.009051} }" },
 			{ "PointCoordinates", "new[] { 38.897676, -77.03653 }" },
-			{
-			  "_polygonCoordinates", @"new[]{
-										new []{ new [] {10.0, -17.0}, new [] {15.0, 16.0}, new [] {0.0, 12.0}, new [] {-15.0, 16.0}, new [] {-10.0, -17.0},new [] {10.0, -17.0}},
-										new []{ new [] {8.2, 18.2}, new [] {8.2, -18.8}, new [] {-8.8, -10.8}, new [] {8.8, 18.2}}
-									}"
-			},
 			{ "ProjectFilterExpectedJson", "new {term = new {type = new {value = \"project\"}}}" }
 		};
 

src/Nest/Mapping/Visitor/PropertyWalker.cs

@@ -162,6 +162,9 @@ private static IProperty InferProperty(PropertyInfo propertyInfo)
 			if (type == typeof(QueryContainer))
 				return new PercolatorProperty();
 
+			if (type == typeof(IGeoShape))
+				return new GeoShapeProperty();
+
 			return new ObjectProperty();
 		}
 

src/Tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs

@@ -328,7 +328,10 @@ public static PropertiesDescriptor<TProject> ProjectProperties<TProject>(Propert
 				.Properties(DeveloperProperties)
 			)
 			.GeoPoint(g => g
-				.Name(p => p.Location)
+				.Name(p => p.LocationPoint)
+			)
+			.GeoShape(g => g
+				.Name(p => p.LocationShape)
 			)
 			.Completion(cm => cm
 				.Name(p => p.Suggest)

src/Tests/Tests.Domain/Project.cs

@@ -23,7 +23,8 @@ public class Project
 		public JoinField Join => JoinField.Root<Project>();
 		public DateTime LastActivity { get; set; }
 		public Developer LeadDeveloper { get; set; }
-		public SimpleGeoPoint Location { get; set; }
+		public SimpleGeoPoint LocationPoint { get; set; }
+		public IGeoShape LocationShape { get; set; }
 		public Dictionary<string, Metadata> Metadata { get; set; }
 		public string Name { get; set; }
 		public int? NumberOfCommits { get; set; }
@@ -57,7 +58,8 @@ [StringEnum] [JsonConverter(typeof(StringEnumConverter))]
 				.RuleFor(p => p.LeadDeveloper, p => Developer.Developers[Gimme.Random.Number(0, Developer.Developers.Count - 1)])
 				.RuleFor(p => p.Tags, f => Tag.Generator.Generate(Gimme.Random.Number(2, 50)))
 				.RuleFor(p => p.CuratedTags, f => Tag.Generator.Generate(Gimme.Random.Number(1, 5)))
-				.RuleFor(p => p.Location, f => SimpleGeoPoint.Generator.Generate())
+				.RuleFor(p => p.LocationPoint, f => SimpleGeoPoint.Generator.Generate())
+				.RuleFor(p => p.LocationShape, f => new PointGeoShape(new GeoCoordinate(f.Address.Latitude(), f.Address.Latitude())))
 				.RuleFor(p => p.NumberOfCommits, f => Gimme.Random.Number(1, 1000))
 				.RuleFor(p => p.NumberOfContributors, f => Gimme.Random.Number(1, 200))
 				.RuleFor(p => p.Ranges, f => Ranges.Generator.Generate())
@@ -84,7 +86,7 @@ [StringEnum] [JsonConverter(typeof(StringEnumConverter))]
 			LeadDeveloper = new Developer() { FirstName = "Martijn", LastName = "Laarman" },
 			StartedOn = new DateTime(2015, 1, 1),
 			DateString = new DateTime(2015, 1, 1).ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"),
-			Location = new SimpleGeoPoint { Lat = 42.1523, Lon = -80.321 },
+			LocationPoint = new SimpleGeoPoint { Lat = 42.1523, Lon = -80.321 },
 			SourceOnly = TestConfiguration.Instance.Random.SourceSerializer ? new SourceOnlyObject() : null
 		};
 
@@ -102,7 +104,7 @@ [StringEnum] [JsonConverter(typeof(StringEnumConverter))]
 			numberOfContributors = 0,
 			dateString = new DateTime(2015, 1, 1).ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"),
 			leadDeveloper = new { gender = "Male", id = 0, firstName = "Martijn", lastName = "Laarman" },
-			location = new { lat = Instance.Location.Lat, lon = Instance.Location.Lon }
+			locationPoint = new { lat = Instance.LocationPoint.Lat, lon = Instance.LocationPoint.Lon }
 		};
 
 		private static readonly object InstanceAnonymousSourceSerializer = new
@@ -117,7 +119,7 @@ [StringEnum] [JsonConverter(typeof(StringEnumConverter))]
 			numberOfContributors = 0,
 			dateString = new DateTime(2015, 1, 1).ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"),
 			leadDeveloper = new { gender = "Male", id = 0, firstName = "Martijn", lastName = "Laarman" },
-			location = new { lat = Instance.Location.Lat, lon = Instance.Location.Lon },
+			locationPoint = new { lat = Instance.LocationPoint.Lat, lon = Instance.LocationPoint.Lon },
 			sourceOnly = new { notWrittenByDefaultSerializer = "written" }
 		};
 

src/Tests/Tests/Aggregations/Bucket/GeoDistance/GeoDistanceAggregationUsageTests.cs

@@ -21,7 +21,7 @@ public GeoDistanceAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 			{
 				geo_distance = new
 				{
-					field = "location",
+					field = "locationPoint",
 					origin = new
 					{
 						lat = 52.376,
@@ -39,7 +39,7 @@ public GeoDistanceAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.GeoDistance("rings_around_amsterdam", g => g
-				.Field(p => p.Location)
+				.Field(p => p.LocationPoint)
 				.Origin(52.376, 4.894)
 				.Ranges(
 					r => r.To(100),
@@ -51,7 +51,7 @@ public GeoDistanceAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 		protected override AggregationDictionary InitializerAggs =>
 			new GeoDistanceAggregation("rings_around_amsterdam")
 			{
-				Field = Field((Project p) => p.Location),
+				Field = Field((Project p) => p.LocationPoint),
 				Origin = "52.376, 4.894",
 				Ranges = new List<AggregationRange>
 				{

src/Tests/Tests/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregationUsageTests.cs

@@ -19,7 +19,7 @@ public GeoHashGridAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 			{
 				geohash_grid = new
 				{
-					field = "location",
+					field = "locationPoint",
 					precision = 3,
 					size = 1000,
 					shard_size = 100
@@ -29,7 +29,7 @@ public GeoHashGridAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.GeoHash("my_geohash_grid", g => g
-				.Field(p => p.Location)
+				.Field(p => p.LocationPoint)
 				.GeoHashPrecision(GeoHashPrecision.Precision3)
 				.Size(1000)
 				.ShardSize(100)
@@ -38,7 +38,7 @@ public GeoHashGridAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 		protected override AggregationDictionary InitializerAggs =>
 			new GeoHashGridAggregation("my_geohash_grid")
 			{
-				Field = Field<Project>(p => p.Location),
+				Field = Field<Project>(p => p.LocationPoint),
 				Precision = GeoHashPrecision.Precision3,
 				Size = 1000,
 				ShardSize = 100

src/Tests/Tests/Aggregations/Metric/GeoBounds/GeoBoundsAggregationUsageTests.cs

@@ -19,20 +19,20 @@ public GeoBoundsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) :
 			{
 				geo_bounds = new
 				{
-					field = "location",
+					field = "locationPoint",
 					wrap_longitude = true
 				}
 			}
 		};
 
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.GeoBounds("viewport", gb => gb
-				.Field(p => p.Location)
+				.Field(p => p.LocationPoint)
 				.WrapLongitude(true)
 			);
 
 		protected override AggregationDictionary InitializerAggs =>
-			new GeoBoundsAggregation("viewport", Field<Project>(p => p.Location))
+			new GeoBoundsAggregation("viewport", Field<Project>(p => p.LocationPoint))
 			{
 				WrapLongitude = true
 			};

src/Tests/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs

@@ -25,18 +25,18 @@ public GeoCentroidAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 			{
 				geo_centroid = new
 				{
-					field = "location"
+					field = "locationPoint"
 				}
 			}
 		};
 
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.GeoCentroid("centroid", gb => gb
-				.Field(p => p.Location)
+				.Field(p => p.LocationPoint)
 			);
 
 		protected override AggregationDictionary InitializerAggs =>
-			new GeoCentroidAggregation("centroid", Infer.Field<Project>(p => p.Location));
+			new GeoCentroidAggregation("centroid", Infer.Field<Project>(p => p.LocationPoint));
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
@@ -76,7 +76,7 @@ public NestedGeoCentroidAggregationUsageTests(ReadOnlyCluster i, EndpointUsage u
 					{
 						geo_centroid = new
 						{
-							field = "location"
+							field = "locationPoint"
 						}
 					}
 				}
@@ -88,7 +88,7 @@ public NestedGeoCentroidAggregationUsageTests(ReadOnlyCluster i, EndpointUsage u
 				.Field(p => p.Name)
 				.Aggregations(sa => sa
 					.GeoCentroid("centroid", gb => gb
-						.Field(p => p.Location)
+						.Field(p => p.LocationPoint)
 					)
 				)
 			);
@@ -97,7 +97,7 @@ public NestedGeoCentroidAggregationUsageTests(ReadOnlyCluster i, EndpointUsage u
 			new TermsAggregation("projects")
 			{
 				Field = Infer.Field<Project>(p => p.Name),
-				Aggregations = new GeoCentroidAggregation("centroid", Infer.Field<Project>(p => p.Location))
+				Aggregations = new GeoCentroidAggregation("centroid", Infer.Field<Project>(p => p.LocationPoint))
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
@@ -128,17 +128,17 @@ public GeoCentroidNoResultsAggregationUsageTests(ReadOnlyCluster i, EndpointUsag
 		{
 			centroid = new
 			{
-				geo_centroid = new { field = "location" }
+				geo_centroid = new { field = "locationPoint" }
 			}
 		};
 
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.GeoCentroid("centroid", gb => gb
-				.Field(p => p.Location)
+				.Field(p => p.LocationPoint)
 			);
 
 		protected override AggregationDictionary InitializerAggs =>
-			new GeoCentroidAggregation("centroid", Infer.Field<Project>(p => p.Location));
+			new GeoCentroidAggregation("centroid", Infer.Field<Project>(p => p.LocationPoint));
 
 		protected override QueryContainer QueryScope => new TermQuery { Field = Infer.Field<Project>(p => p.Name), Value = "noresult" };
 		protected override object QueryScopeJson { get; } = new { term = new { name = new { value = "noresult" } } };

src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldsEqualityTests.cs

@@ -61,7 +61,7 @@ [U] public void TypedNotEq()
 			t1.Should().NotBeEquivalentTo(t2);
 
 			t1 = Infer.Field<Project>(p => p.Name, 1.0);
-			t2 = Infer.Field<Project>(p => p.Location, 1.0);
+			t2 = Infer.Field<Project>(p => p.LocationPoint, 1.0);
 			(t1 != t2).ShouldBeTrue(t2);
 			t1.Should().NotBeEquivalentTo(t2);
 		}

src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs

@@ -69,7 +69,7 @@ public PutMappingApiTests(WritableCluster cluster, EndpointUsage usage) : base(c
 					},
 					type = "object"
 				},
-				location = new
+				locationPoint = new
 				{
 					properties = new
 					{
@@ -78,6 +78,10 @@ public PutMappingApiTests(WritableCluster cluster, EndpointUsage usage) : base(c
 					},
 					type = "object"
 				},
+				locationShape = new
+				{
+					type = "geo_shape"
+				},
 				metadata = new { type = "object" },
 				name = new
 				{
@@ -236,7 +240,7 @@ public PutMappingApiTests(WritableCluster cluster, EndpointUsage usage) : base(c
 					}
 				},
 				{
-					p => p.Location, new ObjectProperty
+					p => p.LocationPoint, new ObjectProperty
 					{
 						Properties = new Properties<SimpleGeoPoint>
 						{
@@ -245,6 +249,7 @@ public PutMappingApiTests(WritableCluster cluster, EndpointUsage usage) : base(c
 						}
 					}
 				},
+				{ p => p.LocationShape, new GeoShapeProperty() },
 				{ p => p.Metadata, new ObjectProperty() },
 				{ p => p.Name, new TextProperty { Index = false } },
 				{ p => p.NumberOfCommits, new NumberProperty(NumberType.Integer) },