Skip to content

Commit df7dd1a

Browse files
russcamrusscam
committed
Descriptors with methods that take a Func selector should return an interface from the Func
see #1776
1 parent eaa4733 commit df7dd1a

File tree

22 files changed

+231
-300
lines changed

22 files changed

+231
-300
lines changed

Diff for: ‎src/Benchmarking/project.lock.json

+70-148
Large diffs are not rendered by default.

Diff for: ‎src/Elasticsearch.Net/project.lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@
17391739
"runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
17401740
"type": "package",
17411741
"serviceable": true,
1742-
"sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
1742+
"sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
17431743
"files": [
17441744
"ref/dotnet/_._",
17451745
"runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

Diff for: ‎src/Nest/Document/Multiple/Bulk/BulkRequest.cs

+13-16
Original file line numberDiff line numberDiff line change
@@ -22,67 +22,64 @@ public partial class BulkDescriptor
2222

2323
private BulkDescriptor AddOperation(IBulkOperation operation) => Assign(a => a.Operations.AddIfNotNull(operation));
2424

25-
public BulkDescriptor Create<T>(Func<BulkCreateDescriptor<T>, BulkCreateDescriptor<T>> bulkCreateSelector) where T : class =>
25+
public BulkDescriptor Create<T>(Func<BulkCreateDescriptor<T>, IBulkCreateOperation<T>> bulkCreateSelector) where T : class =>
2626
Assign(a => AddOperation(bulkCreateSelector?.Invoke(new BulkCreateDescriptor<T>())));
2727

2828
/// <summary>
2929
/// CreateMany, convenience method to create many documents at once.
3030
/// </summary>
3131
/// <param name="objects">the objects to create</param>
3232
/// <param name="bulkCreateSelector">A func called on each object to describe the individual create operation</param>
33-
public BulkDescriptor CreateMany<T>(IEnumerable<T> @objects, Func<BulkCreateDescriptor<T>, T, BulkCreateDescriptor<T>> bulkCreateSelector = null) where T : class =>
33+
public BulkDescriptor CreateMany<T>(IEnumerable<T> @objects, Func<BulkCreateDescriptor<T>, T, IBulkCreateOperation<T>> bulkCreateSelector = null) where T : class =>
3434
Assign(a => @objects.ForEach(o => AddOperation(bulkCreateSelector.InvokeOrDefault(new BulkCreateDescriptor<T>().Document(o), o))));
35-
36-
//public BulkDescriptor Index<T>(T obj, Func<BulkIndexDescriptor<T>, BulkIndexDescriptor<T>> bulkIndexSelector = null) where T : class =>
37-
// Assign(a => AddOperation(bulkIndexSelector.InvokeOrDefault(new BulkIndexDescriptor<T>()).Document(obj)));
3835

39-
public BulkDescriptor Index<T>(Func<BulkIndexDescriptor<T>, BulkIndexDescriptor<T>> bulkIndexSelector) where T : class =>
36+
public BulkDescriptor Index<T>(Func<BulkIndexDescriptor<T>, IIndexOperation<T>> bulkIndexSelector) where T : class =>
4037
Assign(a => AddOperation(bulkIndexSelector?.Invoke(new BulkIndexDescriptor<T>())));
4138

4239
/// <summary>
4340
/// IndexMany, convenience method to pass many objects at once.
4441
/// </summary>
4542
/// <param name="objects">the objects to index</param>
4643
/// <param name="bulkIndexSelector">A func called on each object to describe the individual index operation</param>
47-
public BulkDescriptor IndexMany<T>(IEnumerable<T> @objects, Func<BulkIndexDescriptor<T>, T, BulkIndexDescriptor<T>> bulkIndexSelector = null) where T : class =>
44+
public BulkDescriptor IndexMany<T>(IEnumerable<T> @objects, Func<BulkIndexDescriptor<T>, T, IIndexOperation<T>> bulkIndexSelector = null) where T : class =>
4845
Assign(a => @objects.ForEach(o => AddOperation(bulkIndexSelector.InvokeOrDefault(new BulkIndexDescriptor<T>().Document(o), o))));
4946

50-
public BulkDescriptor Delete<T>(T obj, Func<BulkDeleteDescriptor<T>, BulkDeleteDescriptor<T>> bulkDeleteSelector = null) where T : class =>
47+
public BulkDescriptor Delete<T>(T obj, Func<BulkDeleteDescriptor<T>, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
5148
Assign(a => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Document(obj))));
5249

53-
public BulkDescriptor Delete<T>(Func<BulkDeleteDescriptor<T>, BulkDeleteDescriptor<T>> bulkDeleteSelector) where T : class =>
50+
public BulkDescriptor Delete<T>(Func<BulkDeleteDescriptor<T>, IBulkDeleteOperation<T>> bulkDeleteSelector) where T : class =>
5451
Assign(a => AddOperation(bulkDeleteSelector?.Invoke(new BulkDeleteDescriptor<T>())));
5552

5653
/// <summary>
5754
/// DeleteMany, convenience method to delete many objects at once.
5855
/// </summary>
5956
/// <param name="objects">the objects to delete</param>
6057
/// <param name="bulkDeleteSelector">A func called on each object to describe the individual delete operation</param>
61-
public BulkDescriptor DeleteMany<T>(IEnumerable<T> @objects, Func<BulkDeleteDescriptor<T>, T, BulkDeleteDescriptor<T>> bulkDeleteSelector = null) where T : class =>
58+
public BulkDescriptor DeleteMany<T>(IEnumerable<T> @objects, Func<BulkDeleteDescriptor<T>, T, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
6259
Assign(a => @objects.ForEach(o => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Document(o), o))));
6360

6461
/// <summary>
6562
/// DeleteMany, convenience method to delete many objects at once.
6663
/// </summary>
6764
/// <param name="ids">Enumerable of string ids to delete</param>
6865
/// <param name="bulkDeleteSelector">A func called on each ids to describe the individual delete operation</param>
69-
public BulkDescriptor DeleteMany<T>(IEnumerable<string> ids, Func<BulkDeleteDescriptor<T>, string, BulkDeleteDescriptor<T>> bulkDeleteSelector = null) where T : class=>
66+
public BulkDescriptor DeleteMany<T>(IEnumerable<string> ids, Func<BulkDeleteDescriptor<T>, string, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class=>
7067
Assign(a => ids.ForEach(o => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Id(o), o))));
7168

7269
/// <summary>
7370
/// DeleteMany, convenience method to delete many objects at once.
7471
/// </summary>
7572
/// <param name="ids">Enumerable of int ids to delete</param>
7673
/// <param name="bulkDeleteSelector">A func called on each ids to describe the individual delete operation</param>
77-
public BulkDescriptor DeleteMany<T>(IEnumerable<long> ids, Func<BulkDeleteDescriptor<T>, long, BulkDeleteDescriptor<T>> bulkDeleteSelector = null) where T : class =>
74+
public BulkDescriptor DeleteMany<T>(IEnumerable<long> ids, Func<BulkDeleteDescriptor<T>, long, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
7875
Assign(a => ids.ForEach(o => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Id(o), o))));
7976

80-
public BulkDescriptor Update<T>(Func<BulkUpdateDescriptor<T, T>, BulkUpdateDescriptor<T, T>> bulkUpdateSelector) where T : class =>
77+
public BulkDescriptor Update<T>(Func<BulkUpdateDescriptor<T, T>, IBulkUpdateOperation<T, T>> bulkUpdateSelector) where T : class =>
8178
this.Update<T, T>(bulkUpdateSelector);
8279

83-
public BulkDescriptor Update<T, K>(Func<BulkUpdateDescriptor<T, K>, BulkUpdateDescriptor<T, K>> bulkUpdateSelector)
80+
public BulkDescriptor Update<T, TPartialDocument>(Func<BulkUpdateDescriptor<T, TPartialDocument>, IBulkUpdateOperation<T, TPartialDocument>> bulkUpdateSelector)
8481
where T : class
85-
where K : class =>
86-
Assign(a => AddOperation(bulkUpdateSelector?.Invoke(new BulkUpdateDescriptor<T, K>())));
82+
where TPartialDocument : class =>
83+
Assign(a => AddOperation(bulkUpdateSelector?.Invoke(new BulkUpdateDescriptor<T, TPartialDocument>())));
8784
}
8885
}

Diff for: ‎src/Nest/Document/Multiple/Reindex/ElasticClient-Reindex.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public partial interface IElasticClient
88
/// Helper method that allows you to reindex from one index into another using SCAN and SCROLL.
99
/// </summary>
1010
/// <returns>An IObservable you can subscribe to to listen to the progress of the reindexation process</returns>
11-
IObservable<IReindexResponse<T>> Reindex<T>(IndexName from, IndexName to, Func<ReindexDescriptor<T>, ReindexDescriptor<T>> selector = null)
11+
IObservable<IReindexResponse<T>> Reindex<T>(IndexName from, IndexName to, Func<ReindexDescriptor<T>, IReindexRequest> selector = null)
1212
where T : class;
1313

1414
/// <inheritdoc/>
@@ -18,7 +18,7 @@ IObservable<IReindexResponse<T>> Reindex<T>(IndexName from, IndexName to, Func<R
1818
public partial class ElasticClient
1919
{
2020
/// <inheritdoc/>
21-
public IObservable<IReindexResponse<T>> Reindex<T>(IndexName from, IndexName to, Func<ReindexDescriptor<T>, ReindexDescriptor<T>> selector = null)
21+
public IObservable<IReindexResponse<T>> Reindex<T>(IndexName from, IndexName to, Func<ReindexDescriptor<T>, IReindexRequest> selector = null)
2222
where T : class =>
2323
this.Reindex<T>(selector.InvokeOrDefault(new ReindexDescriptor<T>(from, to)));
2424

Diff for: ‎src/Nest/Indices/AliasManagement/Alias/BulkAliasRequest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public BulkAliasDescriptor Add(IAliasAction action) =>
2424

2525
IList<IAliasAction> IBulkAliasRequest.Actions { get; set; } = new List<IAliasAction>();
2626

27-
public BulkAliasDescriptor Add(Func<AliasAddDescriptor, AliasAddDescriptor> addSelector) => Add(addSelector?.Invoke(new AliasAddDescriptor()));
27+
public BulkAliasDescriptor Add(Func<AliasAddDescriptor, IAliasAddAction> addSelector) => Add(addSelector?.Invoke(new AliasAddDescriptor()));
2828

29-
public BulkAliasDescriptor Remove(Func<AliasRemoveDescriptor, AliasRemoveDescriptor> removeSelector)=> Add(removeSelector?.Invoke(new AliasRemoveDescriptor()));
29+
public BulkAliasDescriptor Remove(Func<AliasRemoveDescriptor, IAliasRemoveAction> removeSelector)=> Add(removeSelector?.Invoke(new AliasRemoveDescriptor()));
3030
}
3131
}

Diff for: ‎src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ public PutMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int maxR
165165
public PutMappingDescriptor<T> SearchAnalyzer(string searchAnalyzer) => Assign(a => a.SearchAnalyzer = searchAnalyzer);
166166

167167
/// <inheritdoc/>
168-
public PutMappingDescriptor<T> AllField(Func<AllFieldDescriptor, AllFieldDescriptor> allFieldSelector) => Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
168+
public PutMappingDescriptor<T> AllField(Func<AllFieldDescriptor, IAllField> allFieldSelector) => Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
169169

170170
/// <inheritdoc/>
171-
public PutMappingDescriptor<T> IndexField(Func<IndexFieldDescriptor, IndexFieldDescriptor> indexFieldSelector) => Assign(a => a.IndexField = indexFieldSelector?.Invoke(new IndexFieldDescriptor()));
171+
public PutMappingDescriptor<T> IndexField(Func<IndexFieldDescriptor, IIndexField> indexFieldSelector) => Assign(a => a.IndexField = indexFieldSelector?.Invoke(new IndexFieldDescriptor()));
172172

173173
/// <inheritdoc/>
174-
public PutMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, SizeFieldDescriptor> sizeFieldSelector) => Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
174+
public PutMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, ISizeField> sizeFieldSelector) => Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
175175

176176
/// <inheritdoc/>
177177
public PutMappingDescriptor<T> DisableSizeField(bool disabled = true) => Assign(a => a.SizeField = new SizeField { Enabled = !disabled });
@@ -196,19 +196,19 @@ public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IProm
196196
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
197197

198198
/// <inheritdoc/>
199-
public PutMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceMapper) => Assign(a => a.SourceField = sourceMapper?.Invoke(new SourceFieldDescriptor()));
199+
public PutMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
200200

201201
/// <inheritdoc/>
202-
public PutMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingMapper) => Assign(a => a.RoutingField = routingMapper?.Invoke(new RoutingFieldDescriptor<T>()));
202+
public PutMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
203203

204204
/// <inheritdoc/>
205-
public PutMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampMapper) => Assign(a => a.TimestampField = timestampMapper?.Invoke(new TimestampFieldDescriptor<T>()));
205+
public PutMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampFieldSelector) => Assign(a => a.TimestampField = timestampFieldSelector?.Invoke(new TimestampFieldDescriptor<T>()));
206206

207207
/// <inheritdoc/>
208-
public PutMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesMapper) => Assign(a => a.FieldNamesField = fieldNamesMapper.Invoke(new FieldNamesFieldDescriptor<T>()));
208+
public PutMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
209209

210210
/// <inheritdoc/>
211-
public PutMappingDescriptor<T> TtlField(Func<TtlFieldDescriptor, ITtlField> ttlFieldMapper) => Assign(a => a.TtlField = ttlFieldMapper?.Invoke(new TtlFieldDescriptor()));
211+
public PutMappingDescriptor<T> TtlField(Func<TtlFieldDescriptor, ITtlField> ttlFieldSelector) => Assign(a => a.TtlField = ttlFieldSelector?.Invoke(new TtlFieldDescriptor()));
212212

213213
/// <inheritdoc/>
214214
public PutMappingDescriptor<T> Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> metaSelector) => Assign(a => a.Meta = metaSelector(new FluentDictionary<string, object>()));

Diff for: ‎src/Nest/Mapping/TypeMapping.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -165,19 +165,19 @@ public TypeMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int max
165165
public TypeMappingDescriptor<T> SearchAnalyzer(string searchAnalyzer)=> Assign(a => a.SearchAnalyzer = searchAnalyzer);
166166

167167
/// <inheritdoc/>
168-
public TypeMappingDescriptor<T> AllField(Func<AllFieldDescriptor, AllFieldDescriptor> allFieldSelector) => Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
168+
public TypeMappingDescriptor<T> AllField(Func<AllFieldDescriptor, IAllField> allFieldSelector) => Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
169169

170170
/// <inheritdoc/>
171-
public TypeMappingDescriptor<T> IndexField(Func<IndexFieldDescriptor, IndexFieldDescriptor> indexFieldSelector) => Assign(a => a.IndexField = indexFieldSelector?.Invoke(new IndexFieldDescriptor()));
171+
public TypeMappingDescriptor<T> IndexField(Func<IndexFieldDescriptor, IIndexField> indexFieldSelector) => Assign(a => a.IndexField = indexFieldSelector?.Invoke(new IndexFieldDescriptor()));
172172

173173
/// <inheritdoc/>
174-
public TypeMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, SizeFieldDescriptor> sizeFieldSelector) => Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
174+
public TypeMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, ISizeField> sizeFieldSelector) => Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
175175

176-
/// <inheritdoc/>
177-
public TypeMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, SourceFieldDescriptor> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
176+
/// <inheritdoc/>
177+
public TypeMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
178178

179-
/// <inheritdoc/>
180-
public TypeMappingDescriptor<T> DisableSizeField(bool disabled = true) => Assign(a => a.SizeField = new SizeField { Enabled = !disabled });
179+
/// <inheritdoc/>
180+
public TypeMappingDescriptor<T> DisableSizeField(bool disabled = true) => Assign(a => a.SizeField = new SizeField { Enabled = !disabled });
181181

182182
/// <inheritdoc/>
183183
public TypeMappingDescriptor<T> DisableIndexField(bool disabled = true) => Assign(a => a.IndexField = new IndexField { Enabled = !disabled });
@@ -199,22 +199,22 @@ public TypeMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPro
199199
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
200200

201201
/// <inheritdoc/>
202-
public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingMapper) => Assign(a => a.RoutingField = routingMapper?.Invoke(new RoutingFieldDescriptor<T>()));
202+
public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
203203

204204
/// <inheritdoc/>
205-
public TypeMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampMapper) => Assign(a => a.TimestampField = timestampMapper?.Invoke(new TimestampFieldDescriptor<T>()));
205+
public TypeMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampFieldSelector) => Assign(a => a.TimestampField = timestampFieldSelector?.Invoke(new TimestampFieldDescriptor<T>()));
206206

207207
/// <inheritdoc/>
208-
public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesMapper) => Assign(a => a.FieldNamesField = fieldNamesMapper.Invoke(new FieldNamesFieldDescriptor<T>()));
208+
public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
209209

210210
/// <inheritdoc/>
211-
public TypeMappingDescriptor<T> TtlField(Func<TtlFieldDescriptor, ITtlField> ttlFieldMapper) => Assign(a => a.TtlField = ttlFieldMapper?.Invoke(new TtlFieldDescriptor()));
211+
public TypeMappingDescriptor<T> TtlField(Func<TtlFieldDescriptor, ITtlField> ttlFieldSelector) => Assign(a => a.TtlField = ttlFieldSelector?.Invoke(new TtlFieldDescriptor()));
212212

213213
/// <inheritdoc/>
214214
public TypeMappingDescriptor<T> Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> metaSelector) => Assign(a => a.Meta = metaSelector(new FluentDictionary<string, object>()));
215215

216-
public TypeMappingDescriptor<T> Properties(Func<PropertiesDescriptor<T>, PropertiesDescriptor<T>> propertiesSelector) =>
217-
Assign(a => a.Properties = propertiesSelector?.Invoke(new PropertiesDescriptor<T>(Self.Properties))?.PromisedValue);
216+
public TypeMappingDescriptor<T> Properties(Func<PropertiesDescriptor<T>, IPromise<IProperties>> propertiesSelector) =>
217+
Assign(a => a.Properties = propertiesSelector?.Invoke(new PropertiesDescriptor<T>(Self.Properties))?.Value);
218218

219219
/// <inheritdoc/>
220220
public TypeMappingDescriptor<T> DynamicTemplates(Func<DynamicTemplateContainerDescriptor<T>, IPromise<IDynamicTemplateContainer>> dynamicTemplatesSelector) =>

Diff for: ‎src/Nest/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public partial class RestoreDescriptor
6262

6363
public RestoreDescriptor RenameReplacement(string renameReplacement) => Assign(a => a.RenameReplacement = renameReplacement);
6464

65-
public RestoreDescriptor IndexSettings(Func<UpdateIndexSettingsDescriptor, UpdateIndexSettingsDescriptor> settingsSelector) =>
65+
public RestoreDescriptor IndexSettings(Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> settingsSelector) =>
6666
Assign(a => a.IndexSettings = settingsSelector?.Invoke(new UpdateIndexSettingsDescriptor()));
6767

6868
public RestoreDescriptor IgnoreIndexSettings(List<string> ignoreIndexSettings) => Assign(a => a.IgnoreIndexSettings = ignoreIndexSettings);

Diff for: ‎src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ public class SpanContainingQueryDescriptor<T>
4242
ISpanQuery ISpanContainingQuery.Little { get; set; }
4343
ISpanQuery ISpanContainingQuery.Big { get; set; }
4444

45-
public SpanContainingQueryDescriptor<T> Little(Func<SpanQueryDescriptor<T>, SpanQueryDescriptor<T>> selector) =>
45+
public SpanContainingQueryDescriptor<T> Little(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
4646
Assign(a => a.Little = selector(new SpanQueryDescriptor<T>()));
4747

48-
public SpanContainingQueryDescriptor<T> Big(Func<SpanQueryDescriptor<T>, SpanQueryDescriptor<T>> selector) =>
48+
public SpanContainingQueryDescriptor<T> Big(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
4949
Assign(a => a.Big = selector(new SpanQueryDescriptor<T>()));
5050

5151
}

Diff for: ‎src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class SpanFirstQueryDescriptor<T>
3232
ISpanQuery ISpanFirstQuery.Match { get; set; }
3333
int? ISpanFirstQuery.End { get; set; }
3434

35-
public SpanFirstQueryDescriptor<T> Match(Func<SpanQueryDescriptor<T>, SpanQueryDescriptor<T>> selector) =>
35+
public SpanFirstQueryDescriptor<T> Match(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
3636
Assign(a => a.Match = selector(new SpanQueryDescriptor<T>()));
3737

3838
public SpanFirstQueryDescriptor<T> End(int? end) => Assign(a => a.End = end);

0 commit comments

Comments
 (0)