[Type removal] Remove _type from _bulk yaml test, scripts, unused con…

…stants (#3372) * [Type removal] Remove redundant _type deprecation checks in bulk request Signed-off-by: Suraj Singh <surajrider@gmail.com> * [Type removal] bulk yaml tests validating deprecation on _type and removal from scripts Signed-off-by: Suraj Singh <surajrider@gmail.com> (cherry picked from commit 7a73fb5)
opensearch-project · May 18, 2022 · 23b6c23 · 23b6c23
1 parent a764fde
commit 23b6c23
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 24 deletions.
diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java
@@ -127,7 +127,6 @@ public void testMetadataAvailable() throws Exception {
 
         TestProcessor innerProcessor = new TestProcessor(id -> {
             id.setFieldValue("_ingest._value.index", id.getSourceAndMetadata().get("_index"));
-            id.setFieldValue("_ingest._value.type", id.getSourceAndMetadata().get("_type"));
             id.setFieldValue("_ingest._value.id", id.getSourceAndMetadata().get("_id"));
         });
         ForEachProcessor processor = new ForEachProcessor("_tag", null, "values", innerProcessor, false);

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/fields/SearchFieldsIT.java b/server/src/internalClusterTest/java/org/opensearch/search/fields/SearchFieldsIT.java
@@ -142,7 +142,6 @@ protected Map<String, Function<Map<String, Object>, Object>> pluginScripts() {
             scripts.put("_fields['num1'].value", vars -> fieldsScript(vars, "num1"));
             scripts.put("_fields._uid.value", vars -> fieldsScript(vars, "_uid"));
             scripts.put("_fields._id.value", vars -> fieldsScript(vars, "_id"));
-            scripts.put("_fields._type.value", vars -> fieldsScript(vars, "_type"));
 
             scripts.put("_source.obj1", vars -> sourceScript(vars, "obj1"));
             scripts.put("_source.obj1.test", vars -> sourceScript(vars, "obj1.test"));

diff --git a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsResponse.java b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsResponse.java
@@ -161,7 +161,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     static final class Fields {
         static final String DOCS = "docs";
         static final String _INDEX = "_index";
-        static final String _TYPE = "_type";
         static final String _ID = "_id";
     }
 

diff --git a/server/src/main/java/org/opensearch/action/update/UpdateHelper.java b/server/src/main/java/org/opensearch/action/update/UpdateHelper.java
@@ -482,7 +482,6 @@ public static class ContextFields {
         public static final String SOURCE = "_source";
         public static final String NOW = "_now";
         public static final String INDEX = "_index";
-        public static final String TYPE = "_type";
         public static final String ID = "_id";
         public static final String VERSION = "_version";
         public static final String ROUTING = "_routing";