Răsfoiți Sursa

Remove types from client-benchmark-noop-api-plugin URLs (#46668)

Part of types removal for 8.0

Related to #41059
Alan Woodward 6 ani în urmă
părinte
comite
42bf8a0816

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

@@ -50,8 +50,6 @@ public class RestNoopBulkAction extends BaseRestHandler {
         controller.registerHandler(PUT, "/_noop_bulk", this);
         controller.registerHandler(POST, "/{index}/_noop_bulk", this);
         controller.registerHandler(PUT, "/{index}/_noop_bulk", this);
-        controller.registerHandler(POST, "/{index}/{type}/_noop_bulk", this);
-        controller.registerHandler(PUT, "/{index}/{type}/_noop_bulk", this);
     }
 
     @Override
@@ -63,7 +61,6 @@ public class RestNoopBulkAction extends BaseRestHandler {
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         BulkRequest bulkRequest = Requests.bulkRequest();
         String defaultIndex = request.param("index");
-        String defaultType = request.param("type");
         String defaultRouting = request.param("routing");
         String defaultPipeline = request.param("pipeline");
 
@@ -73,7 +70,7 @@ public class RestNoopBulkAction extends BaseRestHandler {
         }
         bulkRequest.timeout(request.paramAsTime("timeout", BulkShardRequest.DEFAULT_TIMEOUT));
         bulkRequest.setRefreshPolicy(request.param("refresh"));
-        bulkRequest.add(request.requiredContent(), defaultIndex, defaultType, defaultRouting,
+        bulkRequest.add(request.requiredContent(), defaultIndex, defaultRouting,
             null, defaultPipeline, true, request.getXContentType());
 
         // short circuit the call to the transport layer

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

@@ -35,8 +35,6 @@ public class RestNoopSearchAction extends BaseRestHandler {
         controller.registerHandler(POST, "/_noop_search", this);
         controller.registerHandler(GET, "/{index}/_noop_search", this);
         controller.registerHandler(POST, "/{index}/_noop_search", this);
-        controller.registerHandler(GET, "/{index}/{type}/_noop_search", this);
-        controller.registerHandler(POST, "/{index}/{type}/_noop_search", this);
     }
 
     @Override