27
27
import org .elasticsearch .action .admin .indices .shrink .ResizeType ;
28
28
import org .elasticsearch .action .admin .indices .template .delete .DeleteIndexTemplateRequest ;
29
29
import org .elasticsearch .action .admin .indices .validate .query .ValidateQueryRequest ;
30
+ import org .elasticsearch .action .support .broadcast .BroadcastRequest ;
30
31
import org .elasticsearch .action .support .ActiveShardCount ;
31
32
import org .elasticsearch .client .indices .AnalyzeRequest ;
32
33
import org .elasticsearch .client .indices .CloseIndexRequest ;
@@ -104,7 +105,9 @@ static Request deleteIndex(DeleteIndexRequest deleteIndexRequest) {
104
105
RequestConverters .Params parameters = new RequestConverters .Params ();
105
106
parameters .withTimeout (deleteIndexRequest .timeout ());
106
107
parameters .withMasterTimeout (deleteIndexRequest .masterNodeTimeout ());
107
- parameters .withIndicesOptions (deleteIndexRequest .indicesOptions ());
108
+ if (DeleteIndexRequest .DEFAULT_INDICES_OPTIONS .equals (deleteIndexRequest .indicesOptions ()) == false ) {
109
+ parameters .withIndicesOptions (deleteIndexRequest .indicesOptions ());
110
+ }
108
111
request .addParameters (parameters .asMap ());
109
112
return request ;
110
113
}
@@ -117,7 +120,9 @@ static Request openIndex(OpenIndexRequest openIndexRequest) {
117
120
parameters .withTimeout (openIndexRequest .timeout ());
118
121
parameters .withMasterTimeout (openIndexRequest .masterNodeTimeout ());
119
122
parameters .withWaitForActiveShards (openIndexRequest .waitForActiveShards ());
120
- parameters .withIndicesOptions (openIndexRequest .indicesOptions ());
123
+ if (OpenIndexRequest .DEFAULT_INDICES_OPTIONS .equals (openIndexRequest .indicesOptions ()) == false ) {
124
+ parameters .withIndicesOptions (openIndexRequest .indicesOptions ());
125
+ }
121
126
request .addParameters (parameters .asMap ());
122
127
return request ;
123
128
}
@@ -129,7 +134,9 @@ static Request closeIndex(CloseIndexRequest closeIndexRequest) {
129
134
RequestConverters .Params parameters = new RequestConverters .Params ();
130
135
parameters .withTimeout (closeIndexRequest .timeout ());
131
136
parameters .withMasterTimeout (closeIndexRequest .masterNodeTimeout ());
132
- parameters .withIndicesOptions (closeIndexRequest .indicesOptions ());
137
+ if (CloseIndexRequest .DEFAULT_INDICES_OPTIONS .equals (closeIndexRequest .indicesOptions ()) == false ) {
138
+ parameters .withIndicesOptions (closeIndexRequest .indicesOptions ());
139
+ }
133
140
134
141
final ActiveShardCount activeShardCount = closeIndexRequest .waitForActiveShards ();
135
142
if (activeShardCount == ActiveShardCount .DEFAULT ) {
@@ -188,7 +195,9 @@ static Request putMapping(PutMappingRequest putMappingRequest) throws IOExceptio
188
195
RequestConverters .Params parameters = new RequestConverters .Params ();
189
196
parameters .withTimeout (putMappingRequest .timeout ());
190
197
parameters .withMasterTimeout (putMappingRequest .masterNodeTimeout ());
191
- parameters .withIndicesOptions (putMappingRequest .indicesOptions ());
198
+ if (PutMappingRequest .DEFAULT_INDICES_OPTIONS .equals (putMappingRequest .indicesOptions ()) == false ) {
199
+ parameters .withIndicesOptions (putMappingRequest .indicesOptions ());
200
+ }
192
201
request .addParameters (parameters .asMap ());
193
202
request .setEntity (RequestConverters .createEntity (putMappingRequest , RequestConverters .REQUEST_BODY_CONTENT_TYPE ));
194
203
return request ;
@@ -293,7 +302,9 @@ static Request refresh(RefreshRequest refreshRequest) {
293
302
Request request = new Request (HttpPost .METHOD_NAME , RequestConverters .endpoint (indices , "_refresh" ));
294
303
295
304
RequestConverters .Params parameters = new RequestConverters .Params ();
296
- parameters .withIndicesOptions (refreshRequest .indicesOptions ());
305
+ if (BroadcastRequest .DEFAULT_INDICES_OPTIONS .equals (refreshRequest .indicesOptions ()) == false ) {
306
+ parameters .withIndicesOptions (refreshRequest .indicesOptions ());
307
+ }
297
308
request .addParameters (parameters .asMap ());
298
309
return request ;
299
310
}
@@ -303,7 +314,9 @@ static Request flush(FlushRequest flushRequest) {
303
314
Request request = new Request (HttpPost .METHOD_NAME , RequestConverters .endpoint (indices , "_flush" ));
304
315
305
316
RequestConverters .Params parameters = new RequestConverters .Params ();
306
- parameters .withIndicesOptions (flushRequest .indicesOptions ());
317
+ if (BroadcastRequest .DEFAULT_INDICES_OPTIONS .equals (flushRequest .indicesOptions ()) == false ) {
318
+ parameters .withIndicesOptions (flushRequest .indicesOptions ());
319
+ }
307
320
parameters .putParam ("wait_if_ongoing" , Boolean .toString (flushRequest .waitIfOngoing ()));
308
321
parameters .putParam ("force" , Boolean .toString (flushRequest .force ()));
309
322
request .addParameters (parameters .asMap ());
@@ -324,7 +337,9 @@ static Request forceMerge(ForceMergeRequest forceMergeRequest) {
324
337
Request request = new Request (HttpPost .METHOD_NAME , RequestConverters .endpoint (indices , "_forcemerge" ));
325
338
326
339
RequestConverters .Params parameters = new RequestConverters .Params ();
327
- parameters .withIndicesOptions (forceMergeRequest .indicesOptions ());
340
+ if (BroadcastRequest .DEFAULT_INDICES_OPTIONS .equals (forceMergeRequest .indicesOptions ()) == false ) {
341
+ parameters .withIndicesOptions (forceMergeRequest .indicesOptions ());
342
+ }
328
343
parameters .putParam ("max_num_segments" , Integer .toString (forceMergeRequest .maxNumSegments ()));
329
344
parameters .putParam ("only_expunge_deletes" , Boolean .toString (forceMergeRequest .onlyExpungeDeletes ()));
330
345
parameters .putParam ("flush" , Boolean .toString (forceMergeRequest .flush ()));
@@ -337,7 +352,9 @@ static Request clearCache(ClearIndicesCacheRequest clearIndicesCacheRequest) {
337
352
Request request = new Request (HttpPost .METHOD_NAME , RequestConverters .endpoint (indices , "_cache/clear" ));
338
353
339
354
RequestConverters .Params parameters = new RequestConverters .Params ();
340
- parameters .withIndicesOptions (clearIndicesCacheRequest .indicesOptions ());
355
+ if (BroadcastRequest .DEFAULT_INDICES_OPTIONS .equals (clearIndicesCacheRequest .indicesOptions ()) == false ) {
356
+ parameters .withIndicesOptions (clearIndicesCacheRequest .indicesOptions ());
357
+ }
341
358
parameters .putParam ("query" , Boolean .toString (clearIndicesCacheRequest .queryCache ()));
342
359
parameters .putParam ("fielddata" , Boolean .toString (clearIndicesCacheRequest .fieldDataCache ()));
343
360
parameters .putParam ("request" , Boolean .toString (clearIndicesCacheRequest .requestCache ()));
@@ -357,7 +374,9 @@ static Request existsAlias(GetAliasesRequest getAliasesRequest) {
357
374
Request request = new Request (HttpHead .METHOD_NAME , RequestConverters .endpoint (indices , "_alias" , aliases ));
358
375
359
376
RequestConverters .Params params = new RequestConverters .Params ();
360
- params .withIndicesOptions (getAliasesRequest .indicesOptions ());
377
+ if (GetAliasesRequest .DEFAULT_INDICES_OPTIONS .equals (getAliasesRequest .indicesOptions ()) == false ) {
378
+ params .withIndicesOptions (getAliasesRequest .indicesOptions ());
379
+ }
361
380
params .withLocal (getAliasesRequest .local ());
362
381
request .addParameters (params .asMap ());
363
382
return request ;
@@ -477,7 +496,9 @@ static Request getSettings(GetSettingsRequest getSettingsRequest) {
477
496
Request request = new Request (HttpGet .METHOD_NAME , endpoint );
478
497
479
498
RequestConverters .Params params = new RequestConverters .Params ();
480
- params .withIndicesOptions (getSettingsRequest .indicesOptions ());
499
+ if (GetSettingsRequest .DEFAULT_INDICES_OPTIONS .equals (getSettingsRequest .indicesOptions ()) == false ) {
500
+ params .withIndicesOptions (getSettingsRequest .indicesOptions ());
501
+ }
481
502
params .withLocal (getSettingsRequest .local ());
482
503
params .withIncludeDefaults (getSettingsRequest .includeDefaults ());
483
504
params .withMasterTimeout (getSettingsRequest .masterNodeTimeout ());
@@ -514,7 +535,9 @@ static Request getIndex(GetIndexRequest getIndexRequest) {
514
535
Request request = new Request (HttpGet .METHOD_NAME , endpoint );
515
536
516
537
RequestConverters .Params params = new RequestConverters .Params ();
517
- params .withIndicesOptions (getIndexRequest .indicesOptions ());
538
+ if (GetIndexRequest .DEFAULT_INDICES_OPTIONS .equals (getIndexRequest .indicesOptions ()) == false ) {
539
+ params .withIndicesOptions (getIndexRequest .indicesOptions ());
540
+ }
518
541
params .withLocal (getIndexRequest .local ());
519
542
params .withIncludeDefaults (getIndexRequest .includeDefaults ());
520
543
params .withHuman (getIndexRequest .humanReadable ());
@@ -557,7 +580,9 @@ static Request indicesExist(GetIndexRequest getIndexRequest) {
557
580
RequestConverters .Params params = new RequestConverters .Params ();
558
581
params .withLocal (getIndexRequest .local ());
559
582
params .withHuman (getIndexRequest .humanReadable ());
560
- params .withIndicesOptions (getIndexRequest .indicesOptions ());
583
+ if (GetIndexRequest .DEFAULT_INDICES_OPTIONS .equals (getIndexRequest .indicesOptions ()) == false ) {
584
+ params .withIndicesOptions (getIndexRequest .indicesOptions ());
585
+ }
561
586
params .withIncludeDefaults (getIndexRequest .includeDefaults ());
562
587
request .addParameters (params .asMap ());
563
588
return request ;
@@ -570,7 +595,9 @@ static Request indexPutSettings(UpdateSettingsRequest updateSettingsRequest) thr
570
595
RequestConverters .Params parameters = new RequestConverters .Params ();
571
596
parameters .withTimeout (updateSettingsRequest .timeout ());
572
597
parameters .withMasterTimeout (updateSettingsRequest .masterNodeTimeout ());
573
- parameters .withIndicesOptions (updateSettingsRequest .indicesOptions ());
598
+ if (UpdateSettingsRequest .DEFAULT_INDICES_OPTIONS .equals (updateSettingsRequest .indicesOptions ()) == false ) {
599
+ parameters .withIndicesOptions (updateSettingsRequest .indicesOptions ());
600
+ }
574
601
parameters .withPreserveExisting (updateSettingsRequest .isPreserveExisting ());
575
602
request .addParameters (parameters .asMap ());
576
603
request .setEntity (RequestConverters .createEntity (updateSettingsRequest , RequestConverters .REQUEST_BODY_CONTENT_TYPE ));
@@ -662,7 +689,9 @@ static Request validateQuery(ValidateQueryRequest validateQueryRequest) throws I
662
689
String endpoint = RequestConverters .endpoint (indices , types , "_validate/query" );
663
690
Request request = new Request (HttpGet .METHOD_NAME , endpoint );
664
691
RequestConverters .Params params = new RequestConverters .Params ();
665
- params .withIndicesOptions (validateQueryRequest .indicesOptions ());
692
+ if (ValidateQueryRequest .DEFAULT_INDICES_OPTIONS .equals (validateQueryRequest .indicesOptions ()) == false ) {
693
+ params .withIndicesOptions (validateQueryRequest .indicesOptions ());
694
+ }
666
695
params .putParam ("explain" , Boolean .toString (validateQueryRequest .explain ()));
667
696
params .putParam ("all_shards" , Boolean .toString (validateQueryRequest .allShards ()));
668
697
params .putParam ("rewrite" , Boolean .toString (validateQueryRequest .rewrite ()));
@@ -677,7 +706,9 @@ static Request getAlias(GetAliasesRequest getAliasesRequest) {
677
706
String endpoint = RequestConverters .endpoint (indices , "_alias" , aliases );
678
707
Request request = new Request (HttpGet .METHOD_NAME , endpoint );
679
708
RequestConverters .Params params = new RequestConverters .Params ();
680
- params .withIndicesOptions (getAliasesRequest .indicesOptions ());
709
+ if (GetAliasesRequest .DEFAULT_INDICES_OPTIONS .equals (getAliasesRequest .indicesOptions ()) == false ) {
710
+ params .withIndicesOptions (getAliasesRequest .indicesOptions ());
711
+ }
681
712
params .withLocal (getAliasesRequest .local ());
682
713
request .addParameters (params .asMap ());
683
714
return request ;
@@ -807,7 +838,9 @@ static Request reloadAnalyzers(ReloadAnalyzersRequest reloadAnalyzersRequest) {
807
838
String endpoint = RequestConverters .endpoint (reloadAnalyzersRequest .getIndices (), "_reload_search_analyzers" );
808
839
Request request = new Request (HttpPost .METHOD_NAME , endpoint );
809
840
RequestConverters .Params parameters = new RequestConverters .Params ();
810
- parameters .withIndicesOptions (reloadAnalyzersRequest .indicesOptions ());
841
+ if (ReloadAnalyzersRequest .DEFAULT_INDICES_OPTIONS .equals (reloadAnalyzersRequest .indicesOptions ()) == false ) {
842
+ parameters .withIndicesOptions (reloadAnalyzersRequest .indicesOptions ());
843
+ }
811
844
request .addParameters (parameters .asMap ());
812
845
return request ;
813
846
}
0 commit comments