diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
index a5a00fa00ab..bfcc4950cff 100644
--- a/src/Nest/Nest.csproj
+++ b/src/Nest/Nest.csproj
@@ -1109,11 +1109,9 @@
-
-
diff --git a/src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs b/src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs
index fd02ab5f9a2..76ca223158c 100644
--- a/src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs
+++ b/src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs
@@ -149,9 +149,6 @@ public interface IQueryContainer
[JsonProperty("geo_polygon")]
IGeoPolygonQuery GeoPolygon { get; set; }
- [JsonProperty("geo_distance_range")]
- IGeoDistanceRangeQuery GeoDistanceRange { get; set; }
-
[JsonProperty("geohash_cell")]
IGeoHashCellQuery GeoHashCell { get; set; }
diff --git a/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs b/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs
index a72081766e7..87cbd2dc05c 100644
--- a/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs
+++ b/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs
@@ -50,7 +50,6 @@ public partial class QueryContainer : IQueryContainer, IDescriptor
private IGeoBoundingBoxQuery _geoBoundingBox;
private IGeoDistanceQuery _geoDistance;
private IGeoPolygonQuery _geoPolygon;
- private IGeoDistanceRangeQuery _geoDistanceRange;
private IGeoHashCellQuery _geoHashCell;
private IScriptQuery _script;
private IExistsQuery _exists;
@@ -115,7 +114,6 @@ private T Set(T value) where T : IQuery
IGeoBoundingBoxQuery IQueryContainer.GeoBoundingBox { get { return _geoBoundingBox; } set { _geoBoundingBox = Set(value); } }
IGeoDistanceQuery IQueryContainer.GeoDistance { get { return _geoDistance; } set { _geoDistance = Set(value); } }
IGeoPolygonQuery IQueryContainer.GeoPolygon { get { return _geoPolygon; } set { _geoPolygon = Set(value); } }
- IGeoDistanceRangeQuery IQueryContainer.GeoDistanceRange { get { return _geoDistanceRange; } set { _geoDistanceRange = Set(value); } }
IGeoHashCellQuery IQueryContainer.GeoHashCell { get { return _geoHashCell; } set { _geoHashCell = Set(value); } }
IScriptQuery IQueryContainer.Script { get { return _script; } set { _script = Set(value); } }
IExistsQuery IQueryContainer.Exists { get { return _exists; } set { _exists = Set(value); } }
diff --git a/src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs b/src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs
index 4f1a2f986e4..2615126e1bd 100644
--- a/src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs
+++ b/src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs
@@ -71,7 +71,7 @@ public QueryContainer Terms(Func, ITermsQuery> selector)
///
/// A fuzzy based query that uses similarity based on Levenshtein (edit distance) algorithm.
- /// Warning: this query is not very scalable with its default prefix length of 0 – in this case,
+ /// Warning: this query is not very scalable with its default prefix length of 0 � in this case,
/// every term will be enumerated and cause an edit score calculation or max_expansions is not set.
///
public QueryContainer Fuzzy(Func, IFuzzyQuery> selector) =>
@@ -157,7 +157,7 @@ public QueryContainer TermRange(Func, ITermRangeQuer
WrapInContainer(selector, (query, container) => container.Range = query);
///
- /// More like this query find documents that are “like” provided text by running it against one or more fields.
+ /// More like this query find documents that are �like� provided text by running it against one or more fields.
///
public QueryContainer MoreLikeThis(Func, IMoreLikeThisQuery> selector) =>
WrapInContainer(selector, (query, container) => container.MoreLikeThis = query);
@@ -241,13 +241,6 @@ public QueryContainer GeoPolygon(Func, IGeoPolygonQ
public QueryContainer GeoHashCell(Func, IGeoHashCellQuery> selector) =>
WrapInContainer(selector, (query, container) => container.GeoHashCell = query);
- ///
- /// Matches documents with a geo_point type field to include only those
- /// that exist within a specific distance range from a given geo_point
- ///
- public QueryContainer GeoDistanceRange(Func, IGeoDistanceRangeQuery> selector) =>
- WrapInContainer(selector, (query, container) => container.GeoDistanceRange = query);
-
///
/// Matches documents with a geo_point type field to include only those
/// that exist within a specific distance from a given geo_point
@@ -449,14 +442,14 @@ public QueryContainer SpanMultiTerm(Func, ISpanM
WrapInContainer(selector, (query, container) => container.SpanMultiTerm = query);
///
- /// Returns matches which enclose another span query.
+ /// Returns matches which enclose another span query.
/// The span containing query maps to Lucene SpanContainingQuery
///
public QueryContainer SpanContaining(Func, ISpanContainingQuery> selector) =>
WrapInContainer(selector, (query, container) => container.SpanContaining = query);
///
- /// Returns Matches which are enclosed inside another span query.
+ /// Returns Matches which are enclosed inside another span query.
/// The span within query maps to Lucene SpanWithinQuery
///
public QueryContainer SpanWithin(Func, ISpanWithinQuery> selector) =>
@@ -472,8 +465,8 @@ public QueryContainer SpanFieldMasking(Func,
WrapInContainer(selector, (query, container) => container.SpanFieldMasking = query);
///
- /// Allows you to use regular expression term queries.
- /// "term queries" means that Elasticsearch will apply the regexp to the terms produced
+ /// Allows you to use regular expression term queries.
+ /// "term queries" means that Elasticsearch will apply the regexp to the terms produced
/// by the tokenizer for that field, and not to the original text of the field.
///
public QueryContainer Regexp(Func, IRegexpQuery> selector) =>
diff --git a/src/Nest/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQuery.cs b/src/Nest/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQuery.cs
index 94303213916..cb3612aa60e 100644
--- a/src/Nest/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQuery.cs
+++ b/src/Nest/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQuery.cs
@@ -13,14 +13,6 @@ public interface IGeoBoundingBoxQuery : IFieldNameQuery
[JsonProperty("type")]
GeoExecution? Type { get; set; }
- [Obsolete("Deprecated. Use ValidationMethod")]
- [JsonProperty("coerce")]
- bool? Coerce { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- [JsonProperty("ignore_malformed")]
- bool? IgnoreMalformed { get; set; }
-
[JsonProperty("validation_method")]
GeoValidationMethod? ValidationMethod { get; set; }
}
@@ -32,11 +24,6 @@ public class GeoBoundingBoxQuery : FieldNameQueryBase, IGeoBoundingBoxQuery
public IBoundingBox BoundingBox { get; set; }
public GeoExecution? Type { get; set; }
- [Obsolete("Deprecated. Use ValidationMethod")]
- public bool? Coerce { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- public bool? IgnoreMalformed { get; set; }
public GeoValidationMethod? ValidationMethod { get; set; }
internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoBoundingBox = this;
@@ -52,8 +39,6 @@ public class GeoBoundingBoxQueryDescriptor
protected override bool Conditionless => GeoBoundingBoxQuery.IsConditionless(this);
IBoundingBox IGeoBoundingBoxQuery.BoundingBox { get; set; }
GeoExecution? IGeoBoundingBoxQuery.Type { get; set; }
- bool? IGeoBoundingBoxQuery.Coerce { get; set; }
- bool? IGeoBoundingBoxQuery.IgnoreMalformed { get; set; }
GeoValidationMethod? IGeoBoundingBoxQuery.ValidationMethod { get; set; }
public GeoBoundingBoxQueryDescriptor BoundingBox(double topLeftLat, double topLeftLon, double bottomRightLat, double bottomRightLon) =>
@@ -67,12 +52,6 @@ public GeoBoundingBoxQueryDescriptor BoundingBox(Func Type(GeoExecution type) => Assign(a => a.Type = type);
- [Obsolete("Deprecated. Use ValidationMethod(GeoValidationMethod? validation)")]
- public GeoBoundingBoxQueryDescriptor Coerce(bool? coerce = true) => Assign(a => a.Coerce = coerce);
-
- [Obsolete("Deprecated. Use ValidationMethod(GeoValidationMethod? validation)")]
- public GeoBoundingBoxQueryDescriptor IgnoreMalformed(bool? ignore = true) => Assign(a => a.IgnoreMalformed = ignore);
-
public GeoBoundingBoxQueryDescriptor ValidationMethod(GeoValidationMethod? validation) => Assign(a => a.ValidationMethod = validation);
}
}
diff --git a/src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs b/src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs
index 39ab8982103..498e3ecac85 100644
--- a/src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs
@@ -13,20 +13,9 @@ public interface IGeoDistanceQuery : IFieldNameQuery
[JsonProperty("distance")]
Distance Distance { get; set; }
- [JsonProperty("optimize_bbox")]
- GeoOptimizeBBox? OptimizeBoundingBox { get; set; }
-
[JsonProperty("distance_type")]
GeoDistanceType? DistanceType { get; set; }
- [Obsolete("Deprecated. Use ValidationMethod")]
- [JsonProperty("coerce")]
- bool? Coerce { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- [JsonProperty("ignore_malformed")]
- bool? IgnoreMalformed { get; set; }
-
[JsonProperty("validation_method")]
GeoValidationMethod? ValidationMethod { get; set; }
@@ -37,15 +26,7 @@ public class GeoDistanceQuery : FieldNameQueryBase, IGeoDistanceQuery
protected override bool Conditionless => IsConditionless(this);
public GeoLocation Location { get; set; }
public Distance Distance { get; set; }
- public GeoOptimizeBBox? OptimizeBoundingBox { get; set; }
public GeoDistanceType? DistanceType { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- public bool? Coerce { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- public bool? IgnoreMalformed { get; set; }
-
public GeoValidationMethod? ValidationMethod { get; set; }
internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoDistance = this;
@@ -62,9 +43,6 @@ public class GeoDistanceQueryDescriptor
GeoLocation IGeoDistanceQuery.Location { get; set; }
Distance IGeoDistanceQuery.Distance { get; set; }
GeoDistanceType? IGeoDistanceQuery.DistanceType { get; set; }
- GeoOptimizeBBox? IGeoDistanceQuery.OptimizeBoundingBox { get; set; }
- bool? IGeoDistanceQuery.Coerce { get; set; }
- bool? IGeoDistanceQuery.IgnoreMalformed { get; set; }
GeoValidationMethod? IGeoDistanceQuery.ValidationMethod { get; set; }
public GeoDistanceQueryDescriptor Location(GeoLocation location) => Assign(a => a.Location = location);
@@ -75,16 +53,8 @@ public class GeoDistanceQueryDescriptor
public GeoDistanceQueryDescriptor Distance(double distance, DistanceUnit unit) => Assign(a => a.Distance = new Distance(distance, unit));
- public GeoDistanceQueryDescriptor Optimize(GeoOptimizeBBox optimize) => Assign(a => a.OptimizeBoundingBox = optimize);
-
public GeoDistanceQueryDescriptor DistanceType(GeoDistanceType type) => Assign(a => a.DistanceType = type);
- [Obsolete("Deprecated. Use ValidationMethod(GeoValidationMethod? validation)")]
- public GeoDistanceQueryDescriptor Coerce(bool? coerce = true) => Assign(a => a.Coerce = coerce);
-
- [Obsolete("Deprecated. Use ValidationMethod(GeoValidationMethod? validation)")]
- public GeoDistanceQueryDescriptor IgnoreMalformed(bool? ignore = true) => Assign(a => a.IgnoreMalformed = ignore);
-
public GeoDistanceQueryDescriptor ValidationMethod(GeoValidationMethod? validation) => Assign(a => a.ValidationMethod = validation);
}
}
diff --git a/src/Nest/QueryDsl/Geo/DistanceRange/GeoDistanceRangeQuery.cs b/src/Nest/QueryDsl/Geo/DistanceRange/GeoDistanceRangeQuery.cs
deleted file mode 100644
index de334a2b745..00000000000
--- a/src/Nest/QueryDsl/Geo/DistanceRange/GeoDistanceRangeQuery.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace Nest
-{
- [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
- [JsonConverter(typeof (VariableFieldNameQueryJsonConverter))]
- public interface IGeoDistanceRangeQuery : IFieldNameQuery
- {
- [VariableField]
- GeoLocation Location { get; set; }
-
- [JsonProperty("gte")]
- Distance GreaterThanOrEqualTo { get; set; }
-
- [JsonProperty("lte")]
- Distance LessThanOrEqualTo { get; set; }
-
- [JsonProperty("gt")]
- Distance GreaterThan { get; set; }
-
- [JsonProperty("lt")]
- Distance LessThan { get; set; }
-
- [JsonProperty("distance_type")]
- GeoDistanceType? DistanceType { get; set; }
-
- [JsonProperty("optimize_bbox")]
- GeoOptimizeBBox? OptimizeBoundingBox { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- [JsonProperty("coerce")]
- bool? Coerce { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- [JsonProperty("ignore_malformed")]
- bool? IgnoreMalformed { get; set; }
-
- [JsonProperty("validation_method")]
- GeoValidationMethod? ValidationMethod { get; set; }
-
- }
-
- public class GeoDistanceRangeQuery : FieldNameQueryBase, IGeoDistanceRangeQuery
- {
- protected override bool Conditionless => IsConditionless(this);
- public GeoLocation Location { get; set; }
- public Distance GreaterThan { get; set; }
- public Distance LessThan { get; set; }
- public Distance GreaterThanOrEqualTo { get; set; }
- public Distance LessThanOrEqualTo { get; set; }
- public GeoDistanceType? DistanceType { get; set; }
- public GeoOptimizeBBox? OptimizeBoundingBox { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- public bool? Coerce { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- public bool? IgnoreMalformed { get; set; }
- public GeoValidationMethod? ValidationMethod { get; set; }
-
- internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoDistanceRange = this;
-
- internal static bool IsConditionless(IGeoDistanceRangeQuery q) =>
- q.Field == null || q.Location == null
- || (q.LessThan == null && q.LessThanOrEqualTo == null && q.GreaterThanOrEqualTo == null && q.GreaterThan == null);
- }
-
- public class GeoDistanceRangeQueryDescriptor : FieldNameQueryDescriptorBase, IGeoDistanceRangeQuery, T>
- , IGeoDistanceRangeQuery where T : class
- {
- protected override bool Conditionless => GeoDistanceRangeQuery.IsConditionless(this);
- GeoLocation IGeoDistanceRangeQuery.Location { get; set; }
- Distance IGeoDistanceRangeQuery.GreaterThanOrEqualTo { get; set; }
- Distance IGeoDistanceRangeQuery.LessThanOrEqualTo { get; set; }
- Distance IGeoDistanceRangeQuery.GreaterThan { get; set; }
- Distance IGeoDistanceRangeQuery.LessThan { get; set; }
- GeoDistanceType? IGeoDistanceRangeQuery.DistanceType { get; set; }
- GeoOptimizeBBox? IGeoDistanceRangeQuery.OptimizeBoundingBox { get; set; }
- bool? IGeoDistanceRangeQuery.Coerce { get; set; }
- bool? IGeoDistanceRangeQuery.IgnoreMalformed { get; set; }
- GeoValidationMethod? IGeoDistanceRangeQuery.ValidationMethod { get; set; }
-
- public GeoDistanceRangeQueryDescriptor Location(GeoLocation geoLocation) => Assign(a => a.Location = geoLocation);
- public GeoDistanceRangeQueryDescriptor Location(double lat, double lon) => Assign(a => a.Location = new GeoLocation(lat, lon));
-
- public GeoDistanceRangeQueryDescriptor GreaterThan(Distance from) => Assign(a => a.GreaterThan = from);
- public GeoDistanceRangeQueryDescriptor GreaterThan(double distance, DistanceUnit unit) =>
- Assign(a => a.GreaterThan = new Distance(distance, unit));
-
- public GeoDistanceRangeQueryDescriptor GreaterThanOrEqualTo(Distance from) => Assign(a => a.GreaterThanOrEqualTo = from);
- public GeoDistanceRangeQueryDescriptor GreaterThanOrEqualTo(double distance, DistanceUnit unit) =>
- Assign(a => a.GreaterThanOrEqualTo = new Distance(distance, unit));
-
- public GeoDistanceRangeQueryDescriptor LessThanOrEqualTo(Distance to) => Assign(a => a.LessThanOrEqualTo = to);
- public GeoDistanceRangeQueryDescriptor LessThanOrEqualTo(double distance, DistanceUnit unit) =>
- Assign(a => a.LessThanOrEqualTo = new Distance(distance, unit));
-
- public GeoDistanceRangeQueryDescriptor LessThan(Distance to) => Assign(a => a.LessThan = to);
- public GeoDistanceRangeQueryDescriptor LessThan(double distance, DistanceUnit unit) =>
- Assign(a => a.LessThan = new Distance(distance, unit));
-
- public GeoDistanceRangeQueryDescriptor Optimize(GeoOptimizeBBox optimize) => Assign(a => a.OptimizeBoundingBox = optimize);
-
- public GeoDistanceRangeQueryDescriptor DistanceType(GeoDistanceType geoDistance) => Assign(a => a.DistanceType = geoDistance);
-
- [Obsolete("Deprecated. Use ValidationMethod(GeoValidationMethod? validation)")]
- public GeoDistanceRangeQueryDescriptor Coerce(bool? coerce = true) => Assign(a => a.Coerce = coerce);
-
- [Obsolete("Deprecated. Use ValidationMethod(GeoValidationMethod? validation)")]
- public GeoDistanceRangeQueryDescriptor IgnoreMalformed(bool? ignore = true) => Assign(a => a.IgnoreMalformed = ignore);
-
- public GeoDistanceRangeQueryDescriptor ValidationMethod(GeoValidationMethod? validation) => Assign(a => a.ValidationMethod = validation);
- }
-}
diff --git a/src/Nest/QueryDsl/Geo/GeoOptimizeBBox.cs b/src/Nest/QueryDsl/Geo/GeoOptimizeBBox.cs
deleted file mode 100644
index 8b75a3ba5f3..00000000000
--- a/src/Nest/QueryDsl/Geo/GeoOptimizeBBox.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace Nest
-{
- [JsonConverter(typeof(StringEnumConverter))]
- public enum GeoOptimizeBBox
- {
- [EnumMember(Value = "memory")]
- Memory,
- [EnumMember(Value = "indexed")]
- Indexed,
- [EnumMember(Value = "none")]
- None
- }
-}
diff --git a/src/Nest/QueryDsl/Geo/Polygon/GeoPolygonQuery.cs b/src/Nest/QueryDsl/Geo/Polygon/GeoPolygonQuery.cs
index 6994de2a6c6..8d593dd996c 100644
--- a/src/Nest/QueryDsl/Geo/Polygon/GeoPolygonQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Polygon/GeoPolygonQuery.cs
@@ -11,14 +11,6 @@ public interface IGeoPolygonQuery : IFieldNameQuery
[VariableField("points")]
IEnumerable Points { get; set; }
- [Obsolete("Deprecated. Use ValidationMethod")]
- [JsonProperty("coerce")]
- bool? Coerce { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- [JsonProperty("ignore_malformed")]
- bool? IgnoreMalformed { get; set; }
-
[JsonProperty("validation_method")]
GeoValidationMethod? ValidationMethod { get; set; }
@@ -29,11 +21,6 @@ public class GeoPolygonQuery : FieldNameQueryBase, IGeoPolygonQuery
protected override bool Conditionless => IsConditionless(this);
public IEnumerable Points { get; set; }
- [Obsolete("Deprecated. Use ValidationMethod")]
- public bool? Coerce { get; set; }
-
- [Obsolete("Deprecated. Use ValidationMethod")]
- public bool? IgnoreMalformed { get; set; }
public GeoValidationMethod? ValidationMethod { get; set; }
internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoPolygon = this;
@@ -46,20 +33,12 @@ public class GeoPolygonQueryDescriptor
{
protected override bool Conditionless => GeoPolygonQuery.IsConditionless(this);
IEnumerable IGeoPolygonQuery.Points { get; set; }
- bool? IGeoPolygonQuery.Coerce { get; set; }
- bool? IGeoPolygonQuery.IgnoreMalformed { get; set; }
GeoValidationMethod? IGeoPolygonQuery.ValidationMethod { get; set; }
public GeoPolygonQueryDescriptor Points(IEnumerable points) => Assign(a => a.Points = points);
public GeoPolygonQueryDescriptor Points(params GeoLocation[] points) => Assign(a => a.Points = points);
- [Obsolete("Deprecated. Use ValidationMethod(GeoValidationMethod? validation)")]
- public GeoPolygonQueryDescriptor Coerce(bool? coerce = true) => Assign(a => a.Coerce = coerce);
-
- [Obsolete("Deprecated. Use ValidationMethod(GeoValidationMethod? validation)")]
- public GeoPolygonQueryDescriptor IgnoreMalformed(bool? ignore = true) => Assign(a => a.IgnoreMalformed = ignore);
-
public GeoPolygonQueryDescriptor ValidationMethod(GeoValidationMethod? validation) => Assign(a => a.ValidationMethod = validation);
}
}
diff --git a/src/Nest/QueryDsl/Query.cs b/src/Nest/QueryDsl/Query.cs
index 9307871caab..e7ed5d41285 100644
--- a/src/Nest/QueryDsl/Query.cs
+++ b/src/Nest/QueryDsl/Query.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Linq.Expressions;
-
-namespace Nest
+using System;
+using System.Linq.Expressions;
+
+namespace Nest
{
public static class Query where T : class
{
@@ -41,9 +41,6 @@ public static QueryContainer GeoBoundingBox(Func, IGeoDistanceQuery> selector) =>
new QueryContainerDescriptor().GeoDistance(selector);
- public static QueryContainer GeoDistanceRange(Func, IGeoDistanceRangeQuery> selector) =>
- new QueryContainerDescriptor().GeoDistanceRange(selector);
-
public static QueryContainer GeoHashCell(Func, IGeoHashCellQuery> selector) =>
new QueryContainerDescriptor().GeoHashCell(selector);
@@ -130,7 +127,7 @@ public static QueryContainer Prefix(Func, IPrefixQuery>
new QueryContainerDescriptor().Prefix(selector);
public static QueryContainer QueryString(Func, IQueryStringQuery> selector) =>
- new QueryContainerDescriptor().QueryString(selector);
+ new QueryContainerDescriptor().QueryString(selector);
public static QueryContainer Range(Func, INumericRangeQuery> selector) =>
new QueryContainerDescriptor().Range(selector);
@@ -188,7 +185,7 @@ public static QueryContainer TermRange(Func, ITermRa
new QueryContainerDescriptor().TermRange(selector);
public static QueryContainer Terms(Func, ITermsQuery> selector) =>
- new QueryContainerDescriptor().Terms(selector);
+ new QueryContainerDescriptor().Terms(selector);
public static QueryContainer Type(Func selector) =>
new QueryContainerDescriptor().Type(selector);
@@ -202,6 +199,6 @@ public static QueryContainer Wildcard(Field field, string value, double? boost =
new QueryContainerDescriptor().Wildcard(field, value, boost, rewrite, name);
public static QueryContainer Wildcard(Func, IWildcardQuery> selector) =>
- new QueryContainerDescriptor().Wildcard(selector);
- }
+ new QueryContainerDescriptor().Wildcard(selector);
+ }
}
diff --git a/src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs b/src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs
index f7f997fc462..955237504e0 100644
--- a/src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs
+++ b/src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs
@@ -151,8 +151,6 @@ private void Write(string queryType, Field field = null)
public virtual void Visit(IGeoPolygonQuery query) => Write("geo_polygon");
- public virtual void Visit(IGeoDistanceRangeQuery query) => Write("geo_distance_range");
-
public virtual void Visit(IGeoDistanceQuery query) => Write("geo_distance");
public virtual void Visit(IGeoHashCellQuery filter) => Write("geohash_cell");
diff --git a/src/Nest/QueryDsl/Visitor/QueryVisitor.cs b/src/Nest/QueryDsl/Visitor/QueryVisitor.cs
index 80912e7336d..44354c51b77 100644
--- a/src/Nest/QueryDsl/Visitor/QueryVisitor.cs
+++ b/src/Nest/QueryDsl/Visitor/QueryVisitor.cs
@@ -59,7 +59,6 @@ public interface IQueryVisitor
void Visit(ITypeQuery query);
void Visit(IScriptQuery query);
void Visit(IGeoPolygonQuery query);
- void Visit(IGeoDistanceRangeQuery query);
void Visit(IGeoDistanceQuery query);
void Visit(IGeoBoundingBoxQuery query);
void Visit(IGeoHashCellQuery query);
@@ -206,8 +205,6 @@ public virtual void Visit(IScriptQuery query) { }
public virtual void Visit(IGeoPolygonQuery query) { }
- public virtual void Visit(IGeoDistanceRangeQuery query) { }
-
public virtual void Visit(IGeoDistanceQuery query) { }
public virtual void Visit(IGeoHashCellQuery query) { }
diff --git a/src/Nest/QueryDsl/Visitor/QueryWalker.cs b/src/Nest/QueryDsl/Visitor/QueryWalker.cs
index 6d629bb4a59..398f2d50717 100644
--- a/src/Nest/QueryDsl/Visitor/QueryWalker.cs
+++ b/src/Nest/QueryDsl/Visitor/QueryWalker.cs
@@ -58,7 +58,6 @@ public void Walk(IQueryContainer qd, IQueryVisitor visitor)
VisitQuery(qd.Script, visitor, (v, d) => v.Visit(d));
VisitQuery(qd.Exists, visitor, (v, d) => v.Visit(d));
VisitQuery(qd.GeoPolygon, visitor, (v, d) => v.Visit(d));
- VisitQuery(qd.GeoDistanceRange, visitor, (v, d) => v.Visit(d));
VisitQuery(qd.GeoDistance, visitor, (v, d) => v.Visit(d));
VisitQuery(qd.GeoBoundingBox, visitor, (v, d) => v.Visit(d));
VisitQuery(qd.GeoHashCell, visitor, (v, d) => v.Visit(d));
diff --git a/src/Tests/QueryDsl/Geo/Distance/GeoDistanceQueryUsageTests.cs b/src/Tests/QueryDsl/Geo/Distance/GeoDistanceQueryUsageTests.cs
index a0280fc3692..5b4dfd00b06 100644
--- a/src/Tests/QueryDsl/Geo/Distance/GeoDistanceQueryUsageTests.cs
+++ b/src/Tests/QueryDsl/Geo/Distance/GeoDistanceQueryUsageTests.cs
@@ -15,7 +15,6 @@ public GeoDistanceUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
_name = "named_query",
boost = 1.1,
distance = "200.0m",
- optimize_bbox = "memory",
distance_type = "arc",
validation_method = "ignore_malformed",
location = new
@@ -34,7 +33,6 @@ public GeoDistanceUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
DistanceType = GeoDistanceType.Arc,
Location = new GeoLocation(34,-34),
Distance = "200.0m",
- OptimizeBoundingBox = GeoOptimizeBBox.Memory,
ValidationMethod = GeoValidationMethod.IgnoreMalformed
};
@@ -46,7 +44,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor
.DistanceType(GeoDistanceType.Arc)
.Location(34, -34)
.Distance("200.0m")
- .Optimize(GeoOptimizeBBox.Memory)
.ValidationMethod(GeoValidationMethod.IgnoreMalformed)
);
diff --git a/src/Tests/QueryDsl/Geo/DistanceRange/GeoDistanceRangeQueryUsageTests.cs b/src/Tests/QueryDsl/Geo/DistanceRange/GeoDistanceRangeQueryUsageTests.cs
deleted file mode 100644
index f36fd639b6c..00000000000
--- a/src/Tests/QueryDsl/Geo/DistanceRange/GeoDistanceRangeQueryUsageTests.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using Nest;
-using Tests.Framework.Integration;
-using Tests.Framework.MockData;
-
-namespace Tests.QueryDsl.Geo.DistanceRange
-{
- public class GeoDistanceRangeUsageTests : QueryDslUsageTestsBase
- {
- public GeoDistanceRangeUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
- protected override object QueryJson => new
- {
- geo_distance_range = new
- {
- gt = "200.0km",
- gte = "200.0km",
- lt = "400.0mi",
- lte = "400.0mi",
- distance_type = "arc",
- optimize_bbox = "indexed",
- validation_method = "strict",
- _name = "named_query",
- boost = 1.1,
- location = new
- {
- lat = 40.0,
- lon = -70.0
- }
- }
- };
-
- protected override QueryContainer QueryInitializer => new GeoDistanceRangeQuery
- {
- Boost = 1.1,
- Name = "named_query",
- Field = Infer.Field(p=>p.Location),
- DistanceType = GeoDistanceType.Arc,
- GreaterThanOrEqualTo = Nest.Distance.Kilometers(200),
- GreaterThan = Nest.Distance.Kilometers(200),
- LessThan = Nest.Distance.Miles(400),
- Location = new GeoLocation(40, -70),
- OptimizeBoundingBox = GeoOptimizeBBox.Indexed,
- LessThanOrEqualTo = Nest.Distance.Miles(400),
- ValidationMethod = GeoValidationMethod.Strict
- };
-
- protected override QueryContainer QueryFluent(QueryContainerDescriptor q) => q
- .GeoDistanceRange(g=>g
- .Boost(1.1)
- .Name("named_query")
- .Field(p=>p.Location)
- .DistanceType(GeoDistanceType.Arc)
- .GreaterThanOrEqualTo(200, DistanceUnit.Kilometers)
- .GreaterThan(200, DistanceUnit.Kilometers)
- .Location(new GeoLocation(40, -70))
- .Optimize(GeoOptimizeBBox.Indexed)
- .LessThanOrEqualTo(Nest.Distance.Miles(400))
- .LessThan(Nest.Distance.Miles(400))
- .ValidationMethod(GeoValidationMethod.Strict)
- );
-
- protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen(a => a.GeoDistanceRange)
- {
- q => {
- q.LessThanOrEqualTo = null;
- q.LessThan = null;
- q.GreaterThanOrEqualTo = null;
- q.GreaterThan = null;
- },
- q => q.Field = null,
- q => q.Location = null
- };
- }
-}
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
index 702688132d2..e413b820a4c 100644
--- a/src/Tests/Tests.csproj
+++ b/src/Tests/Tests.csproj
@@ -543,7 +543,6 @@
-