Skip to content

Commit e1b49c0

Browse files
author
Christoph Büscher
committed
Introduce an include_type_name constant
I started referring to this parameter name from various places in elastic#37149 so I think it's a good idea to simplify things by referring to a common constant.
1 parent ac4aecc commit e1b49c0

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ public abstract class BaseRestHandler extends AbstractComponent implements RestH
5858

5959
private final LongAdder usageCount = new LongAdder();
6060

61+
/**
62+
* Parameter that controls whether certain REST apis should include type names in their requests or responses.
63+
* Note: Support for this parameter will be removed after the transition perido to typeless APIs.
64+
*/
65+
protected static final String INCLUDE_TYPE_NAME_PARAMETER = "include_type_name";
66+
6167
protected BaseRestHandler(Settings settings) {
6268
// TODO drop settings from ctor
6369
}

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String getName() {
4949

5050
@Override
5151
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
52-
final boolean includeTypeName = request.paramAsBoolean("include_type_name", true);
52+
final boolean includeTypeName = request.paramAsBoolean(INCLUDE_TYPE_NAME_PARAMETER, true);
5353
CreateIndexRequest createIndexRequest = new CreateIndexRequest(request.param("index"));
5454
if (request.hasContent()) {
5555
Map<String, Object> sourceAsMap = XContentHelper.convertToMap(request.content(), false, request.getXContentType()).v2();

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
package org.elasticsearch.rest.action.admin.indices;
2121

2222
import com.carrotsearch.hppc.cursors.ObjectCursor;
23-
import org.apache.logging.log4j.Logger;
23+
2424
import org.apache.logging.log4j.LogManager;
25+
import org.apache.logging.log4j.Logger;
2526
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
2627
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
2728
import org.elasticsearch.action.support.IndicesOptions;
@@ -85,7 +86,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
8586
deprecationLogger.deprecated("Type exists requests are deprecated, as types have been deprecated.");
8687
}
8788

88-
final boolean includeTypeName = request.paramAsBoolean("include_type_name", true);
89+
final boolean includeTypeName = request.paramAsBoolean(INCLUDE_TYPE_NAME_PARAMETER, true);
8990
final String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
9091
final String[] types = request.paramAsStringArrayOrEmptyIfAll("type");
9192
final GetMappingsRequest getMappingsRequest = new GetMappingsRequest();

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public String getName() {
6868

6969
@Override
7070
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
71-
final boolean includeTypeName = request.paramAsBoolean("include_type_name", true);
71+
final boolean includeTypeName = request.paramAsBoolean(INCLUDE_TYPE_NAME_PARAMETER, true);
7272
PutMappingRequest putMappingRequest = putMappingRequest(Strings.splitStringByCommaToArray(request.param("index")));
7373
final String type = request.param("type");
7474
if (type != null && includeTypeName == false) {

0 commit comments

Comments
 (0)