2626import org .elasticsearch .action .admin .indices .shrink .ResizeType ;
2727import org .elasticsearch .action .admin .indices .template .delete .DeleteIndexTemplateRequest ;
2828import org .elasticsearch .action .admin .indices .validate .query .ValidateQueryRequest ;
29+ import org .elasticsearch .action .support .broadcast .BroadcastRequest ;
2930import org .elasticsearch .client .indices .AnalyzeRequest ;
3031import org .elasticsearch .client .indices .CloseIndexRequest ;
3132import org .elasticsearch .client .indices .CreateDataStreamRequest ;
@@ -100,7 +101,9 @@ static Request deleteIndex(DeleteIndexRequest deleteIndexRequest) {
100101 RequestConverters .Params parameters = new RequestConverters .Params ();
101102 parameters .withTimeout (deleteIndexRequest .timeout ());
102103 parameters .withMasterTimeout (deleteIndexRequest .masterNodeTimeout ());
103- parameters .withIndicesOptions (deleteIndexRequest .indicesOptions ());
104+ if (DeleteIndexRequest .DEFAULT_INDICES_OPTIONS .equals (deleteIndexRequest .indicesOptions ()) == false ) {
105+ parameters .withIndicesOptions (deleteIndexRequest .indicesOptions ());
106+ }
104107 request .addParameters (parameters .asMap ());
105108 return request ;
106109 }
@@ -113,7 +116,9 @@ static Request openIndex(OpenIndexRequest openIndexRequest) {
113116 parameters .withTimeout (openIndexRequest .timeout ());
114117 parameters .withMasterTimeout (openIndexRequest .masterNodeTimeout ());
115118 parameters .withWaitForActiveShards (openIndexRequest .waitForActiveShards ());
116- parameters .withIndicesOptions (openIndexRequest .indicesOptions ());
119+ if (OpenIndexRequest .DEFAULT_INDICES_OPTIONS .equals (openIndexRequest .indicesOptions ()) == false ) {
120+ parameters .withIndicesOptions (openIndexRequest .indicesOptions ());
121+ }
117122 request .addParameters (parameters .asMap ());
118123 return request ;
119124 }
@@ -125,7 +130,9 @@ static Request closeIndex(CloseIndexRequest closeIndexRequest) {
125130 RequestConverters .Params parameters = new RequestConverters .Params ();
126131 parameters .withTimeout (closeIndexRequest .timeout ());
127132 parameters .withMasterTimeout (closeIndexRequest .masterNodeTimeout ());
128- parameters .withIndicesOptions (closeIndexRequest .indicesOptions ());
133+ if (CloseIndexRequest .DEFAULT_INDICES_OPTIONS .equals (closeIndexRequest .indicesOptions ()) == false ) {
134+ parameters .withIndicesOptions (closeIndexRequest .indicesOptions ());
135+ }
129136 parameters .withWaitForActiveShards (closeIndexRequest .waitForActiveShards ());
130137 request .addParameters (parameters .asMap ());
131138 return request ;
@@ -163,7 +170,9 @@ static Request putMapping(PutMappingRequest putMappingRequest) throws IOExceptio
163170 RequestConverters .Params parameters = new RequestConverters .Params ();
164171 parameters .withTimeout (putMappingRequest .timeout ());
165172 parameters .withMasterTimeout (putMappingRequest .masterNodeTimeout ());
166- parameters .withIndicesOptions (putMappingRequest .indicesOptions ());
173+ if (PutMappingRequest .DEFAULT_INDICES_OPTIONS .equals (putMappingRequest .indicesOptions ()) == false ) {
174+ parameters .withIndicesOptions (putMappingRequest .indicesOptions ());
175+ }
167176 request .addParameters (parameters .asMap ());
168177 request .setEntity (RequestConverters .createEntity (putMappingRequest , RequestConverters .REQUEST_BODY_CONTENT_TYPE ));
169178 return request ;
@@ -207,7 +216,9 @@ static Request refresh(RefreshRequest refreshRequest) {
207216 Request request = new Request (HttpPost .METHOD_NAME , RequestConverters .endpoint (indices , "_refresh" ));
208217
209218 RequestConverters .Params parameters = new RequestConverters .Params ();
210- parameters .withIndicesOptions (refreshRequest .indicesOptions ());
219+ if (BroadcastRequest .DEFAULT_INDICES_OPTIONS .equals (refreshRequest .indicesOptions ()) == false ) {
220+ parameters .withIndicesOptions (refreshRequest .indicesOptions ());
221+ }
211222 request .addParameters (parameters .asMap ());
212223 return request ;
213224 }
@@ -217,7 +228,9 @@ static Request flush(FlushRequest flushRequest) {
217228 Request request = new Request (HttpPost .METHOD_NAME , RequestConverters .endpoint (indices , "_flush" ));
218229
219230 RequestConverters .Params parameters = new RequestConverters .Params ();
220- parameters .withIndicesOptions (flushRequest .indicesOptions ());
231+ if (BroadcastRequest .DEFAULT_INDICES_OPTIONS .equals (flushRequest .indicesOptions ()) == false ) {
232+ parameters .withIndicesOptions (flushRequest .indicesOptions ());
233+ }
221234 parameters .putParam ("wait_if_ongoing" , Boolean .toString (flushRequest .waitIfOngoing ()));
222235 parameters .putParam ("force" , Boolean .toString (flushRequest .force ()));
223236 request .addParameters (parameters .asMap ());
@@ -229,7 +242,9 @@ static Request forceMerge(ForceMergeRequest forceMergeRequest) {
229242 Request request = new Request (HttpPost .METHOD_NAME , RequestConverters .endpoint (indices , "_forcemerge" ));
230243
231244 RequestConverters .Params parameters = new RequestConverters .Params ();
232- parameters .withIndicesOptions (forceMergeRequest .indicesOptions ());
245+ if (BroadcastRequest .DEFAULT_INDICES_OPTIONS .equals (forceMergeRequest .indicesOptions ()) == false ) {
246+ parameters .withIndicesOptions (forceMergeRequest .indicesOptions ());
247+ }
233248 parameters .putParam ("max_num_segments" , Integer .toString (forceMergeRequest .maxNumSegments ()));
234249 parameters .putParam ("only_expunge_deletes" , Boolean .toString (forceMergeRequest .onlyExpungeDeletes ()));
235250 parameters .putParam ("flush" , Boolean .toString (forceMergeRequest .flush ()));
@@ -242,7 +257,9 @@ static Request clearCache(ClearIndicesCacheRequest clearIndicesCacheRequest) {
242257 Request request = new Request (HttpPost .METHOD_NAME , RequestConverters .endpoint (indices , "_cache/clear" ));
243258
244259 RequestConverters .Params parameters = new RequestConverters .Params ();
245- parameters .withIndicesOptions (clearIndicesCacheRequest .indicesOptions ());
260+ if (BroadcastRequest .DEFAULT_INDICES_OPTIONS .equals (clearIndicesCacheRequest .indicesOptions ()) == false ) {
261+ parameters .withIndicesOptions (clearIndicesCacheRequest .indicesOptions ());
262+ }
246263 parameters .putParam ("query" , Boolean .toString (clearIndicesCacheRequest .queryCache ()));
247264 parameters .putParam ("fielddata" , Boolean .toString (clearIndicesCacheRequest .fieldDataCache ()));
248265 parameters .putParam ("request" , Boolean .toString (clearIndicesCacheRequest .requestCache ()));
@@ -262,7 +279,9 @@ static Request existsAlias(GetAliasesRequest getAliasesRequest) {
262279 Request request = new Request (HttpHead .METHOD_NAME , RequestConverters .endpoint (indices , "_alias" , aliases ));
263280
264281 RequestConverters .Params params = new RequestConverters .Params ();
265- params .withIndicesOptions (getAliasesRequest .indicesOptions ());
282+ if (GetAliasesRequest .DEFAULT_INDICES_OPTIONS .equals (getAliasesRequest .indicesOptions ()) == false ) {
283+ params .withIndicesOptions (getAliasesRequest .indicesOptions ());
284+ }
266285 params .withLocal (getAliasesRequest .local ());
267286 request .addParameters (params .asMap ());
268287 return request ;
@@ -363,7 +382,9 @@ static Request getSettings(GetSettingsRequest getSettingsRequest) {
363382 Request request = new Request (HttpGet .METHOD_NAME , endpoint );
364383
365384 RequestConverters .Params params = new RequestConverters .Params ();
366- params .withIndicesOptions (getSettingsRequest .indicesOptions ());
385+ if (GetSettingsRequest .DEFAULT_INDICES_OPTIONS .equals (getSettingsRequest .indicesOptions ()) == false ) {
386+ params .withIndicesOptions (getSettingsRequest .indicesOptions ());
387+ }
367388 params .withLocal (getSettingsRequest .local ());
368389 params .withIncludeDefaults (getSettingsRequest .includeDefaults ());
369390 params .withMasterTimeout (getSettingsRequest .masterNodeTimeout ());
@@ -378,7 +399,9 @@ static Request getIndex(GetIndexRequest getIndexRequest) {
378399 Request request = new Request (HttpGet .METHOD_NAME , endpoint );
379400
380401 RequestConverters .Params params = new RequestConverters .Params ();
381- params .withIndicesOptions (getIndexRequest .indicesOptions ());
402+ if (GetIndexRequest .DEFAULT_INDICES_OPTIONS .equals (getIndexRequest .indicesOptions ()) == false ) {
403+ params .withIndicesOptions (getIndexRequest .indicesOptions ());
404+ }
382405 params .withLocal (getIndexRequest .local ());
383406 params .withIncludeDefaults (getIndexRequest .includeDefaults ());
384407 params .withHuman (getIndexRequest .humanReadable ());
@@ -397,7 +420,9 @@ static Request indicesExist(GetIndexRequest getIndexRequest) {
397420 RequestConverters .Params params = new RequestConverters .Params ();
398421 params .withLocal (getIndexRequest .local ());
399422 params .withHuman (getIndexRequest .humanReadable ());
400- params .withIndicesOptions (getIndexRequest .indicesOptions ());
423+ if (GetIndexRequest .DEFAULT_INDICES_OPTIONS .equals (getIndexRequest .indicesOptions ()) == false ) {
424+ params .withIndicesOptions (getIndexRequest .indicesOptions ());
425+ }
401426 params .withIncludeDefaults (getIndexRequest .includeDefaults ());
402427 request .addParameters (params .asMap ());
403428 return request ;
@@ -410,7 +435,9 @@ static Request indexPutSettings(UpdateSettingsRequest updateSettingsRequest) thr
410435 RequestConverters .Params parameters = new RequestConverters .Params ();
411436 parameters .withTimeout (updateSettingsRequest .timeout ());
412437 parameters .withMasterTimeout (updateSettingsRequest .masterNodeTimeout ());
413- parameters .withIndicesOptions (updateSettingsRequest .indicesOptions ());
438+ if (UpdateSettingsRequest .DEFAULT_INDICES_OPTIONS .equals (updateSettingsRequest .indicesOptions ()) == false ) {
439+ parameters .withIndicesOptions (updateSettingsRequest .indicesOptions ());
440+ }
414441 parameters .withPreserveExisting (updateSettingsRequest .isPreserveExisting ());
415442 request .addParameters (parameters .asMap ());
416443 request .setEntity (RequestConverters .createEntity (updateSettingsRequest , RequestConverters .REQUEST_BODY_CONTENT_TYPE ));
@@ -477,7 +504,9 @@ static Request validateQuery(ValidateQueryRequest validateQueryRequest) throws I
477504 String endpoint = RequestConverters .endpoint (indices , "_validate/query" );
478505 Request request = new Request (HttpGet .METHOD_NAME , endpoint );
479506 RequestConverters .Params params = new RequestConverters .Params ();
480- params .withIndicesOptions (validateQueryRequest .indicesOptions ());
507+ if (ValidateQueryRequest .DEFAULT_INDICES_OPTIONS .equals (validateQueryRequest .indicesOptions ()) == false ) {
508+ params .withIndicesOptions (validateQueryRequest .indicesOptions ());
509+ }
481510 params .putParam ("explain" , Boolean .toString (validateQueryRequest .explain ()));
482511 params .putParam ("all_shards" , Boolean .toString (validateQueryRequest .allShards ()));
483512 params .putParam ("rewrite" , Boolean .toString (validateQueryRequest .rewrite ()));
@@ -492,7 +521,9 @@ static Request getAlias(GetAliasesRequest getAliasesRequest) {
492521 String endpoint = RequestConverters .endpoint (indices , "_alias" , aliases );
493522 Request request = new Request (HttpGet .METHOD_NAME , endpoint );
494523 RequestConverters .Params params = new RequestConverters .Params ();
495- params .withIndicesOptions (getAliasesRequest .indicesOptions ());
524+ if (GetAliasesRequest .DEFAULT_INDICES_OPTIONS .equals (getAliasesRequest .indicesOptions ()) == false ) {
525+ params .withIndicesOptions (getAliasesRequest .indicesOptions ());
526+ }
496527 params .withLocal (getAliasesRequest .local ());
497528 request .addParameters (params .asMap ());
498529 return request ;
@@ -610,7 +641,9 @@ static Request reloadAnalyzers(ReloadAnalyzersRequest reloadAnalyzersRequest) {
610641 String endpoint = RequestConverters .endpoint (reloadAnalyzersRequest .getIndices (), "_reload_search_analyzers" );
611642 Request request = new Request (HttpPost .METHOD_NAME , endpoint );
612643 RequestConverters .Params parameters = new RequestConverters .Params ();
613- parameters .withIndicesOptions (reloadAnalyzersRequest .indicesOptions ());
644+ if (ReloadAnalyzersRequest .DEFAULT_INDICES_OPTIONS .equals (reloadAnalyzersRequest .indicesOptions ()) == false ) {
645+ parameters .withIndicesOptions (reloadAnalyzersRequest .indicesOptions ());
646+ }
614647 request .addParameters (parameters .asMap ());
615648 return request ;
616649 }
0 commit comments