Skip to content

Commit 3647d7c

Browse files
authored
Removes typed REST endpoints from search and related APIs (#41640)
1 parent 458d942 commit 3647d7c

File tree

34 files changed

+72
-1104
lines changed

34 files changed

+72
-1104
lines changed

docs/reference/migration/migrate_8_0/reindex.asciidoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,9 @@ re-encode them when generating the search request for the remote host. This
77
leniency has been removed such that all index-names are correctly encoded when
88
reindex generates remote search requests.
99

10-
Instead, please specify the index-name without any encoding.
10+
Instead, please specify the index-name without any encoding.
11+
12+
[float]
13+
==== Removal of types
14+
15+
The `/{index}/{type}/_delete_by_query` and `/{index}/{type}/_update_by_query` REST endpoints have been removed in favour of `/{index}/_delete_by_query` and `/{index}/_update_by_query`, since indexes no longer contain types, these typed endpoints are obsolete.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[float]
2+
[[breaking_80_search_changes]]
3+
=== Search Changes
4+
5+
[float]
6+
==== Removal of types
7+
8+
The `/{index}/{type}/_search`, `/{index}/{type}/_msearch`, `/{index}/{type}/_search/template` and `/{index}/{type}/_msearch/template` REST endpoints have been removed in favour of `/{index}/_search`, `/{index}/_msearch`, `/{index}/_search/template` and `/{index}/_msearch/template`, since indexes no longer contain types, these typed endpoints are obsolete..
9+
10+
The `/{index}/{type}/_termvectors`, `/{index}/{type}/{id}/_termvectors` and `/{index}/{type}/_mtermvectors` REST endpoints have been removed in favour of `/{index}/_termvectors`, `/{index}/{id}/_termvectors` and `/{index}/_mtermvectors`, since indexes no longer contain types, these typed endpoints are obsolete..

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateAction.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919

2020
package org.elasticsearch.script.mustache;
2121

22-
import org.apache.logging.log4j.LogManager;
2322
import org.elasticsearch.client.node.NodeClient;
24-
import org.elasticsearch.common.logging.DeprecationLogger;
2523
import org.elasticsearch.common.settings.Settings;
2624
import org.elasticsearch.rest.BaseRestHandler;
2725
import org.elasticsearch.rest.RestController;
@@ -40,10 +38,6 @@
4038
import static org.elasticsearch.rest.RestRequest.Method.POST;
4139

4240
public class RestMultiSearchTemplateAction extends BaseRestHandler {
43-
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(
44-
LogManager.getLogger(RestMultiSearchTemplateAction.class));
45-
static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
46-
" Specifying types in multi search template requests is deprecated.";
4741

4842
private static final Set<String> RESPONSE_PARAMS;
4943

@@ -65,10 +59,6 @@ public RestMultiSearchTemplateAction(Settings settings, RestController controlle
6559
controller.registerHandler(POST, "/_msearch/template", this);
6660
controller.registerHandler(GET, "/{index}/_msearch/template", this);
6761
controller.registerHandler(POST, "/{index}/_msearch/template", this);
68-
69-
// Deprecated typed endpoints.
70-
controller.registerHandler(GET, "/{index}/{type}/_msearch/template", this);
71-
controller.registerHandler(POST, "/{index}/{type}/_msearch/template", this);
7262
}
7363

7464
@Override
@@ -79,14 +69,6 @@ public String getName() {
7969
@Override
8070
public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
8171
MultiSearchTemplateRequest multiRequest = parseRequest(request, allowExplicitIndex);
82-
83-
// Emit a single deprecation message if any search template contains types.
84-
for (SearchTemplateRequest searchTemplateRequest : multiRequest.requests()) {
85-
if (searchTemplateRequest.getRequest().types().length > 0) {
86-
deprecationLogger.deprecatedAndMaybeLog("msearch_with_types", TYPES_DEPRECATION_MESSAGE);
87-
break;
88-
}
89-
}
9072
return channel -> client.execute(MultiSearchTemplateAction.INSTANCE, multiRequest, new RestToXContentListener<>(channel));
9173
}
9274

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestSearchTemplateAction.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ public RestSearchTemplateAction(Settings settings, RestController controller) {
5454
controller.registerHandler(POST, "/_search/template", this);
5555
controller.registerHandler(GET, "/{index}/_search/template", this);
5656
controller.registerHandler(POST, "/{index}/_search/template", this);
57-
58-
// Deprecated typed endpoints.
59-
controller.registerHandler(GET, "/{index}/{type}/_search/template", this);
60-
controller.registerHandler(POST, "/{index}/{type}/_search/template", this);
6157
}
6258

6359
@Override

modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateActionTests.java

Lines changed: 0 additions & 66 deletions
This file was deleted.

modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/RestSearchTemplateActionTests.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class RestDeleteByQueryAction extends AbstractBulkByQueryRestHandler<Dele
3535
public RestDeleteByQueryAction(Settings settings, RestController controller) {
3636
super(settings, DeleteByQueryAction.INSTANCE);
3737
controller.registerHandler(POST, "/{index}/_delete_by_query", this);
38-
controller.registerHandler(POST, "/{index}/{type}/_delete_by_query", this);
3938
}
4039

4140
@Override

modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public class RestUpdateByQueryAction extends AbstractBulkByQueryRestHandler<Upda
4242
public RestUpdateByQueryAction(Settings settings, RestController controller) {
4343
super(settings, UpdateByQueryAction.INSTANCE);
4444
controller.registerHandler(POST, "/{index}/_update_by_query", this);
45-
controller.registerHandler(POST, "/{index}/{type}/_update_by_query", this);
4645
}
4746

4847
@Override

modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestDeleteByQueryActionTests.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestUpdateByQueryActionTests.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)