Skip to content

[Backport 8.4] Remove geo-dependant types until code-gen is implemented #6821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#nullable restore
namespace Elastic.Clients.Elasticsearch;
public partial class SearchResponse<TDocument> : ElasticsearchResponseBase
public sealed partial class SearchResponse<TDocument> : ElasticsearchResponseBase
{
[JsonInclude]
[JsonPropertyName("aggregations")]
Expand Down Expand Up @@ -76,4 +76,4 @@ public partial class SearchResponse<TDocument> : ElasticsearchResponseBase
[JsonInclude]
[JsonPropertyName("took")]
public long Took { get; init; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -451,48 +451,6 @@ public override void Write(Utf8JsonWriter writer, FieldSortNumericType value, Js
}
}

[JsonConverter(typeof(GeoDistanceTypeConverter))]
public enum GeoDistanceType
{
[EnumMember(Value = "plane")]
Plane,
[EnumMember(Value = "arc")]
Arc
}

internal sealed class GeoDistanceTypeConverter : JsonConverter<GeoDistanceType>
{
public override GeoDistanceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var enumString = reader.GetString();
switch (enumString)
{
case "plane":
return GeoDistanceType.Plane;
case "arc":
return GeoDistanceType.Arc;
}

ThrowHelper.ThrowJsonException();
return default;
}

public override void Write(Utf8JsonWriter writer, GeoDistanceType value, JsonSerializerOptions options)
{
switch (value)
{
case GeoDistanceType.Plane:
writer.WriteStringValue("plane");
return;
case GeoDistanceType.Arc:
writer.WriteStringValue("arc");
return;
}

writer.WriteNullValue();
}
}

[JsonConverter(typeof(GeoShapeRelationConverter))]
public enum GeoShapeRelation
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,55 +409,6 @@ public override void Write(Utf8JsonWriter writer, FunctionScoreMode value, JsonS
}
}

[JsonConverter(typeof(GeoValidationMethodConverter))]
public enum GeoValidationMethod
{
[EnumMember(Value = "strict")]
Strict,
[EnumMember(Value = "ignore_malformed")]
IgnoreMalformed,
[EnumMember(Value = "coerce")]
Coerce
}

internal sealed class GeoValidationMethodConverter : JsonConverter<GeoValidationMethod>
{
public override GeoValidationMethod Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var enumString = reader.GetString();
switch (enumString)
{
case "strict":
return GeoValidationMethod.Strict;
case "ignore_malformed":
return GeoValidationMethod.IgnoreMalformed;
case "coerce":
return GeoValidationMethod.Coerce;
}

ThrowHelper.ThrowJsonException();
return default;
}

public override void Write(Utf8JsonWriter writer, GeoValidationMethod value, JsonSerializerOptions options)
{
switch (value)
{
case GeoValidationMethod.Strict:
writer.WriteStringValue("strict");
return;
case GeoValidationMethod.IgnoreMalformed:
writer.WriteStringValue("ignore_malformed");
return;
case GeoValidationMethod.Coerce:
writer.WriteStringValue("coerce");
return;
}

writer.WriteNullValue();
}
}

[JsonConverter(typeof(OperatorConverter))]
public enum Operator
{
Expand Down
Loading