Revert beat _type changes (#3559)

* Revert "Revert removal of typed end-points for bulk, search, index APIs (#3524) (#3528)"

This reverts commit fc8803f.

* Revert "[Type removal] Ignore _type field in bulk request (#3504)"

This reverts commit 5bd7236.

Signed-off-by: Suraj Singh <surajrider@gmail.com>
Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

server/src/internalClusterTest/java/org/opensearch/action/bulk/BulkIntegrationIT.java

@@ -170,18 +170,6 @@ public void testBulkWithGlobalDefaults() throws Exception {
         }
     }
 
-    // Todo: This test is added to verify type support in bulk action. This should be removed once all clients
-    // avoid sending this param.
-    // https://github.com/opensearch-project/OpenSearch/issues/3484
-    public void testBulkWithTypes() throws Exception {
-        String bulkAction = copyToStringFromClasspath("/org/opensearch/action/bulk/bulk-with-deprecated-types.json");
-        {
-            BulkRequest bulkRequest = new BulkRequest();
-            bulkRequest.add(bulkAction.getBytes(StandardCharsets.UTF_8), 0, bulkAction.length(), null, XContentType.JSON);
-            assertThat(bulkRequest.numberOfActions(), equalTo(5));
-        }
-    }
-
     private void createSamplePipeline(String pipelineId) throws IOException, ExecutionException, InterruptedException {
         XContentBuilder pipeline = jsonBuilder().startObject()
             .startArray("processors")

server/src/main/java/org/opensearch/action/bulk/BulkRequest.java

@@ -287,9 +287,7 @@ public BulkRequest add(
         String routing = valueOrDefault(defaultRouting, globalRouting);
         String pipeline = valueOrDefault(defaultPipeline, globalPipeline);
         Boolean requireAlias = valueOrDefault(defaultRequireAlias, globalRequireAlias);
-        // https://github.com/opensearch-project/OpenSearch/issues/3484
-        // Undo error on types which breaks compatibility with some external clients
-        new BulkRequestParser(false).parse(
+        new BulkRequestParser(true).parse(
             data,
             defaultIndex,
             routing,

server/src/main/java/org/opensearch/rest/action/document/RestBulkAction.java

@@ -74,15 +74,7 @@ public RestBulkAction(Settings settings) {
     @Override
     public List<Route> routes() {
         return unmodifiableList(
-            asList(
-                new Route(POST, "/_bulk"),
-                new Route(PUT, "/_bulk"),
-                new Route(POST, "/{index}/_bulk"),
-                new Route(PUT, "/{index}/_bulk"),
-                // Deprecated typed endpoints.
-                new Route(POST, "/{index}/{type}/_bulk"),
-                new Route(PUT, "/{index}/{type}/_bulk")
-            )
+            asList(new Route(POST, "/_bulk"), new Route(PUT, "/_bulk"), new Route(POST, "/{index}/_bulk"), new Route(PUT, "/{index}/_bulk"))
         );
     }
 
@@ -95,9 +87,6 @@ public String getName() {
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         BulkRequest bulkRequest = Requests.bulkRequest();
         String defaultIndex = request.param("index");
-        if (request.hasParam("type")) {
-            request.param("type");
-        }
         String defaultRouting = request.param("routing");
         FetchSourceContext defaultFetchSourceContext = FetchSourceContext.parseFromRestRequest(request);
         String defaultPipeline = request.param("pipeline");

server/src/main/java/org/opensearch/rest/action/document/RestDeleteAction.java

@@ -57,13 +57,7 @@ public class RestDeleteAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(
-            asList(
-                new Route(DELETE, "/{index}/_doc/{id}"),
-                // Deprecated typed endpoint.
-                new Route(DELETE, "/{index}/{type}/{id}")
-            )
-        );
+        return unmodifiableList(asList(new Route(DELETE, "/{index}/_doc/{id}")));
     }
 
     @Override
@@ -73,9 +67,6 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        if (request.hasParam("type")) {
-            request.param("type");
-        }
         DeleteRequest deleteRequest = new DeleteRequest(request.param("index"), request.param("id"));
         deleteRequest.routing(request.param("routing"));
         deleteRequest.timeout(request.paramAsTime("timeout", DeleteRequest.DEFAULT_TIMEOUT));

server/src/main/java/org/opensearch/rest/action/document/RestIndexAction.java

@@ -63,14 +63,7 @@ public class RestIndexAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(
-            asList(
-                new Route(POST, "/{index}/_doc/{id}"),
-                new Route(PUT, "/{index}/_doc/{id}"),
-                new Route(POST, "/{index}/{type}/{id}"),
-                new Route(PUT, "/{index}/{type}/{id}")
-            )
-        );
+        return unmodifiableList(asList(new Route(POST, "/{index}/_doc/{id}"), new Route(PUT, "/{index}/_doc/{id}")));
     }
 
     @Override
@@ -92,14 +85,7 @@ public String getName() {
 
         @Override
         public List<Route> routes() {
-            return unmodifiableList(
-                asList(
-                    new Route(POST, "/{index}/_create/{id}"),
-                    new Route(PUT, "/{index}/_create/{id}"),
-                    new Route(POST, "/{index}/{type}/{id}/_create"),
-                    new Route(PUT, "/{index}/{type}/{id}/_create")
-                )
-            );
+            return unmodifiableList(asList(new Route(POST, "/{index}/_create/{id}"), new Route(PUT, "/{index}/_create/{id}")));
         }
 
         @Override
@@ -136,7 +122,7 @@ public String getName() {
 
         @Override
         public List<Route> routes() {
-            return unmodifiableList(asList(new Route(POST, "/{index}/_doc"), new Route(POST, "/{index}/{type}")));
+            return unmodifiableList(asList(new Route(POST, "/{index}/_doc")));
         }
 
         @Override
@@ -153,9 +139,6 @@ public RestChannelConsumer prepareRequest(RestRequest request, final NodeClient
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         IndexRequest indexRequest = new IndexRequest(request.param("index"));
-        if (request.hasParam("type")) {
-            request.param("type");
-        }
         indexRequest.id(request.param("id"));
         indexRequest.routing(request.param("routing"));
         indexRequest.setPipeline(request.param("pipeline"));

server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java

@@ -71,10 +71,7 @@ public List<Route> routes() {
                 new Route(GET, "/_count"),
                 new Route(POST, "/_count"),
                 new Route(GET, "/{index}/_count"),
-                new Route(POST, "/{index}/_count"),
-                // Deprecated typed endpoints.
-                new Route(GET, "/{index}/{type}/_count"),
-                new Route(POST, "/{index}/{type}/_count")
+                new Route(POST, "/{index}/_count")
             )
         );
     }
@@ -86,9 +83,6 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        if (request.hasParam("type")) {
-            request.param("type");
-        }
         SearchRequest countRequest = new SearchRequest(Strings.splitStringByCommaToArray(request.param("index")));
         countRequest.indicesOptions(IndicesOptions.fromRequest(request, countRequest.indicesOptions()));
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().size(0).trackTotalHits(true);

server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java

@@ -105,10 +105,7 @@ public List<Route> routes() {
                 new Route(GET, "/_search"),
                 new Route(POST, "/_search"),
                 new Route(GET, "/{index}/_search"),
-                new Route(POST, "/{index}/_search"),
-                // Deprecated typed endpoints.
-                new Route(GET, "/{index}/{type}/_search"),
-                new Route(POST, "/{index}/{type}/_search")
+                new Route(POST, "/{index}/_search")
             )
         );
     }
@@ -200,10 +197,6 @@ public static void parseSearchRequest(
             searchRequest.scroll(new Scroll(parseTimeValue(scroll, null, "scroll")));
         }
 
-        if (request.hasParam("type")) {
-            request.param("type");
-        }
-
         searchRequest.routing(request.param("routing"));
         searchRequest.preference(request.param("preference"));
         searchRequest.indicesOptions(IndicesOptions.fromRequest(request, searchRequest.indicesOptions()));

server/src/test/java/org/opensearch/action/bulk/BulkRequestParserTests.java

@@ -231,7 +231,7 @@ public void testFailOnExplicitIndex() {
         assertEquals("explicit index in bulk is not allowed", ex.getMessage());
     }
 
-    public void testTypesStillParsedForExternalClients() throws IOException {
+    public void testTypesStillParsedForBulkMonitoring() throws IOException {
         BytesArray request = new BytesArray("{ \"index\":{ \"_type\": \"quux\", \"_id\": \"bar\" } }\n{}\n");
         BulkRequestParser parser = new BulkRequestParser(false);
         final AtomicBoolean parsed = new AtomicBoolean();