Skip to content

Commit 19d468a

Browse files
gmarzgmarz
committed
Merge pull request #737 from elasticsearch/feature/cluster-put-settings
Feature/cluster put settings
2 parents 89fe2b3 + 13da7ce commit 19d468a

File tree

125 files changed

+1842
-1443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1842
-1443
lines changed

‎src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public static void PatchMethod(CsharpMethod method)
144144
string generic;
145145
if (KnownDescriptors.TryGetValue(method.DescriptorType, out generic))
146146
method.DescriptorTypeGeneric = generic;
147+
else method.Unmapped = true;
147148

148149
try
149150
{

‎src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/CsharpMethod.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public class CsharpMethod
1717
public string Path { get; set; }
1818
public string Arguments { get; set; }
1919
public bool Allow404 { get; set; }
20+
public bool Unmapped { get; set; }
2021
public IEnumerable<ApiUrlPart> Parts { get; set; }
2122
public ApiUrl Url { get; set; }
2223
}

‎src/CodeGeneration/CodeGeneration.LowLevelClient/Views/_Descriptors.Generated.cshtml‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ namespace Nest
2424
///@method.Documentation
2525
///</pre>
2626
///</summary>
27-
public partial class @Raw(type)
27+
public partial class @Raw(type) @(Raw(!method.Unmapped ? "" : string.Format(" : BaseRequest<{0}>", method.QueryStringParamName)))
2828
{
29-
internal @method.QueryStringParamName _QueryString = new @(method.QueryStringParamName)();
30-
</text>
29+
30+
</text>
3131
foreach (KeyValuePair<string, ApiQueryParameters> kv
3232
in method.Url.Params)
3333
{
@@ -42,7 +42,7 @@ namespace Nest
4242
///<summary>@kv.Value.Description</summary>
4343
public @Raw(type) @(mm)(@t @kv.Key@tSuffix)
4444
{
45-
this._QueryString.@(m)(@kv.Key);
45+
this.Request.RequestParameters.@(m)(@kv.Key);
4646
return this;
4747
}
4848
</text>
@@ -55,7 +55,7 @@ namespace Nest
5555
if (!typedPathLookups.HasAny())
5656
return this;
5757

58-
this._QueryString._@(mm)(typedPathLookups);
58+
this.Request.RequestParameters._@(mm)(typedPathLookups);
5959
return this;
6060
}
6161
</text>
@@ -68,14 +68,25 @@ namespace Nest
6868
public @Raw(type) @mm@(Raw(typed ? "" : "<T>"))(@Raw("Expression<Func<T, object>>") typedPathLookup) @Raw(typed ? "" : "where T : class")
6969
{
7070
typedPathLookup.ThrowIfNull("typedPathLookup");
71-
this._QueryString._@(mm)(typedPathLookup);
71+
this.Request.RequestParameters._@(mm)(typedPathLookup);
7272
return this;
7373
}
7474
</text>
7575

7676
}
77+
78+
7779
}
78-
<text>
80+
if (method.Unmapped)
81+
{
82+
<text>
83+
protected override void UpdatePathInfo(IConnectionSettingsValues settings, @Raw(string.Format("ElasticsearchPathInfo<{0}>", method.QueryStringParamName)) pathInfo)
84+
{
85+
throw new NotImplementedException();
86+
}
87+
</text>
88+
}
89+
<text>
7990
}
8091
</text>
8192
}

‎src/Elasticsearch.Net/Connection/Transport.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ public ElasticsearchResponse<T> DoRequest<T>(string method, string path, object
258258
if (objectNeedsResponseRef != null)
259259
objectNeedsResponseRef.RequestInformation = result;
260260
tracer.SetResult(result);
261+
if (this.Settings.ConnectionStatusHandler != null)
262+
this.Settings.ConnectionStatusHandler(result);
261263
return result;
262264
}
263265
}
@@ -369,6 +371,8 @@ public Task<ElasticsearchResponse<T>> DoRequestAsync<T>(string method, string pa
369371
}
370372

371373
requestState.Tracer.SetResult(t.Result);
374+
if (this.Settings.ConnectionStatusHandler != null)
375+
this.Settings.ConnectionStatusHandler(t.Result);
372376
return tcs.Task;
373377
}).Unwrap();
374378
}

‎src/Elasticsearch.Net/Domain/RequestParameters.Generated.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,12 +1138,12 @@ public ClusterPendingTasksRequestParameters MasterTimeout(string master_timeout)
11381138
///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cluster-update-settings.html
11391139
///</pre>
11401140
///</summary>
1141-
public class ClusterPutSettingsRequestParameters : FluentRequestParameters<ClusterPutSettingsRequestParameters>
1141+
public class ClusterSettingsRequestParameters : FluentRequestParameters<ClusterSettingsRequestParameters>
11421142
{
11431143

11441144
internal bool _flat_settings { get; set; }
11451145
///<summary>Return settings in flat format (default: false)</summary>
1146-
public ClusterPutSettingsRequestParameters FlatSettings(bool flat_settings)
1146+
public ClusterSettingsRequestParameters FlatSettings(bool flat_settings)
11471147
{
11481148
this._flat_settings = flat_settings;
11491149
this.AddQueryString("flat_settings", this._flat_settings);

‎src/Elasticsearch.Net/ElasticsearchClient.Generated.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4591,14 +4591,14 @@ public Task<ElasticsearchResponse<DynamicDictionary>> ClusterPendingTasksAsync(F
45914591
///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
45924592
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
45934593
///</returns>
4594-
public ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null)
4594+
public ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null)
45954595
{
45964596
var url = "_cluster/settings".F();
45974597
BaseRequestParameters requestParams = null;
45984598

45994599
if (requestParameters != null)
46004600
{
4601-
requestParams = requestParameters(new ClusterPutSettingsRequestParameters());
4601+
requestParams = requestParameters(new ClusterSettingsRequestParameters());
46024602
ToNameValueCollection(requestParams);
46034603
}
46044604

@@ -4625,14 +4625,14 @@ public ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterP
46254625
///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
46264626
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
46274627
///</returns>
4628-
public Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null)
4628+
public Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null)
46294629
{
46304630
var url = "_cluster/settings".F();
46314631
BaseRequestParameters requestParams = null;
46324632

46334633
if (requestParameters != null)
46344634
{
4635-
requestParams = requestParameters(new ClusterPutSettingsRequestParameters());
4635+
requestParams = requestParameters(new ClusterSettingsRequestParameters());
46364636
ToNameValueCollection(requestParams);
46374637
}
46384638

@@ -4661,14 +4661,14 @@ public Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Fu
46614661
///<para> - i.e result.Response.hits.hits[0].property.nested["nested_deeper"]</para>
46624662
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
46634663
///</returns>
4664-
public ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null)
4664+
public ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null)
46654665
{
46664666
var url = "_cluster/settings".F();
46674667
BaseRequestParameters requestParams = null;
46684668

46694669
if (requestParameters != null)
46704670
{
4671-
requestParams = requestParameters(new ClusterPutSettingsRequestParameters());
4671+
requestParams = requestParameters(new ClusterSettingsRequestParameters());
46724672
ToNameValueCollection(requestParams);
46734673
}
46744674

@@ -4697,14 +4697,14 @@ public ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body,
46974697
///<para> - i.e result.Response.hits.hits[0].property.nested["nested_deeper"]</para>
46984698
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
46994699
///</returns>
4700-
public Task<ElasticsearchResponse<DynamicDictionary>> ClusterPutSettingsAsync(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null)
4700+
public Task<ElasticsearchResponse<DynamicDictionary>> ClusterPutSettingsAsync(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null)
47014701
{
47024702
var url = "_cluster/settings".F();
47034703
BaseRequestParameters requestParams = null;
47044704

47054705
if (requestParameters != null)
47064706
{
4707-
requestParams = requestParameters(new ClusterPutSettingsRequestParameters());
4707+
requestParams = requestParameters(new ClusterSettingsRequestParameters());
47084708
ToNameValueCollection(requestParams);
47094709
}
47104710

@@ -23211,7 +23211,7 @@ public Task<ElasticsearchResponse<DynamicDictionary>> InfoAsync(Func<InfoRequest
2321123211
requestParams = requestParameters(new InfoRequestParameters());
2321223212
ToNameValueCollection(requestParams);
2321323213
}
23214-
23214+
2321523215

2321623216

2321723217
return ElasticsearchResponse.WrapAsync(this.DoRequestAsync<Dictionary<string, object>>(

‎src/Elasticsearch.Net/IElasticsearchClient.Generated.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2508,7 +2508,7 @@ public interface IElasticsearchClient
25082508
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
25092509
///</returns>
25102510

2511-
ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null);
2511+
ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null);
25122512

25132513
///<summary>Represents a PUT on /_cluster/settings
25142514
///<para></para>Returns: A task that'll return an ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -2526,7 +2526,7 @@ public interface IElasticsearchClient
25262526
///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
25272527
///</returns>
25282528

2529-
Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null);
2529+
Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null);
25302530

25312531
///<summary>Represents a PUT on /_cluster/settings
25322532
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary
@@ -2546,7 +2546,7 @@ public interface IElasticsearchClient
25462546
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
25472547
///</returns>
25482548

2549-
ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null);
2549+
ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null);
25502550

25512551
///<summary>Represents a PUT on /_cluster/settings
25522552
///<para></para>Returns: Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary
@@ -2566,7 +2566,7 @@ public interface IElasticsearchClient
25662566
///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
25672567
///</returns>
25682568

2569-
Task<ElasticsearchResponse<DynamicDictionary>> ClusterPutSettingsAsync(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null);
2569+
Task<ElasticsearchResponse<DynamicDictionary>> ClusterPutSettingsAsync(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null);
25702570

25712571
///<summary>Represents a POST on /_cluster/reroute
25722572
///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.

‎src/Nest/DSL/AliasDescriptor.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
namespace Nest
1414
{
1515
[DescriptorFor("IndicesUpdateAliases")]
16-
public partial class AliasDescriptor : BasePathDescriptor<AliasDescriptor>,
17-
IPathInfo<AliasRequestParameters>
16+
public partial class AliasDescriptor : BasePathDescriptor<AliasDescriptor, AliasRequestParameters>
1817
{
1918
public AliasDescriptor()
2019
{
@@ -41,13 +40,11 @@ public AliasDescriptor Remove(Func<AliasRemoveDescriptor, AliasRemoveDescriptor>
4140
return this;
4241
}
4342

44-
ElasticsearchPathInfo<AliasRequestParameters> IPathInfo<AliasRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
43+
44+
protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<AliasRequestParameters> pathInfo)
4545
{
46-
var pathInfo = new ElasticsearchPathInfo<AliasRequestParameters>();
47-
pathInfo.RequestParameters = this._QueryString;
4846
pathInfo.HttpMethod = PathInfoHttpMethod.POST;
49-
50-
return pathInfo;
5147
}
48+
5249
}
5350
}

‎src/Nest/DSL/AnalyzeDescriptor.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@
1212
namespace Nest
1313
{
1414
[DescriptorFor("IndicesAnalyze")]
15-
public partial class AnalyzeDescriptor :
16-
IndicesOptionalPathDescriptor<AnalyzeDescriptor, AnalyzeRequestParameters>
17-
, IPathInfo<AnalyzeRequestParameters>
15+
public partial class AnalyzeDescriptor : IndicesOptionalPathDescriptor<AnalyzeDescriptor, AnalyzeRequestParameters>
1816
{
19-
20-
ElasticsearchPathInfo<AnalyzeRequestParameters> IPathInfo<AnalyzeRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
17+
protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<AnalyzeRequestParameters> pathInfo)
2118
{
22-
var pathInfo = base.ToPathInfo(settings, this._QueryString);
2319
pathInfo.HttpMethod = PathInfoHttpMethod.POST;
24-
25-
return pathInfo;
2620
}
2721
}
2822
}

‎src/Nest/DSL/BulkCreateDescriptor.cs‎ renamed to ‎src/Nest/DSL/Bulk/BulkCreateDescriptor.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)