Skip to content

Support 'include_type_name' in RestGetIndicesAction #37267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jan 11, 2019
Merged

Support 'include_type_name' in RestGetIndicesAction #37267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ebfcf07
Support 'include_type_name' in RestGetIndicesAction (#37149)
Jan 9, 2019
05e40cd
Fix type inference related compile issue in Eclipse
Jan 9, 2019
2816544
iter
Jan 9, 2019
4234bc8
Fix docs snippet
Jan 9, 2019
f6052e5
Adressing review comments
Jan 10, 2019
9e1a354
Merge branch '6.x' into backport-37149
Jan 10, 2019
5c885c4
Fix IndicesClientIT
Jan 10, 2019
d8264cb
Merge branch '6.x' into backport-37149
Jan 10, 2019
ddc0f16
Use DEFAULT_INCLUDE_TYPE_NAME_POLICY
Jan 10, 2019
dd5bf53
Force 'include_type_name' in HLRC client
Jan 10, 2019
2f914e7
Adressing more review comments
Jan 10, 2019
76f6295
Merge branch '6.x' into backport-37149
Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesRequestConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ static Request getIndex(GetIndexRequest getIndexRequest) {
params.withIncludeDefaults(getIndexRequest.includeDefaults());
params.withHuman(getIndexRequest.humanReadable());
params.withMasterTimeout(getIndexRequest.masterNodeTimeout());
params.withIncludeTypeName(true);

return request;
}
Expand Down
9 changes: 9 additions & 0 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import org.elasticsearch.index.reindex.DeleteByQueryRequest;
import org.elasticsearch.index.reindex.ReindexRequest;
import org.elasticsearch.index.reindex.UpdateByQueryRequest;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.action.search.RestSearchAction;
import org.elasticsearch.script.mustache.MultiSearchTemplateRequest;
import org.elasticsearch.script.mustache.SearchTemplateRequest;
Expand Down Expand Up @@ -930,6 +931,14 @@ Params withIncludeDefaults(boolean includeDefaults) {
return this;
}

Params withIncludeTypeName(boolean includeTypeName) {
if (includeTypeName) {
return putParam(BaseRestHandler.INCLUDE_TYPE_NAME_PARAMETER,
Boolean.toString(BaseRestHandler.DEFAULT_INCLUDE_TYPE_NAME_POLICY));
}
return this;
}

Params withPreserveExisting(boolean preserveExisting) {
if (preserveExisting) {
return putParam("preserve_existing", Boolean.TRUE.toString());
Expand Down
3 changes: 3 additions & 0 deletions ...rest-high-level/src/test/java/org/elasticsearch/client/IndicesRequestConvertersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.CollectionUtils;
import org.elasticsearch.index.RandomCreateIndexGenerator;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.test.ESTestCase;
import org.junit.Assert;

Expand Down Expand Up @@ -364,6 +365,8 @@ public void testGetIndex() throws IOException {
RequestConvertersTests.setRandomIndicesOptions(getIndexRequest::indicesOptions, getIndexRequest::indicesOptions, expectedParams);
RequestConvertersTests.setRandomLocal(getIndexRequest, expectedParams);
RequestConvertersTests.setRandomHumanReadable(getIndexRequest, expectedParams);
// Force "include_type_name" parameter since responses need to be compatible when coming from 7.0 nodes
expectedParams.put(BaseRestHandler.INCLUDE_TYPE_NAME_PARAMETER, "true");

if (ESTestCase.randomBoolean()) {
// the request object will not have include_defaults present unless it is set to
Expand Down