Skip to content

Commit 8902e22

Browse files
committed
we now deal with enum types properly when to stringing them
1 parent 0daa4a9 commit 8902e22

File tree

10 files changed

+935
-910
lines changed

10 files changed

+935
-910
lines changed

src/Nest.Tests.Integration/ConnectionTests.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,14 @@ public void ConnectUsingRawClient()
114114

115115
StringAssert.EndsWith(":9200/?hello=world&pretty=true", resultWithQueryString.RequestUrl);
116116
}
117+
118+
[Test]
119+
public void ConnectUsingRawClientComplexCall()
120+
{
121+
var result = this._client.Raw.ClusterHealthGet(s=>s.Level(LevelOptions.Indices).Local(true));
122+
Assert.IsTrue(result.Success);
123+
StringAssert.EndsWith(":9200/_cluster/health?level=indices&local=true&pretty=true", result.RequestUrl);
124+
125+
}
117126
}
118127
}

src/Nest/Enums/Enums.Generated.cs

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Text;
55
using Newtonsoft.Json;
66
using Newtonsoft.Json.Converters;
7+
using System.Runtime.Serialization;
78

89
///This file contains all the typed enums that the client rest api spec exposes.
910
///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
@@ -15,195 +16,195 @@ namespace Nest
1516
[JsonConverter(typeof(StringEnumConverter))]
1617
public enum ConsistencyOptions
1718
{
18-
[JsonProperty("one")]
19+
[EnumMember(Value = "one")]
1920
One,
20-
[JsonProperty("quorum")]
21+
[EnumMember(Value = "quorum")]
2122
Quorum,
22-
[JsonProperty("all")]
23+
[EnumMember(Value = "all")]
2324
All
2425
}
2526

2627

2728
[JsonConverter(typeof(StringEnumConverter))]
2829
public enum ReplicationOptions
2930
{
30-
[JsonProperty("sync")]
31+
[EnumMember(Value = "sync")]
3132
Sync,
32-
[JsonProperty("async")]
33+
[EnumMember(Value = "async")]
3334
Async
3435
}
3536

3637

3738
[JsonConverter(typeof(StringEnumConverter))]
3839
public enum LevelOptions
3940
{
40-
[JsonProperty("cluster")]
41+
[EnumMember(Value = "cluster")]
4142
Cluster,
42-
[JsonProperty("indices")]
43+
[EnumMember(Value = "indices")]
4344
Indices,
44-
[JsonProperty("shards")]
45+
[EnumMember(Value = "shards")]
4546
Shards
4647
}
4748

4849

4950
[JsonConverter(typeof(StringEnumConverter))]
5051
public enum WaitForStatusOptions
5152
{
52-
[JsonProperty("green")]
53+
[EnumMember(Value = "green")]
5354
Green,
54-
[JsonProperty("yellow")]
55+
[EnumMember(Value = "yellow")]
5556
Yellow,
56-
[JsonProperty("red")]
57+
[EnumMember(Value = "red")]
5758
Red
5859
}
5960

6061

6162
[JsonConverter(typeof(StringEnumConverter))]
6263
public enum TypeOptions
6364
{
64-
[JsonProperty("cpu")]
65+
[EnumMember(Value = "cpu")]
6566
Cpu,
66-
[JsonProperty("wait")]
67+
[EnumMember(Value = "wait")]
6768
Wait,
68-
[JsonProperty("block")]
69+
[EnumMember(Value = "block")]
6970
Block
7071
}
7172

7273

7374
[JsonConverter(typeof(StringEnumConverter))]
7475
public enum IgnoreIndicesOptions
7576
{
76-
[JsonProperty("none")]
77+
[EnumMember(Value = "none")]
7778
None,
78-
[JsonProperty("missing")]
79+
[EnumMember(Value = "missing")]
7980
Missing
8081
}
8182

8283

8384
[JsonConverter(typeof(StringEnumConverter))]
8485
public enum VersionTypeOptions
8586
{
86-
[JsonProperty("internal")]
87+
[EnumMember(Value = "internal")]
8788
Internal,
88-
[JsonProperty("external")]
89+
[EnumMember(Value = "external")]
8990
External
9091
}
9192

9293

9394
[JsonConverter(typeof(StringEnumConverter))]
9495
public enum DefaultOperatorOptions
9596
{
96-
[JsonProperty("AND")]
97+
[EnumMember(Value = "AND")]
9798
And,
98-
[JsonProperty("OR")]
99+
[EnumMember(Value = "OR")]
99100
Or
100101
}
101102

102103

103104
[JsonConverter(typeof(StringEnumConverter))]
104105
public enum OpTypeOptions
105106
{
106-
[JsonProperty("index")]
107+
[EnumMember(Value = "index")]
107108
Index,
108-
[JsonProperty("create")]
109+
[EnumMember(Value = "create")]
109110
Create
110111
}
111112

112113

113114
[JsonConverter(typeof(StringEnumConverter))]
114115
public enum FormatOptions
115116
{
116-
[JsonProperty("detailed")]
117+
[EnumMember(Value = "detailed")]
117118
Detailed,
118-
[JsonProperty("text")]
119+
[EnumMember(Value = "text")]
119120
Text
120121
}
121122

122123

123124
[JsonConverter(typeof(StringEnumConverter))]
124125
public enum SearchTypeOptions
125126
{
126-
[JsonProperty("query_then_fetch")]
127+
[EnumMember(Value = "query_then_fetch")]
127128
QueryThenFetch,
128-
[JsonProperty("query_and_fetch")]
129+
[EnumMember(Value = "query_and_fetch")]
129130
QueryAndFetch,
130-
[JsonProperty("dfs_query_then_fetch")]
131+
[EnumMember(Value = "dfs_query_then_fetch")]
131132
DfsQueryThenFetch,
132-
[JsonProperty("dfs_query_and_fetch")]
133+
[EnumMember(Value = "dfs_query_and_fetch")]
133134
DfsQueryAndFetch,
134-
[JsonProperty("count")]
135+
[EnumMember(Value = "count")]
135136
Count,
136-
[JsonProperty("scan")]
137+
[EnumMember(Value = "scan")]
137138
Scan
138139
}
139140

140141

141142
[JsonConverter(typeof(StringEnumConverter))]
142143
public enum SuggestModeOptions
143144
{
144-
[JsonProperty("missing")]
145+
[EnumMember(Value = "missing")]
145146
Missing,
146-
[JsonProperty("popular")]
147+
[EnumMember(Value = "popular")]
147148
Popular,
148-
[JsonProperty("always")]
149+
[EnumMember(Value = "always")]
149150
Always
150151
}
151152

152153

153154
[JsonConverter(typeof(StringEnumConverter))]
154155
public enum MetricFamilyOptions
155156
{
156-
[JsonProperty("all")]
157+
[EnumMember(Value = "all")]
157158
All,
158-
[JsonProperty("fs")]
159+
[EnumMember(Value = "fs")]
159160
Fs,
160-
[JsonProperty("http")]
161+
[EnumMember(Value = "http")]
161162
Http,
162-
[JsonProperty("indices")]
163+
[EnumMember(Value = "indices")]
163164
Indices,
164-
[JsonProperty("jvm")]
165+
[EnumMember(Value = "jvm")]
165166
Jvm,
166-
[JsonProperty("network")]
167+
[EnumMember(Value = "network")]
167168
Network,
168-
[JsonProperty("os")]
169+
[EnumMember(Value = "os")]
169170
Os,
170-
[JsonProperty("process")]
171+
[EnumMember(Value = "process")]
171172
Process,
172-
[JsonProperty("thread_pool")]
173+
[EnumMember(Value = "thread_pool")]
173174
ThreadPool,
174-
[JsonProperty("transport")]
175+
[EnumMember(Value = "transport")]
175176
Transport
176177
}
177178

178179

179180
[JsonConverter(typeof(StringEnumConverter))]
180181
public enum MetricOptions
181182
{
182-
[JsonProperty("completion")]
183+
[EnumMember(Value = "completion")]
183184
Completion,
184-
[JsonProperty("docs")]
185+
[EnumMember(Value = "docs")]
185186
Docs,
186-
[JsonProperty("fielddata")]
187+
[EnumMember(Value = "fielddata")]
187188
Fielddata,
188-
[JsonProperty("filter_cache")]
189+
[EnumMember(Value = "filter_cache")]
189190
FilterCache,
190-
[JsonProperty("flush")]
191+
[EnumMember(Value = "flush")]
191192
Flush,
192-
[JsonProperty("get")]
193+
[EnumMember(Value = "get")]
193194
Get,
194-
[JsonProperty("id_cache")]
195+
[EnumMember(Value = "id_cache")]
195196
IdCache,
196-
[JsonProperty("indexing")]
197+
[EnumMember(Value = "indexing")]
197198
Indexing,
198-
[JsonProperty("merges")]
199+
[EnumMember(Value = "merges")]
199200
Merges,
200-
[JsonProperty("refresh")]
201+
[EnumMember(Value = "refresh")]
201202
Refresh,
202-
[JsonProperty("search")]
203+
[EnumMember(Value = "search")]
203204
Search,
204-
[JsonProperty("store")]
205+
[EnumMember(Value = "store")]
205206
Store,
206-
[JsonProperty("warmer")]
207+
[EnumMember(Value = "warmer")]
207208
Warmer
208209
}
209210

0 commit comments

Comments
 (0)