Skip to content

Commit 42bf8a0

Browse files
authored
Remove types from client-benchmark-noop-api-plugin URLs (#46668)
Part of types removal for 8.0 Related to #41059
1 parent 6faec66 commit 42bf8a0

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/RestNoopBulkAction.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public RestNoopBulkAction(RestController controller) {
5050
controller.registerHandler(PUT, "/_noop_bulk", this);
5151
controller.registerHandler(POST, "/{index}/_noop_bulk", this);
5252
controller.registerHandler(PUT, "/{index}/_noop_bulk", this);
53-
controller.registerHandler(POST, "/{index}/{type}/_noop_bulk", this);
54-
controller.registerHandler(PUT, "/{index}/{type}/_noop_bulk", this);
5553
}
5654

5755
@Override
@@ -63,7 +61,6 @@ public String getName() {
6361
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
6462
BulkRequest bulkRequest = Requests.bulkRequest();
6563
String defaultIndex = request.param("index");
66-
String defaultType = request.param("type");
6764
String defaultRouting = request.param("routing");
6865
String defaultPipeline = request.param("pipeline");
6966

@@ -73,7 +70,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
7370
}
7471
bulkRequest.timeout(request.paramAsTime("timeout", BulkShardRequest.DEFAULT_TIMEOUT));
7572
bulkRequest.setRefreshPolicy(request.param("refresh"));
76-
bulkRequest.add(request.requiredContent(), defaultIndex, defaultType, defaultRouting,
73+
bulkRequest.add(request.requiredContent(), defaultIndex, defaultRouting,
7774
null, defaultPipeline, true, request.getXContentType());
7875

7976
// short circuit the call to the transport layer

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/RestNoopSearchAction.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public RestNoopSearchAction(RestController controller) {
3535
controller.registerHandler(POST, "/_noop_search", this);
3636
controller.registerHandler(GET, "/{index}/_noop_search", this);
3737
controller.registerHandler(POST, "/{index}/_noop_search", this);
38-
controller.registerHandler(GET, "/{index}/{type}/_noop_search", this);
39-
controller.registerHandler(POST, "/{index}/{type}/_noop_search", this);
4038
}
4139

4240
@Override

0 commit comments

Comments
 (0)