Skip to content

Commit 7c37458

Browse files
russcamrusscam
committed
run ApiGenerator again
Remove RefreshDescriptorOverrides as is for BWC in 5.x Remove XpackSecurity* types from Naming Conventions
1 parent b8eee16 commit 7c37458

File tree

10 files changed

+1512
-4193
lines changed

10 files changed

+1512
-4193
lines changed

‎src/CodeGeneration/ApiGenerator/Overrides/Descriptors/RefreshDescriptorOverrides.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 31 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
using System.Runtime.Serialization;
88

99
//This file contains all the typed enums that the client rest api spec exposes.
10-
//This file is automatically generated from https://github.com/elastic/elasticsearch/tree/5.5/rest-api-spec
11-
//Generated from commit 5.5
10+
//This file is automatically generated from https://github.com/elastic/elasticsearch/tree/v6.0.0-alpha1/rest-api-spec
11+
//Generated from commit v6.0.0-alpha1
1212

1313
namespace Elasticsearch.Net
1414
{
@@ -159,16 +159,6 @@ public enum SearchType
159159
DfsQueryThenFetch
160160
}
161161

162-
public enum SuggestMode
163-
{
164-
[EnumMember(Value = "missing")]
165-
Missing,
166-
[EnumMember(Value = "popular")]
167-
Popular,
168-
[EnumMember(Value = "always")]
169-
Always
170-
}
171-
172162
public enum OpType
173163
{
174164
[EnumMember(Value = "index")]
@@ -195,10 +185,14 @@ public enum ThreadType
195185
Block
196186
}
197187

198-
public enum PercolateFormat
188+
public enum SuggestMode
199189
{
200-
[EnumMember(Value = "ids")]
201-
Ids
190+
[EnumMember(Value = "missing")]
191+
Missing,
192+
[EnumMember(Value = "popular")]
193+
Popular,
194+
[EnumMember(Value = "always")]
195+
Always
202196
}
203197

204198
public enum GroupBy
@@ -257,24 +251,22 @@ [Flags]public enum IndicesStatsMetric
257251
Indexing = 1 << 6,
258252
[EnumMember(Value = "merge")]
259253
Merge = 1 << 7,
260-
[EnumMember(Value = "percolate")]
261-
Percolate = 1 << 8,
262254
[EnumMember(Value = "request_cache")]
263-
RequestCache = 1 << 9,
255+
RequestCache = 1 << 8,
264256
[EnumMember(Value = "refresh")]
265-
Refresh = 1 << 10,
257+
Refresh = 1 << 9,
266258
[EnumMember(Value = "search")]
267-
Search = 1 << 11,
259+
Search = 1 << 10,
268260
[EnumMember(Value = "segments")]
269-
Segments = 1 << 12,
261+
Segments = 1 << 11,
270262
[EnumMember(Value = "store")]
271-
Store = 1 << 13,
263+
Store = 1 << 12,
272264
[EnumMember(Value = "warmer")]
273-
Warmer = 1 << 14,
265+
Warmer = 1 << 13,
274266
[EnumMember(Value = "suggest")]
275-
Suggest = 1 << 15,
267+
Suggest = 1 << 14,
276268
[EnumMember(Value = "_all")]
277-
All = 1 << 16
269+
All = 1 << 15
278270
}
279271

280272
[Flags]public enum NodesInfoMetric
@@ -343,24 +335,22 @@ [Flags]public enum NodesStatsIndexMetric
343335
Indexing = 1 << 6,
344336
[EnumMember(Value = "merge")]
345337
Merge = 1 << 7,
346-
[EnumMember(Value = "percolate")]
347-
Percolate = 1 << 8,
348338
[EnumMember(Value = "request_cache")]
349-
RequestCache = 1 << 9,
339+
RequestCache = 1 << 8,
350340
[EnumMember(Value = "refresh")]
351-
Refresh = 1 << 10,
341+
Refresh = 1 << 9,
352342
[EnumMember(Value = "search")]
353-
Search = 1 << 11,
343+
Search = 1 << 10,
354344
[EnumMember(Value = "segments")]
355-
Segments = 1 << 12,
345+
Segments = 1 << 11,
356346
[EnumMember(Value = "store")]
357-
Store = 1 << 13,
347+
Store = 1 << 12,
358348
[EnumMember(Value = "warmer")]
359-
Warmer = 1 << 14,
349+
Warmer = 1 << 13,
360350
[EnumMember(Value = "suggest")]
361-
Suggest = 1 << 15,
351+
Suggest = 1 << 14,
362352
[EnumMember(Value = "_all")]
363-
All = 1 << 16
353+
All = 1 << 15
364354
}
365355

366356
[Flags]public enum WatcherStatsMetric
@@ -539,18 +529,6 @@ public static string GetStringValue(this SearchType enumValue)
539529
throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'SearchType'");
540530
}
541531

542-
public static string GetStringValue(this SuggestMode enumValue)
543-
{
544-
545-
switch (enumValue)
546-
{
547-
case SuggestMode.Missing: return "missing";
548-
case SuggestMode.Popular: return "popular";
549-
case SuggestMode.Always: return "always";
550-
}
551-
throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'SuggestMode'");
552-
}
553-
554532
public static string GetStringValue(this OpType enumValue)
555533
{
556534

@@ -585,14 +563,16 @@ public static string GetStringValue(this ThreadType enumValue)
585563
throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'ThreadType'");
586564
}
587565

588-
public static string GetStringValue(this PercolateFormat enumValue)
566+
public static string GetStringValue(this SuggestMode enumValue)
589567
{
590568

591569
switch (enumValue)
592570
{
593-
case PercolateFormat.Ids: return "ids";
571+
case SuggestMode.Missing: return "missing";
572+
case SuggestMode.Popular: return "popular";
573+
case SuggestMode.Always: return "always";
594574
}
595-
throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'PercolateFormat'");
575+
throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'SuggestMode'");
596576
}
597577

598578
public static string GetStringValue(this GroupBy enumValue)
@@ -644,7 +624,6 @@ public static string GetStringValue(this IndicesStatsMetric enumValue)
644624
if ((enumValue & IndicesStatsMetric.Get) != 0) list.Add("get");
645625
if ((enumValue & IndicesStatsMetric.Indexing) != 0) list.Add("indexing");
646626
if ((enumValue & IndicesStatsMetric.Merge) != 0) list.Add("merge");
647-
if ((enumValue & IndicesStatsMetric.Percolate) != 0) list.Add("percolate");
648627
if ((enumValue & IndicesStatsMetric.RequestCache) != 0) list.Add("request_cache");
649628
if ((enumValue & IndicesStatsMetric.Refresh) != 0) list.Add("refresh");
650629
if ((enumValue & IndicesStatsMetric.Search) != 0) list.Add("search");
@@ -702,7 +681,6 @@ public static string GetStringValue(this NodesStatsIndexMetric enumValue)
702681
if ((enumValue & NodesStatsIndexMetric.Get) != 0) list.Add("get");
703682
if ((enumValue & NodesStatsIndexMetric.Indexing) != 0) list.Add("indexing");
704683
if ((enumValue & NodesStatsIndexMetric.Merge) != 0) list.Add("merge");
705-
if ((enumValue & NodesStatsIndexMetric.Percolate) != 0) list.Add("percolate");
706684
if ((enumValue & NodesStatsIndexMetric.RequestCache) != 0) list.Add("request_cache");
707685
if ((enumValue & NodesStatsIndexMetric.Refresh) != 0) list.Add("refresh");
708686
if ((enumValue & NodesStatsIndexMetric.Search) != 0) list.Add("search");
@@ -740,11 +718,10 @@ static KnownEnums()
740718
EnumStringResolvers.TryAdd(typeof(VersionType), (e) => GetStringValue((VersionType)e));
741719
EnumStringResolvers.TryAdd(typeof(Conflicts), (e) => GetStringValue((Conflicts)e));
742720
EnumStringResolvers.TryAdd(typeof(SearchType), (e) => GetStringValue((SearchType)e));
743-
EnumStringResolvers.TryAdd(typeof(SuggestMode), (e) => GetStringValue((SuggestMode)e));
744721
EnumStringResolvers.TryAdd(typeof(OpType), (e) => GetStringValue((OpType)e));
745722
EnumStringResolvers.TryAdd(typeof(Format), (e) => GetStringValue((Format)e));
746723
EnumStringResolvers.TryAdd(typeof(ThreadType), (e) => GetStringValue((ThreadType)e));
747-
EnumStringResolvers.TryAdd(typeof(PercolateFormat), (e) => GetStringValue((PercolateFormat)e));
724+
EnumStringResolvers.TryAdd(typeof(SuggestMode), (e) => GetStringValue((SuggestMode)e));
748725
EnumStringResolvers.TryAdd(typeof(GroupBy), (e) => GetStringValue((GroupBy)e));
749726
EnumStringResolvers.TryAdd(typeof(ClusterStateMetric), (e) => GetStringValue((ClusterStateMetric)e));
750727
EnumStringResolvers.TryAdd(typeof(Feature), (e) => GetStringValue((Feature)e));

0 commit comments

Comments
 (0)