Skip to content

Commit 9ec3bdd

Browse files
committed
rewrote some lose direct JsonConvert.* calls to call ElasticSerializer instead
1 parent cadcaa9 commit 9ec3bdd

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/Nest/DSL/TemplateMappingDescriptor.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ public class TemplateMappingDescriptor
1515

1616
internal string _Name { get; set; }
1717
internal TemplateMapping _TemplateMapping { get; set; }
18-
private readonly JsonSerializerSettings _serializationSettings;
18+
private readonly ElasticSerializer _serializer;
19+
1920
public TemplateMappingDescriptor(IConnectionSettings connectionSettings)
2021
{
2122
this._TemplateMapping = new TemplateMapping();
2223
this._connectionSettings = connectionSettings;
24+
this._serializer = new ElasticSerializer(this._connectionSettings);
2325
}
2426

2527
public TemplateMappingDescriptor Name(string name)
@@ -85,7 +87,6 @@ public TemplateMappingDescriptor RemoveMapping(string typeName)
8587
return this;
8688
}
8789

88-
8990
public TemplateMappingDescriptor AddWarmer<T>(Func<CreateWarmerDescriptor, CreateWarmerDescriptor> warmerSelector)
9091
where T : class
9192
{
@@ -94,7 +95,7 @@ public TemplateMappingDescriptor AddWarmer<T>(Func<CreateWarmerDescriptor, Creat
9495
warmerDescriptor.ThrowIfNull("warmerDescriptor");
9596
warmerDescriptor._WarmerName.ThrowIfNull("warmer has no name");
9697

97-
var query = JsonConvert.SerializeObject(warmerDescriptor._SearchDescriptor, this._serializationSettings);
98+
var query = this._serializer.Serialize(warmerDescriptor._SearchDescriptor);
9899

99100
var warmer = new WarmerMapping { Name = warmerDescriptor._WarmerName, Types = warmerDescriptor._Types, Source = query };
100101

src/Nest/ElasticClient-MultiGet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private ConnectionStatus _multiGetUsingDescriptor(Action<MultiGetDescriptor> mul
127127
private IEnumerable<T> MultiGet<T>(IEnumerable<string> ids, string path)
128128
where T : class
129129
{
130-
var data = @"{{ ""ids"": {0} }}".F(JsonConvert.SerializeObject(ids));
130+
var data = @"{{ ""ids"": {0} }}".F(this.Serialize(ids));
131131
var response = this.Connection.PostSync(path + "_mget", data);
132132

133133
if (response.Result == null)

src/Nest/Resolvers/Writers/TypeMappingWriter.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ internal class TypeMappingWriter
1414
{
1515
private readonly Type _type;
1616
private readonly PropertyNameResolver _propertyNameResolver = new PropertyNameResolver();
17-
private readonly IConnectionSettings _connectionSettings;
17+
private readonly IConnectionSettings _connectionSettings;
18+
private readonly ElasticSerializer _elasticSerializer;
1819

1920
private int MaxRecursion { get; set; }
2021
private TypeNameMarker TypeName { get; set; }
@@ -30,6 +31,8 @@ public TypeMappingWriter(Type t, TypeNameMarker typeName, IConnectionSettings co
3031

3132
this.SeenTypes = new ConcurrentDictionary<Type, int>();
3233
this.SeenTypes.TryAdd(t, 0);
34+
35+
this._elasticSerializer = new ElasticSerializer(this._connectionSettings);
3336
}
3437
internal TypeMappingWriter(Type t, string typeName, IConnectionSettings connectionSettings, int maxRecursion, ConcurrentDictionary<Type, int> seenTypes)
3538
{
@@ -39,6 +42,8 @@ internal TypeMappingWriter(Type t, string typeName, IConnectionSettings connecti
3942
this.TypeName = typeName;
4043
this.MaxRecursion = maxRecursion;
4144
this.SeenTypes = seenTypes;
45+
46+
this._elasticSerializer = new ElasticSerializer(this._connectionSettings);
4247
}
4348

4449
internal JObject MapPropertiesFromAttributes()
@@ -67,21 +72,21 @@ internal RootObjectMapping RootObjectMappingFromAttributes()
6772
var json = JObject.Parse(this.MapFromAttributes());
6873

6974
var nestedJson = json.Properties().First().Value.ToString();
70-
return JsonConvert.DeserializeObject<RootObjectMapping>(nestedJson);
75+
return this._elasticSerializer.Deserialize<RootObjectMapping>(nestedJson);
7176
}
7277
internal ObjectMapping ObjectMappingFromAttributes()
7378
{
7479
var json = JObject.Parse(this.MapFromAttributes());
7580

7681
var nestedJson = json.Properties().First().Value.ToString();
77-
return JsonConvert.DeserializeObject<ObjectMapping>(nestedJson);
82+
return this._elasticSerializer.Deserialize<ObjectMapping>(nestedJson);
7883
}
7984
internal NestedObjectMapping NestedObjectMappingFromAttributes()
8085
{
8186
var json = JObject.Parse(this.MapFromAttributes());
8287

8388
var nestedJson = json.Properties().First().Value.ToString();
84-
return JsonConvert.DeserializeObject<NestedObjectMapping>(nestedJson);
89+
return this._elasticSerializer.Deserialize<NestedObjectMapping>(nestedJson);
8590
}
8691
internal string MapFromAttributes()
8792
{

0 commit comments

Comments
 (0)