Skip to content

Commit 587521c

Browse files
committed
Remove usage of deprecate properties
1 parent b42a304 commit 587521c

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

src/Tests/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQueryUsageTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ public GeoBoundingBoxUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i
1313
geo_bounding_box = new
1414
{
1515
type = "indexed",
16-
coerce = true,
17-
ignore_malformed = true,
1816
validation_method = "strict",
1917
_name = "named_query",
2018
boost = 1.1,
@@ -45,8 +43,6 @@ public GeoBoundingBoxUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i
4543
BottomRight = new GeoLocation(-34,34),
4644
},
4745
Type = GeoExecution.Indexed,
48-
Coerce = true,
49-
IgnoreMalformed = true,
5046
ValidationMethod = GeoValidationMethod.Strict
5147
};
5248

@@ -59,8 +55,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
5955
.TopLeft(34, -34)
6056
.BottomRight(-34, 34)
6157
)
62-
.Coerce()
63-
.IgnoreMalformed()
6458
.ValidationMethod(GeoValidationMethod.Strict)
6559
.Type(GeoExecution.Indexed)
6660
);

src/Tests/QueryDsl/Geo/DistanceRange/GeoDistanceRangeQueryUsageTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ public GeoDistanceRangeUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base
1818
lte = "400.0mi",
1919
distance_type = "arc",
2020
optimize_bbox = "indexed",
21-
coerce = true,
22-
ignore_malformed = true,
2321
validation_method = "strict",
2422
_name = "named_query",
2523
boost = 1.1,
@@ -37,9 +35,7 @@ public GeoDistanceRangeUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base
3735
Name = "named_query",
3836
Field = Infer.Field<Project>(p=>p.Location),
3937
DistanceType = GeoDistanceType.Arc,
40-
Coerce = true,
4138
GreaterThanOrEqualTo = Nest.Distance.Kilometers(200),
42-
IgnoreMalformed = true,
4339
GreaterThan = Nest.Distance.Kilometers(200),
4440
LessThan = Nest.Distance.Miles(400),
4541
Location = new GeoLocation(40, -70),
@@ -54,10 +50,8 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
5450
.Name("named_query")
5551
.Field(p=>p.Location)
5652
.DistanceType(GeoDistanceType.Arc)
57-
.Coerce()
5853
.GreaterThanOrEqualTo(200, DistanceUnit.Kilometers)
5954
.GreaterThan(200, DistanceUnit.Kilometers)
60-
.IgnoreMalformed()
6155
.Location(new GeoLocation(40, -70))
6256
.Optimize(GeoOptimizeBBox.Indexed)
6357
.LessThanOrEqualTo(Nest.Distance.Miles(400))

src/Tests/QueryDsl/Geo/Polygon/GeoPolygonQueryUsageTests.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
using Nest;
33
using Tests.Framework.Integration;
44
using Tests.Framework.MockData;
5-
using static Nest.Infer;
65

7-
namespace Tests.QueryDsl.FullText.GeoPolygon
6+
namespace Tests.QueryDsl.Geo.Polygon
87
{
98
public class GeoPolygonUsageTests : QueryDslUsageTestsBase
109
{
@@ -16,8 +15,6 @@ public GeoPolygonUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, us
1615
{
1716
_name = "named_query",
1817
boost = 1.1,
19-
coerce = true,
20-
ignore_malformed = true,
2118
validation_method = "strict",
2219
location = new
2320
{
@@ -35,19 +32,15 @@ public GeoPolygonUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, us
3532
Boost = 1.1,
3633
Name = "named_query",
3734
ValidationMethod = GeoValidationMethod.Strict,
38-
Coerce = true,
39-
IgnoreMalformed = true,
4035
Points = new [] { new GeoLocation(45,-45), new GeoLocation(-34,34), },
41-
Field = Field<Project>(p=>p.Location)
36+
Field = Infer.Field<Project>(p=>p.Location)
4237
};
4338

4439
protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
4540
.GeoPolygon(c => c
4641
.Name("named_query")
4742
.Boost(1.1)
4843
.Field(p=>p.Location)
49-
.IgnoreMalformed()
50-
.Coerce()
5144
.ValidationMethod(GeoValidationMethod.Strict)
5245
.Points( new GeoLocation(45,-45), new GeoLocation(-34,34))
5346
);

0 commit comments

Comments
 (0)