Skip to content

Make sure to reject mappings with type _doc when include_type_name is false. #38270

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 15 commits into from
Feb 5, 2019
Merged

Make sure to reject mappings with type _doc when include_type_name is false. #38270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dddf95e
Pull MetaDataMappingService#isMappingSourceTyped into MapperService.
jtibshirani Feb 3, 2019
6ce1eb0
Make sure to reject typed index creation + template requests when inc…
jtibshirani Feb 2, 2019
765979b
Unify some mappings logic between index and template creation.
jtibshirani Feb 2, 2019
aff2299
Fix the same issue in put mapping requests.
jtibshirani Feb 3, 2019
93ec33f
Make sure test set-up code uses typeless APIs.
jtibshirani Feb 3, 2019
82066cf
Fix some REST tests.
jtibshirani Feb 3, 2019
9ac6ba7
Fix more integration tests.
jtibshirani Feb 4, 2019
9cc6ed6
Fix the SQL plugin tests.
jtibshirani Feb 4, 2019
8175962
Fix the x-pack multi node tests.
jtibshirani Feb 4, 2019
ecbd76c
Check for the correct error message in REST yml tests.
jtibshirani Feb 4, 2019
06b202e
Make sure to use 'condition == false'.
jtibshirani Feb 4, 2019
a24123d
Handle malformed mappings in RestCreateIndexAction#prepareMappings.
jtibshirani Feb 4, 2019
98a9d9b
Merge remote-tracking branch 'upstream/master' into dummy-type-in-typ…
jtibshirani Feb 5, 2019
e5af064
Apply the same fix for rollover requests.
jtibshirani Feb 5, 2019
b312148
Merge remote-tracking branch 'upstream/master' into dummy-type-in-typ…
jtibshirani Feb 5, 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
20 changes: 8 additions & 12 deletions ...-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,12 +1235,10 @@ public void testGet() throws Exception {
createIndex.setJsonEntity(
"{\n" +
" \"mappings\" : {\n" +
" \"_doc\" : {\n" +
" \"properties\" : {\n" +
" \"message\" : {\n" +
" \"type\": \"text\",\n" +
" \"store\": true\n" +
" }\n" +
" \"properties\" : {\n" +
" \"message\" : {\n" +
" \"type\": \"text\",\n" +
" \"store\": true\n" +
" }\n" +
" }\n" +
" }\n" +
Expand Down Expand Up @@ -1764,12 +1762,10 @@ public void testMultiGet() throws Exception {
createIndex.setJsonEntity(
"{\n" +
" \"mappings\" : {\n" +
" \"_doc\" : {\n" +
" \"properties\" : {\n" +
" \"foo\" : {\n" +
" \"type\": \"text\",\n" +
" \"store\": true\n" +
" }\n" +
" \"properties\" : {\n" +
" \"foo\" : {\n" +
" \"type\": \"text\",\n" +
" \"store\": true\n" +
" }\n" +
" }\n" +
" }\n" +
Expand Down
20 changes: 6 additions & 14 deletions ...el/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,13 @@ public void testCreateIndex() throws IOException {
{
request = new CreateIndexRequest("twitter2");
//tag::create-index-mappings-map
Map<String, Object> jsonMap = new HashMap<>();
Map<String, Object> message = new HashMap<>();
message.put("type", "text");
Map<String, Object> properties = new HashMap<>();
properties.put("message", message);
Map<String, Object> mapping = new HashMap<>();
mapping.put("properties", properties);
jsonMap.put("_doc", mapping);
request.mapping(jsonMap); // <1>
request.mapping(mapping); // <1>
//end::create-index-mappings-map
CreateIndexResponse createIndexResponse = client.indices().create(request, RequestOptions.DEFAULT);
assertTrue(createIndexResponse.isAcknowledged());
Expand All @@ -332,15 +330,11 @@ public void testCreateIndex() throws IOException {
XContentBuilder builder = XContentFactory.jsonBuilder();
builder.startObject();
{
builder.startObject("_doc");
builder.startObject("properties");
{
builder.startObject("properties");
builder.startObject("message");
{
builder.startObject("message");
{
builder.field("type", "text");
}
builder.endObject();
builder.field("type", "text");
}
builder.endObject();
}
Expand Down Expand Up @@ -381,10 +375,8 @@ public void testCreateIndex() throws IOException {
" \"number_of_replicas\" : 0\n" +
" },\n" +
" \"mappings\" : {\n" +
" \"_doc\" : {\n" +
" \"properties\" : {\n" +
" \"message\" : { \"type\" : \"text\" }\n" +
" }\n" +
" \"properties\" : {\n" +
" \"message\" : { \"type\" : \"text\" }\n" +
" }\n" +
" },\n" +
" \"aliases\" : {\n" +
Expand Down
Loading