Skip to content

Commit 68e81b4

Browse files
MpdreamzMpdreamz
committed
removed all raw calls on IElasticClient as we now have IRawElasticClient for this purpose.
- exposed bits on IElasticClient so you can easily parse the string response of IRawElasticClient - exposed IConnection as a property on IElasticClient
1 parent d5c66c6 commit 68e81b4

21 files changed

+99
-150
lines changed

‎src/Nest.Dsl.Factory/ElasticClient-Search.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,19 @@ namespace Nest
99
{
1010
public static class ElasticClientExtensions
1111
{
12+
public static IQueryResponse<T> SearchRaw<T>(this IElasticClient client,
13+
string path, string query) where T : class
14+
{
15+
var connectionStatus = client.Connection.PostSync(path, query);
16+
return client.ToParsedResponse<QueryResponse<T>>(connectionStatus);
17+
}
1218

19+
public static Task<IQueryResponse<T>> SearchRawAsync<T>(this IElasticClient client,
20+
string path, string query) where T : class
21+
{
22+
return client.Connection.Post(path, query)
23+
.ContinueWith(t=> client.ToParsedResponse<QueryResponse<T>>(t.Result) as IQueryResponse<T>);
24+
}
1325
/// <summary>
1426
/// Synchronously search using dynamic as its return type.
1527
/// </summary>

‎src/Nest.Tests.Integration/Core/DeleteTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void GetDocumentById()
3838
{
3939
//arrange
4040
//pull existing example through method we know is functional based on other passing unit tests
41-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
41+
var queryResults = this.SearchRaw<ElasticSearchProject>(
4242
@" { ""query"" : {
4343
""fuzzy"" : {
4444
""followers.firstName"" : """ + NestTestData.Data.First().Followers.First().FirstName.ToLower() + @"x""

‎src/Nest.Tests.Integration/Facet/GeoDistanceFacetResponseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class GeoDistanceFacetResponseTests : BaseFacetTestFixture
1010
[Test]
1111
public void SimpleGeoFacet()
1212
{
13-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
13+
var queryResults = this.SearchRaw<ElasticSearchProject>(
1414
@"
1515
{
1616
""query"" : { ""match_all"" : { } },

‎src/Nest.Tests.Integration/Facet/HistogramFacetResponseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class HistogramFacetResponseTests : BaseFacetTestFixture
1414
[Test]
1515
public void SimpleHistogramFacet()
1616
{
17-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
17+
var queryResults = this.SearchRaw<ElasticSearchProject>(
1818
@"
1919
{
2020
""query"" : { ""match_all"" : { } },
@@ -50,7 +50,7 @@ public void SimpleHistogramFacet()
5050
[Test]
5151
public void DateHistogramFacet()
5252
{
53-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
53+
var queryResults = this.SearchRaw<ElasticSearchProject>(
5454
@"
5555
{
5656
""query"" : { ""match_all"" : { } },

‎src/Nest.Tests.Integration/Facet/RangeFacetResponseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class RangeFacetResponseTests : BaseFacetTestFixture
1414
[Test]
1515
public void SimpleRangeFacet()
1616
{
17-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
17+
var queryResults = this.SearchRaw<ElasticSearchProject>(
1818
@"
1919
{
2020
""query"" : { ""match_all"" : { } },
@@ -54,7 +54,7 @@ public void SimpleRangeFacet()
5454
[Test]
5555
public void DateRangeFacet()
5656
{
57-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
57+
var queryResults = this.SearchRaw<ElasticSearchProject>(
5858
@"
5959
{
6060
""query"" : { ""match_all"" : { } },

‎src/Nest.Tests.Integration/Facet/TermFacetResponseTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class TermFacetResponseTests : BaseFacetTestFixture
1313
[Test]
1414
public void SimpleTermFacet()
1515
{
16-
IQueryResponse<ElasticSearchProject> queryResults = this._client.SearchRaw<ElasticSearchProject>(
16+
IQueryResponse<ElasticSearchProject> queryResults = this.SearchRaw<ElasticSearchProject>(
1717
@" { ""query"" : {
1818
""match_all"" : { }
1919
},
@@ -55,7 +55,7 @@ public void SimpleTermFacet()
5555
[Test]
5656
public void SimpleTermFacetWithExclude()
5757
{
58-
IQueryResponse<ElasticSearchProject> queryResults = this._client.SearchRaw<ElasticSearchProject>(
58+
IQueryResponse<ElasticSearchProject> queryResults = this.SearchRaw<ElasticSearchProject>(
5959
@" { ""query"" : {
6060
""match_all"" : { }
6161
},
@@ -82,7 +82,7 @@ public void SimpleTermFacetWithExclude()
8282
[Test]
8383
public void SimpleTermFacetWithGlobal()
8484
{
85-
IQueryResponse<ElasticSearchProject> queryResults = this._client.SearchRaw<ElasticSearchProject>(
85+
IQueryResponse<ElasticSearchProject> queryResults = this.SearchRaw<ElasticSearchProject>(
8686
@" { ""query"" : {
8787
""term"" : { ""followers.lastName"" : """ + this._LookFor.ToLower() +
8888
@""" }

‎src/Nest.Tests.Integration/Facet/TermStatsFacetResponseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class TermStatsFacetResponseTests : BaseFacetTestFixture
1212
[Test]
1313
public void SimpleTermStatsFacet()
1414
{
15-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
15+
var queryResults = this.SearchRaw<ElasticSearchProject>(
1616
@"
1717
{
1818
""query"" : { ""match_all"" : { } },

‎src/Nest.Tests.Integration/Indices/OpenCloseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void CloseAndSearchAndOpenIndex()
3737
Assert.True(r.OK);
3838
Assert.True(r.Acknowledged);
3939
Assert.True(r.IsValid);
40-
var results = this._client.SearchRaw<ElasticSearchProject>(
40+
var results = this.SearchRaw<ElasticSearchProject>(
4141
@" { ""query"" : {
4242
""match_all"" : { }
4343
} }"

‎src/Nest.Tests.Integration/IntegrationTests.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ protected string GetTypeNameFor(Type t)
3030
return new TypeNameResolver().GetTypeNameFor(t).Resolve(this._settings);
3131
}
3232

33+
34+
protected IQueryResponse<T> SearchRaw<T>(string query) where T : class
35+
{
36+
var index = this._client.GetIndexNameFor<T>();
37+
var typeName = this._client.GetTypeNameFor<T>();
38+
var connectionStatus = this._client.Raw.SearchPost(index, typeName, query);
39+
return this._client.ToParsedResponse<QueryResponse<T>>(connectionStatus);
40+
}
41+
3342
public void DoFilterTest(Func<FilterDescriptor<ElasticSearchProject>, Nest.BaseFilter> filter, ElasticSearchProject project, bool queryMustHaveResults)
3443
{
3544
var filterId = Filter<ElasticSearchProject>.Term(e => e.Id, project.Id.ToString());

‎src/Nest.Tests.Integration/Search/ExplainTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ExplainTests : IntegrationTests
1313
[Test]
1414
public void SimpleExplain()
1515
{
16-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
16+
var queryResults = this.SearchRaw<ElasticSearchProject>(
1717
@" {
1818
""explain"": true,
1919
""query"" : {
@@ -27,7 +27,7 @@ public void SimpleExplain()
2727
[Test]
2828
public void ComplexExplain()
2929
{
30-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
30+
var queryResults = this.SearchRaw<ElasticSearchProject>(
3131
@" { ""explain"": true,
3232
""query"" : {
3333
""fuzzy"" : {

‎src/Nest.Tests.Integration/Search/QueryResponseMapperTests.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void HitsSortsIsSetWithStringSort()
9090
public void BoolQuery()
9191
{
9292
var lookFor = this._LookFor.ToLower();
93-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
93+
var queryResults = this.SearchRaw<ElasticSearchProject>(
9494
@" { ""query"" : {
9595
""bool"" : {
9696
""must"" : {
@@ -123,7 +123,7 @@ public void BoolQuery()
123123
public void BoostingQuery()
124124
{
125125
var boost2nd = NestTestData.Data.ToList()[2].Followers.First().FirstName.ToLower();
126-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
126+
var queryResults = this.SearchRaw<ElasticSearchProject>(
127127
@" { ""query"" : {
128128
""boosting"" : {
129129
""positive"" : {
@@ -147,7 +147,7 @@ public void BoostingQuery()
147147
[Test]
148148
public void ScoringQuery()
149149
{
150-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
150+
var queryResults = this.SearchRaw<ElasticSearchProject>(
151151
@" { ""query"" : {
152152
""custom_score"" : {
153153
""query"" : {
@@ -164,7 +164,7 @@ public void ScoringQuery()
164164
[Test]
165165
public void ConstantScoreQuery()
166166
{
167-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
167+
var queryResults = this.SearchRaw<ElasticSearchProject>(
168168
@" { ""query"" : {
169169
""constant_score"" : {
170170
""filter"" : {
@@ -184,7 +184,7 @@ public void DismaxQuery()
184184
var boost2nd = NestTestData.Data.ToList()[2].Followers.First().FirstName.ToLower();
185185

186186

187-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
187+
var queryResults = this.SearchRaw<ElasticSearchProject>(
188188
@" { ""query"" : {
189189
""dis_max"" : {
190190
""tie_breaker"" : 0.7,
@@ -209,7 +209,7 @@ public void DismaxQuery()
209209
[Test]
210210
public void FieldQuery()
211211
{
212-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
212+
var queryResults = this.SearchRaw<ElasticSearchProject>(
213213
@" { ""query"" : {
214214
""field"" : {
215215
""followers.firstName"" : ""+" + this._LookFor.ToLower() + @" -something else""
@@ -221,7 +221,7 @@ public void FieldQuery()
221221
[Test]
222222
public void ExtendedFieldQuery()
223223
{
224-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
224+
var queryResults = this.SearchRaw<ElasticSearchProject>(
225225
@" { ""query"" : {
226226
""field"" : {
227227
""followers.firstName"" : {
@@ -237,7 +237,7 @@ public void ExtendedFieldQuery()
237237
[Test]
238238
public void FilteredQuery()
239239
{
240-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
240+
var queryResults = this.SearchRaw<ElasticSearchProject>(
241241
@" { ""query"" : {
242242
""filtered"" : {
243243
""query"" : {
@@ -258,7 +258,7 @@ public void FilteredQuery()
258258
[Test]
259259
public void FuzzyLikeThisQuery()
260260
{
261-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
261+
var queryResults = this.SearchRaw<ElasticSearchProject>(
262262
@" { ""query"" : {
263263
""fuzzy_like_this"" : {
264264
""fields"" : [""_all""],
@@ -272,7 +272,7 @@ public void FuzzyLikeThisQuery()
272272
[Test]
273273
public void FuzzyLikeThisFieldQuery()
274274
{
275-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
275+
var queryResults = this.SearchRaw<ElasticSearchProject>(
276276
@" { ""query"" : {
277277
""fuzzy_like_this_field"" : {
278278
""followers.firstName"" : {
@@ -287,7 +287,7 @@ public void FuzzyLikeThisFieldQuery()
287287
[Test]
288288
public void FuzzyQuery()
289289
{
290-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
290+
var queryResults = this.SearchRaw<ElasticSearchProject>(
291291
@" { ""query"" : {
292292
""fuzzy"" : {
293293
""followers.firstName"" : """ + this._LookFor.ToLower() + @"x""
@@ -301,7 +301,7 @@ public void FuzzyQuery()
301301
[Test]
302302
public void ExtendedFuzzyQuery()
303303
{
304-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
304+
var queryResults = this.SearchRaw<ElasticSearchProject>(
305305
@" { ""query"" : {
306306
""fuzzy"" : {
307307
""followers.firstName"" : {
@@ -321,7 +321,7 @@ public void ExtendedFuzzyQuery()
321321
[Test]
322322
public void MatchAllQuery()
323323
{
324-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
324+
var queryResults = this.SearchRaw<ElasticSearchProject>(
325325
@" { ""query"" : {
326326
""match_all"" : { }
327327
} }"
@@ -334,7 +334,7 @@ public void MatchAllQuery()
334334
[Test]
335335
public void MoreLikeThisQuery()
336336
{
337-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
337+
var queryResults = this.SearchRaw<ElasticSearchProject>(
338338
@" { ""query"" : {
339339
""more_like_this"" : {
340340
""fields"" : [""_all""],
@@ -350,7 +350,7 @@ public void MoreLikeThisQuery()
350350
[Test]
351351
public void MoreLikeThisFieldQuery()
352352
{
353-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
353+
var queryResults = this.SearchRaw<ElasticSearchProject>(
354354
@" { ""query"" : {
355355
""more_like_this_field"" : {
356356
""followers.firstName"" : {
@@ -367,7 +367,7 @@ public void MoreLikeThisFieldQuery()
367367
[Test]
368368
public void PrefixQuery()
369369
{
370-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
370+
var queryResults = this.SearchRaw<ElasticSearchProject>(
371371
@" { ""query"" : {
372372
""prefix"" : {
373373
""followers.firstName"" : """ + this._LookFor.ToLower().Substring(0, 4) + @"""
@@ -379,7 +379,7 @@ public void PrefixQuery()
379379
[Test]
380380
public void PrefixExtendedQuery()
381381
{
382-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
382+
var queryResults = this.SearchRaw<ElasticSearchProject>(
383383
@" { ""query"" : {
384384
""prefix"" : {
385385
""followers.firstName"" : { ""value"" : """ + this._LookFor.ToLower().Substring(0, 4) + @""", ""boost"" : 1.2 }
@@ -394,7 +394,7 @@ public void QueryStringQuery()
394394
var firstFollower = NestTestData.Data.First().Followers.First();
395395
var firstName = firstFollower.FirstName;
396396
var lastName = firstFollower.LastName;
397-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
397+
var queryResults = this.SearchRaw<ElasticSearchProject>(
398398
@" { ""query"" : {
399399
""query_string"" : {
400400
""default_field"" : ""_all"",
@@ -410,7 +410,7 @@ public void QueryStringMultiFieldQuery()
410410
var firstFollower = NestTestData.Data.First().Followers.First();
411411
var firstName = firstFollower.FirstName;
412412
var lastName = firstFollower.LastName;
413-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
413+
var queryResults = this.SearchRaw<ElasticSearchProject>(
414414
@" { ""query"" : {
415415
""query_string"" : {
416416
""fields"" : [""followers.firstName"", ""followers.lastName^5""],
@@ -424,7 +424,7 @@ public void QueryStringMultiFieldQuery()
424424
[Test]
425425
public void RangeQuery()
426426
{
427-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
427+
var queryResults = this.SearchRaw<ElasticSearchProject>(
428428
@" { ""query"" : {
429429
""range"" : {
430430
""id"" : {
@@ -443,7 +443,7 @@ public void RangeQuery()
443443
[Test]
444444
public void TermQuery()
445445
{
446-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
446+
var queryResults = this.SearchRaw<ElasticSearchProject>(
447447
@" { ""query"" : {
448448
""term"" : {
449449
""followers.firstName"" : """ + this._LookFor.ToLower() + @"""
@@ -457,7 +457,7 @@ public void TermQuery()
457457
[Test]
458458
public void ExtendedTermQuery()
459459
{
460-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
460+
var queryResults = this.SearchRaw<ElasticSearchProject>(
461461
@" { ""query"" : {
462462
""term"" : {
463463
""followers.firstName"" : { ""value"" : """ + this._LookFor.ToLower() + @""", ""boost"" : 2.0 }
@@ -475,7 +475,7 @@ public void TermsQuery()
475475
var firstName = firstFollower.FirstName.ToLower();
476476
var lastName = firstFollower.LastName.ToLower();
477477

478-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
478+
var queryResults = this.SearchRaw<ElasticSearchProject>(
479479
@" { ""query"" : {
480480
""terms"" : {
481481
""followers.firstName"" : [ """ + firstName + @""", """ + lastName + @""" ],
@@ -492,7 +492,7 @@ public void TermsQuery()
492492
public void WildcardQuery()
493493
{
494494
var wildcard = this._LookFor.ToLower().Substring(0, this._LookFor.Length - 1).Replace("a", "?") + "*";
495-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
495+
var queryResults = this.SearchRaw<ElasticSearchProject>(
496496
@" { ""query"" : {
497497
""wildcard"" : {
498498
""followers.firstName"" : """ + wildcard + @"""
@@ -507,7 +507,7 @@ public void WildcardQuery()
507507
public void WildcardExtendedQuery()
508508
{
509509
var wildcard = this._LookFor.ToLower().Substring(0, this._LookFor.Length - 1).Replace("a", "?") + "*";
510-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
510+
var queryResults = this.SearchRaw<ElasticSearchProject>(
511511
@" { ""query"" : {
512512
""wildcard"" : {
513513
""followers.firstName"" : { ""value"" : """ + wildcard + @""", ""boost"" : 2.0 }
@@ -527,7 +527,7 @@ public void QueryWithHighlightTest()
527527
string query = "{\"query\":{\"query_string\":{\"default_field\":\"_all\",\"query\":\"pork\"}},\"highlight\":{\"pre_tags\":[\"<span class=\\\"searchTerm\\\">\"],\"post_tags\":[\"</span>\"],\"fields\":{\"content\":{\"fragment_size\":150,\"number_of_fragments\":3}}}}";
528528

529529
//act
530-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(query);
530+
var queryResults = this.SearchRaw<ElasticSearchProject>(query);
531531

532532
//assert
533533
Assert.IsTrue(queryResults.DocumentsWithMetaData.First().Highlight["content"].Highlights.Count() > 0);

‎src/Nest.Tests.Integration/Search/VersionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class VersionTests : IntegrationTests
1313
[Test]
1414
public void SimpleVersion()
1515
{
16-
var queryResults = this._client.SearchRaw<ElasticSearchProject>(
16+
var queryResults = this.SearchRaw<ElasticSearchProject>(
1717
@" {
1818
""version"": true,
1919
""query"" : {

0 commit comments

Comments
 (0)