Remove type mapping specific update API

Signed-off-by: Suraj Singh <[email protected]>
opensearch-project · Feb 21, 2022 · 6197384 · 6197384
1 parent 74e1c2e
commit 6197384
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 139 deletions.
diff --git a/qa/full-cluster-restart/src/test/java/org/opensearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/opensearch/upgrades/FullClusterRestartIT.java
@@ -624,8 +624,7 @@ void assertRealtimeGetWorks(final String typeName) throws IOException {
         Map<?, ?> hit = (Map<?, ?>) ((List<?>)(XContentMapValues.extractValue("hits.hits", searchResponse))).get(0);
         String docId = (String) hit.get("_id");
 
-        Request updateRequest = new Request("POST", "/" + index + "/" + typeName + "/" + docId + "/_update");
-        updateRequest.setOptions(expectWarnings(RestUpdateAction.TYPES_DEPRECATION_MESSAGE));
+        Request updateRequest = new Request("POST", "/" + index + "/_update/" + docId);
         updateRequest.setJsonEntity("{ \"doc\" : { \"foo\": \"bar\"}}");
         client().performRequest(updateRequest);
 

diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/RecoveryIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/RecoveryIT.java
@@ -659,7 +659,6 @@ public void testUpdateDoc() throws Exception {
             for (int i = 0; i < times; i++) {
                 long value = randomNonNegativeLong();
                 Request update = new Request("POST", index + "/_update/" + docId);
-                update.setOptions(expectWarnings(RestUpdateAction.TYPES_DEPRECATION_MESSAGE));
                 update.setJsonEntity("{\"doc\": {\"updated_field\": " + value + "}}");
                 client().performRequest(update);
                 updates.put(docId, value);

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/70_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/70_mix_typeless_typeful.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/count/11_basic_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/count/11_basic_with_types.yml
diff --git a/...pec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_mix_typeless_typeful.yml b/...pec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_mix_typeless_typeful.yml
diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestUpdateAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestUpdateAction.java
@@ -38,7 +38,6 @@
 import org.opensearch.action.support.ActiveShardCount;
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.index.VersionType;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
@@ -54,19 +53,10 @@
 import static org.opensearch.rest.RestRequest.Method.POST;
 
 public class RestUpdateAction extends BaseRestHandler {
-    private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestUpdateAction.class);
-    public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in "
-        + "document update requests is deprecated, use the endpoint /{index}/_update/{id} instead.";
 
     @Override
     public List<Route> routes() {
-        return unmodifiableList(
-            asList(
-                new Route(POST, "/{index}/_update/{id}"),
-                // Deprecated typed endpoint.
-                new Route(POST, "/{index}/{type}/{id}/_update")
-            )
-        );
+        return unmodifiableList(asList(new Route(POST, "/{index}/_update/{id}")));
     }
 
     @Override
@@ -77,12 +67,7 @@ public String getName() {
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         UpdateRequest updateRequest;
-        if (request.hasParam("type")) {
-            deprecationLogger.deprecate("update_with_types", TYPES_DEPRECATION_MESSAGE);
-            updateRequest = new UpdateRequest(request.param("index"), request.param("type"), request.param("id"));
-        } else {
-            updateRequest = new UpdateRequest(request.param("index"), request.param("id"));
-        }
+        updateRequest = new UpdateRequest(request.param("index"), request.param("id"));
 
         updateRequest.routing(request.param("routing"));
         updateRequest.timeout(request.paramAsTime("timeout", updateRequest.timeout()));