Skip to content

Commit 2279375

Browse files
committed
fix #347, no proper generic Term methods on static Query and Filter
1 parent 182d194 commit 2279375

File tree

6 files changed

+321
-320
lines changed

6 files changed

+321
-320
lines changed

Diff for: src/Nest.Tests.Integration/Integration/Query/TextPhrasePrefixQueryTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void Initialize()
3535
public void TestControl()
3636
{
3737
var id = _LookFor.Id;
38-
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id.ToString());
38+
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id);
3939

4040
var results = this._client.Search<ElasticSearchProject>(
4141
s => s.Filter(filterId && filterId)
@@ -53,7 +53,7 @@ public void TestControl()
5353
public void TestNotFiltered()
5454
{
5555
var id = _LookFor.Id;
56-
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id.ToString());
56+
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id);
5757
var querySlop0 = Query<ElasticSearchProject>.TextPhrasePrefix(
5858
textPhrasePrefix => textPhrasePrefix
5959
.OnField(p => p.Name)
@@ -94,7 +94,7 @@ public void TestNotFiltered()
9494
public void TestFiltered()
9595
{
9696
var id = _LookFor.Id;
97-
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id.ToString());
97+
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id);
9898
var querySlop0 = Query<ElasticSearchProject>.TextPhrasePrefix(
9999
textPhrasePrefix => textPhrasePrefix
100100
.OnField(p => p.Name)

Diff for: src/Nest.Tests.Integration/Integration/Query/TextPhraseQueryTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void Initialize()
3535
public void TestControl()
3636
{
3737
var id = _LookFor.Id;
38-
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id.ToString());
38+
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id);
3939

4040
var results = this._client.Search<ElasticSearchProject>(
4141
s => s.Filter(filterId)
@@ -53,7 +53,7 @@ public void TestControl()
5353
public void TestNotFiltered()
5454
{
5555
var id = _LookFor.Id;
56-
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id.ToString());
56+
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id);
5757
var querySlop0 = Query<ElasticSearchProject>.TextPhrase(
5858
textPhrase => textPhrase
5959
.OnField(p => p.Name)
@@ -84,7 +84,7 @@ public void TestNotFiltered()
8484
public void TestFiltered()
8585
{
8686
var id = _LookFor.Id;
87-
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id.ToString());
87+
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, id);
8888
var querySlop0 = Query<ElasticSearchProject>.TextPhrase(
8989
textPhrase => textPhrase
9090
.OnField(p => p.Name)

Diff for: src/Nest.Tests.Integration/IntegrationTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected IQueryResponse<T> SearchRaw<T>(string query) where T : class
3131

3232
public void DoFilterTest(Func<FilterDescriptor<ElasticSearchProject>, Nest.BaseFilter> filter, ElasticSearchProject project, bool queryMustHaveResults)
3333
{
34-
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, project.Id.ToString());
34+
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, project.Id);
3535

3636
var results = this._client.Search<ElasticSearchProject>(
3737
s => s.Filter(ff => ff.And(

Diff for: src/Nest.Tests.Integration/Reproduce/Reproduce346Tests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public void NoSearchResults()
7979
x => x.Bool(
8080
b => b.Must
8181
(
82-
Query<MediaStreamEntry>.Term(f => f.StreamId, streamId.ToString())
83-
, Query<MediaStreamEntry>.Term(f => f.ApprovalSettings.Approved, approved.ToString())
82+
Query<MediaStreamEntry>.Term(f => f.StreamId, streamId)
83+
, Query<MediaStreamEntry>.Term(f => f.ApprovalSettings.Approved, approved)
8484
)
8585
)
8686
);

0 commit comments

Comments
 (0)