Skip to content

Commit 7a23e7d

Browse files
committed
Changes to queries for 5.0 (#2046)
See https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking_50_search_changes.html#_changes_to_queries for details. See #1997 deprecate fuzziness ratio and make setting it a noop. It looks like this was deprecated in 1.7 and should have been removed in 2.0 - https://www.elastic.co/guide/en/elasticsearch/reference/1.7/common-options.html#fuzziness
1 parent d78fc9e commit 7a23e7d

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

Diff for: src/Nest/CommonOptions/Fuzziness/FuzzinessJsonConverter.cs

+4-10
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ internal class FuzzinessJsonConverter : JsonConverter
1212
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
1313
{
1414
var v = value as IFuzziness;
15-
if (v.Auto) writer.WriteValue("AUTO");
16-
else if (v.EditDistance.HasValue) writer.WriteValue(v.EditDistance.Value);
17-
else if (v.Ratio.HasValue) writer.WriteValue(v.Ratio.Value);
18-
else writer.WriteNull();
15+
if (v.Auto) writer.WriteValue("AUTO");
16+
else if (v.EditDistance.HasValue) writer.WriteValue(v.EditDistance.Value);
17+
else writer.WriteNull();
1918
}
2019

2120
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -27,13 +26,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
2726
var editDistance = Convert.ToInt32(reader.Value);
2827
return Fuzziness.EditDistance(editDistance);
2928
}
30-
if (reader.TokenType == JsonToken.Float)
31-
{
32-
var ratio = (reader.Value as double?).GetValueOrDefault(0);
33-
return Fuzziness.Ratio(ratio);
34-
}
3529
return null;
3630
}
3731

3832
}
39-
}
33+
}

Diff for: src/Nest/CommonOptions/Fuzziness/IFuzziness.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+
using System;
2+
using Newtonsoft.Json;
23

34
namespace Nest
45
{
@@ -7,6 +8,8 @@ public interface IFuzziness
78
{
89
bool Auto { get; }
910
int? EditDistance { get; }
11+
12+
[Obsolete("Deprecated. Setting this is a noop")]
1013
double? Ratio { get; }
1114
}
12-
}
15+
}

0 commit comments

Comments
 (0)