Skip to content

Commit 5fceab9

Browse files
Mpdreamzrusscam
authored andcommitted
enrich was forward ported but needed a regen as well (#4283)
* enrich was forward ported but needed a regen as well * update failing test
1 parent 0783dbb commit 5fceab9

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Enrich.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ namespace Elasticsearch.Net.Specification.EnrichApi
2828
public class DeleteEnrichPolicyRequestParameters : RequestParameters<DeleteEnrichPolicyRequestParameters>
2929
{
3030
public override HttpMethod DefaultHttpMethod => HttpMethod.DELETE;
31+
public override bool SupportsBody => false;
3132
}
3233

3334
///<summary>Request options for ExecutePolicy <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-execute-policy.html</para></summary>
3435
public class ExecuteEnrichPolicyRequestParameters : RequestParameters<ExecuteEnrichPolicyRequestParameters>
3536
{
3637
public override HttpMethod DefaultHttpMethod => HttpMethod.PUT;
38+
public override bool SupportsBody => false;
3739
///<summary>Should the request should block until the execution is complete.</summary>
3840
public bool? WaitForCompletion
3941
{
@@ -46,17 +48,20 @@ public bool? WaitForCompletion
4648
public class GetEnrichPolicyRequestParameters : RequestParameters<GetEnrichPolicyRequestParameters>
4749
{
4850
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
51+
public override bool SupportsBody => false;
4952
}
5053

5154
///<summary>Request options for PutPolicy <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-put-policy.html</para></summary>
5255
public class PutEnrichPolicyRequestParameters : RequestParameters<PutEnrichPolicyRequestParameters>
5356
{
5457
public override HttpMethod DefaultHttpMethod => HttpMethod.PUT;
58+
public override bool SupportsBody => true;
5559
}
5660

5761
///<summary>Request options for Stats <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-stats.html</para></summary>
5862
public class EnrichStatsRequestParameters : RequestParameters<EnrichStatsRequestParameters>
5963
{
6064
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
65+
public override bool SupportsBody => false;
6166
}
6267
}

src/Elasticsearch.Net/ElasticLowLevelClient.Enrich.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ public TResponse GetPolicy<TResponse>(string name, GetEnrichPolicyRequestParamet
7676
[MapsApi("enrich.get_policy", "name")]
7777
public Task<TResponse> GetPolicyAsync<TResponse>(string name, GetEnrichPolicyRequestParameters requestParameters = null, CancellationToken ctx = default)
7878
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET, Url($"_enrich/policy/{name:name}"), ctx, null, RequestParams(requestParameters));
79-
///<summary>GET on /_enrich/policy/ <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-get-policy.html</para></summary>
79+
///<summary>GET on /_enrich/policy <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-get-policy.html</para></summary>
8080
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
8181
public TResponse GetPolicy<TResponse>(GetEnrichPolicyRequestParameters requestParameters = null)
82-
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(GET, "_enrich/policy/", null, RequestParams(requestParameters));
83-
///<summary>GET on /_enrich/policy/ <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-get-policy.html</para></summary>
82+
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(GET, "_enrich/policy", null, RequestParams(requestParameters));
83+
///<summary>GET on /_enrich/policy <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-get-policy.html</para></summary>
8484
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
8585
[MapsApi("enrich.get_policy", "")]
8686
public Task<TResponse> GetPolicyAsync<TResponse>(GetEnrichPolicyRequestParameters requestParameters = null, CancellationToken ctx = default)
87-
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET, "_enrich/policy/", ctx, null, RequestParams(requestParameters));
87+
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET, "_enrich/policy", ctx, null, RequestParams(requestParameters));
8888
///<summary>PUT on /_enrich/policy/{name} <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-put-policy.html</para></summary>
8989
///<param name = "name">The name of the enrich policy</param>
9090
///<param name = "body">The enrich policy to register</param>

src/Nest/Descriptors.Enrich.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public GetEnrichPolicyDescriptor(Names name): base(r => r.Optional("name", name)
8484
{
8585
}
8686

87-
///<summary>/_enrich/policy/</summary>
87+
///<summary>/_enrich/policy</summary>
8888
public GetEnrichPolicyDescriptor(): base()
8989
{
9090
}

src/Nest/Requests.Enrich.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public GetEnrichPolicyRequest(Names name): base(r => r.Optional("name", name))
124124
{
125125
}
126126

127-
///<summary>/_enrich/policy/</summary>
127+
///<summary>/_enrich/policy</summary>
128128
public GetEnrichPolicyRequest(): base()
129129
{
130130
}

src/Nest/_Generated/ApiUrlsLookup.generated.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ internal static class ApiUrlsLookups
6868
internal static ApiUrls NoNamespaceDeleteScript = new ApiUrls(new[]{"_scripts/{id}"});
6969
internal static ApiUrls EnrichDeletePolicy = new ApiUrls(new[]{"_enrich/policy/{name}"});
7070
internal static ApiUrls EnrichExecutePolicy = new ApiUrls(new[]{"_enrich/policy/{name}/_execute"});
71-
internal static ApiUrls EnrichGetPolicy = new ApiUrls(new[]{"_enrich/policy/{name}", "_enrich/policy/"});
71+
internal static ApiUrls EnrichGetPolicy = new ApiUrls(new[]{"_enrich/policy/{name}", "_enrich/policy"});
7272
internal static ApiUrls EnrichPutPolicy = new ApiUrls(new[]{"_enrich/policy/{name}"});
7373
internal static ApiUrls EnrichStats = new ApiUrls(new[]{"_enrich/_stats"});
7474
internal static ApiUrls NoNamespaceDocumentExists = new ApiUrls(new[]{"{index}/_doc/{id}"});

src/Tests/Tests/XPack/Enrich/GetPolicy/GetPolicyUrlTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ await GET("/_enrich/policy/policy_name_1%2Cpolicy_name_2")
2222
.FluentAsync(c => c.Enrich.GetPolicyAsync(new [] { "policy_name_1", "policy_name_2" }))
2323
.RequestAsync(c => c.Enrich.GetPolicyAsync(new GetEnrichPolicyRequest(new [] { "policy_name_1", "policy_name_2" })));
2424

25-
await GET("/_enrich/policy/")
25+
await GET("/_enrich/policy")
2626
.Fluent(c => c.Enrich.GetPolicy())
2727
.Request(c => c.Enrich.GetPolicy(new GetEnrichPolicyRequest()))
2828
.FluentAsync(c => c.Enrich.GetPolicyAsync())

0 commit comments

Comments
 (0)