Skip to content

Commit 2aa172e

Browse files
gmarzgmarz
committed
Enforce search template name on fluent API
1 parent a364cd4 commit 2aa172e

File tree

3 files changed

+24
-29
lines changed

3 files changed

+24
-29
lines changed

‎src/Nest/ElasticClient-SearchTemplate.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ public Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(ISearchTem
103103
});
104104
}
105105

106-
public IGetSearchTemplateResponse GetSearchTemplate(Func<GetSearchTemplateDescriptor, GetSearchTemplateDescriptor> selector)
106+
public IGetSearchTemplateResponse GetSearchTemplate(string name, Func<GetSearchTemplateDescriptor, GetSearchTemplateDescriptor> selector = null)
107107
{
108108
selector = selector ?? (s => s);
109109
return this.Dispatch<GetSearchTemplateDescriptor, GetTemplateRequestParameters, GetSearchTemplateResponse>(
110-
selector,
110+
d => selector(d.Name(name)),
111111
(p, d) => this.RawDispatch.GetTemplateDispatch<GetSearchTemplateResponse>(p, d)
112112
);
113113
}
@@ -120,11 +120,11 @@ public IGetSearchTemplateResponse GetSearchTemplate(IGetSearchTemplateRequest re
120120
);
121121
}
122122

123-
public Task<IGetSearchTemplateResponse> GetSearchTemplateAsync(Func<GetSearchTemplateDescriptor, GetSearchTemplateDescriptor> selector)
123+
public Task<IGetSearchTemplateResponse> GetSearchTemplateAsync(string name, Func<GetSearchTemplateDescriptor, GetSearchTemplateDescriptor> selector = null)
124124
{
125125
selector = selector ?? (s => s);
126126
return this.DispatchAsync<GetSearchTemplateDescriptor, GetTemplateRequestParameters, GetSearchTemplateResponse, IGetSearchTemplateResponse>(
127-
selector,
127+
d => selector(d.Name(name)),
128128
(p, d) => this.RawDispatch.GetTemplateDispatchAsync<GetSearchTemplateResponse>(p, d)
129129
);
130130
}
@@ -137,11 +137,11 @@ public Task<IGetSearchTemplateResponse> GetSearchTemplateAsync(IGetSearchTemplat
137137
);
138138
}
139139

140-
public IPutSearchTemplateResponse PutSearchTemplate(Func<PutSearchTemplateDescriptor, PutSearchTemplateDescriptor> selector)
140+
public IPutSearchTemplateResponse PutSearchTemplate(string name, Func<PutSearchTemplateDescriptor, PutSearchTemplateDescriptor> selector = null)
141141
{
142142
selector = selector ?? (s => s);
143143
return this.Dispatch<PutSearchTemplateDescriptor, PutTemplateRequestParameters, PutSearchTemplateResponse>(
144-
selector,
144+
d => selector(d.Name(name)),
145145
(p, d) => this.RawDispatch.PutTemplateDispatch<PutSearchTemplateResponse>(p, d)
146146
);
147147
}
@@ -154,11 +154,11 @@ public IPutSearchTemplateResponse PutSearchTemplate(IPutSearchTemplateRequest re
154154
);
155155
}
156156

157-
public Task<IPutSearchTemplateResponse> PutSearchTemplateAsync(Func<PutSearchTemplateDescriptor, PutSearchTemplateDescriptor> selector)
157+
public Task<IPutSearchTemplateResponse> PutSearchTemplateAsync(string name, Func<PutSearchTemplateDescriptor, PutSearchTemplateDescriptor> selector = null)
158158
{
159159
selector = selector ?? (s => s);
160160
return this.DispatchAsync<PutSearchTemplateDescriptor, PutTemplateRequestParameters, PutSearchTemplateResponse, IPutSearchTemplateResponse>(
161-
selector,
161+
d => selector(d.Name(name)),
162162
(p, d) => this.RawDispatch.PutTemplateDispatchAsync<PutSearchTemplateResponse>(p, d)
163163
);
164164
}
@@ -171,11 +171,11 @@ public Task<IPutSearchTemplateResponse> PutSearchTemplateAsync(IPutSearchTemplat
171171
);
172172
}
173173

174-
public IDeleteSearchTemplateResponse DeleteSearchTemplate(Func<DeleteSearchTemplateDescriptor, DeleteSearchTemplateDescriptor> selector)
174+
public IDeleteSearchTemplateResponse DeleteSearchTemplate(string name, Func<DeleteSearchTemplateDescriptor, DeleteSearchTemplateDescriptor> selector = null)
175175
{
176176
selector = selector ?? (s => s);
177177
return this.Dispatch<DeleteSearchTemplateDescriptor, DeleteTemplateRequestParameters, DeleteSearchTemplateResponse>(
178-
selector,
178+
d => selector(d.Name(name)),
179179
(p, d) => this.RawDispatch.DeleteTemplateDispatch<DeleteSearchTemplateResponse>(p)
180180
);
181181
}
@@ -188,11 +188,11 @@ public IDeleteSearchTemplateResponse DeleteSearchTemplate(IDeleteSearchTemplateR
188188
);
189189
}
190190

191-
public Task<IDeleteSearchTemplateResponse> DeleteSearchTemplateAsync(Func<DeleteSearchTemplateDescriptor, DeleteSearchTemplateDescriptor> selector)
191+
public Task<IDeleteSearchTemplateResponse> DeleteSearchTemplateAsync(string name, Func<DeleteSearchTemplateDescriptor, DeleteSearchTemplateDescriptor> selector = null)
192192
{
193193
selector = selector ?? (s => s);
194194
return this.DispatchAsync<DeleteSearchTemplateDescriptor, DeleteTemplateRequestParameters, DeleteSearchTemplateResponse, IDeleteSearchTemplateResponse>(
195-
selector,
195+
d => selector(d.Name(name)),
196196
(p, d) => this.RawDispatch.DeleteTemplateDispatchAsync<DeleteSearchTemplateResponse>(p)
197197
);
198198
}

‎src/Nest/IElasticClient.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -817,37 +817,37 @@ Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(ISearchTemplateRe
817817
where TResult : class;
818818

819819
/// <inheritdoc />
820-
IGetSearchTemplateResponse GetSearchTemplate(Func<GetSearchTemplateDescriptor, GetSearchTemplateDescriptor> selector);
820+
IGetSearchTemplateResponse GetSearchTemplate(string name, Func<GetSearchTemplateDescriptor, GetSearchTemplateDescriptor> selector = null);
821821

822822
/// <inheritdoc />
823823
IGetSearchTemplateResponse GetSearchTemplate(IGetSearchTemplateRequest request);
824824

825825
/// <inheritdoc />
826-
Task<IGetSearchTemplateResponse> GetSearchTemplateAsync(Func<GetSearchTemplateDescriptor, GetSearchTemplateDescriptor> selector);
826+
Task<IGetSearchTemplateResponse> GetSearchTemplateAsync(string name, Func<GetSearchTemplateDescriptor, GetSearchTemplateDescriptor> selector = null);
827827

828828
/// <inheritdoc />
829829
Task<IGetSearchTemplateResponse> GetSearchTemplateAsync(IGetSearchTemplateRequest request);
830830

831831
/// <inheritdoc />
832-
IPutSearchTemplateResponse PutSearchTemplate(Func<PutSearchTemplateDescriptor, PutSearchTemplateDescriptor> selector);
832+
IPutSearchTemplateResponse PutSearchTemplate(string name, Func<PutSearchTemplateDescriptor, PutSearchTemplateDescriptor> selector = null);
833833

834834
/// <inheritdoc />
835835
IPutSearchTemplateResponse PutSearchTemplate(IPutSearchTemplateRequest request);
836836

837837
/// <inheritdoc />
838-
Task<IPutSearchTemplateResponse> PutSearchTemplateAsync(Func<PutSearchTemplateDescriptor, PutSearchTemplateDescriptor> selector);
838+
Task<IPutSearchTemplateResponse> PutSearchTemplateAsync(string name, Func<PutSearchTemplateDescriptor, PutSearchTemplateDescriptor> selector = null);
839839

840840
/// <inheritdoc />
841841
Task<IPutSearchTemplateResponse> PutSearchTemplateAsync(IPutSearchTemplateRequest request);
842842

843843
/// <inheritdoc />
844-
IDeleteSearchTemplateResponse DeleteSearchTemplate(Func<DeleteSearchTemplateDescriptor, DeleteSearchTemplateDescriptor> selector);
844+
IDeleteSearchTemplateResponse DeleteSearchTemplate(string name, Func<DeleteSearchTemplateDescriptor, DeleteSearchTemplateDescriptor> selector = null);
845845

846846
/// <inheritdoc />
847847
IDeleteSearchTemplateResponse DeleteSearchTemplate(IDeleteSearchTemplateRequest request);
848848

849849
/// <inheritdoc />
850-
Task<IDeleteSearchTemplateResponse> DeleteSearchTemplateAsync(Func<DeleteSearchTemplateDescriptor, DeleteSearchTemplateDescriptor> selector);
850+
Task<IDeleteSearchTemplateResponse> DeleteSearchTemplateAsync(string name, Func<DeleteSearchTemplateDescriptor, DeleteSearchTemplateDescriptor> selector = null);
851851

852852
/// <inheritdoc />
853853
Task<IDeleteSearchTemplateResponse> DeleteSearchTemplateAsync(IDeleteSearchTemplateRequest request);

‎src/Tests/Nest.Tests.Integration/Search/Template/SearchTemplateTests.cs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,12 @@ public void SearchTemplateByQuery_ObjectInitializer()
5353
result.Hits.Count().Should().BeGreaterThan(0);
5454
}
5555

56+
[Test]
5657
public void SearchTemplateById()
5758
{
5859
var templateName = "myIndexedTemplate";
5960

60-
var putTemplateResult = this.Client.PutSearchTemplate(t => t
61-
.Name(templateName)
62-
.Template(_template)
63-
);
61+
var putTemplateResult = this.Client.PutSearchTemplate(templateName, t => t.Template(_template));
6462
putTemplateResult.IsValid.Should().BeTrue();
6563

6664
var result = this.Client.SearchTemplate<ElasticsearchProject>(s => s
@@ -76,7 +74,7 @@ public void SearchTemplateById()
7674
result.IsValid.Should().BeTrue();
7775
result.Hits.Count().Should().BeGreaterThan(0);
7876

79-
var deleteTemplateResult = this.Client.DeleteSearchTemplate(t => t.Name(templateName));
77+
var deleteTemplateResult = this.Client.DeleteSearchTemplate(templateName);
8078
deleteTemplateResult.IsValid.Should().BeTrue();
8179
}
8280

@@ -85,17 +83,14 @@ public void PutGetAndDeleteTemplate()
8583
{
8684
var templateName = "myIndexedTemplate";
8785

88-
var putResult = this.Client.PutSearchTemplate(t => t
89-
.Name(templateName)
90-
.Template(_template)
91-
);
86+
var putResult = this.Client.PutSearchTemplate(templateName, t => t.Template(_template));
9287
putResult.IsValid.Should().BeTrue();
9388

94-
var getResult = this.Client.GetSearchTemplate(t => t.Name(templateName));
89+
var getResult = this.Client.GetSearchTemplate(templateName);
9590
getResult.IsValid.Should().BeTrue();
9691
getResult.Template.ShouldBeEquivalentTo(_template);
9792

98-
var deleteResult = this.Client.DeleteSearchTemplate(t => t.Name(templateName));
93+
var deleteResult = this.Client.DeleteSearchTemplate(templateName);
9994
deleteResult.IsValid.Should().BeTrue();
10095
}
10196
}

0 commit comments

Comments
 (0)