remove unnecessary XContentType casting

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Feb 10, 2023 · b605a19 · b605a19
1 parent 3288c29
commit b605a19
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 52 deletions.
diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/IngestClientIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/IngestClientIT.java
@@ -58,11 +58,7 @@ public class IngestClientIT extends OpenSearchRestHighLevelClientTestCase {
     public void testPutPipeline() throws IOException {
         String id = "some_pipeline_id";
         XContentBuilder pipelineBuilder = buildRandomXContentPipeline();
-        PutPipelineRequest request = new PutPipelineRequest(
-            id,
-            BytesReference.bytes(pipelineBuilder),
-            (XContentType) pipelineBuilder.contentType()
-        );
+        PutPipelineRequest request = new PutPipelineRequest(id, BytesReference.bytes(pipelineBuilder), pipelineBuilder.contentType());
 
         AcknowledgedResponse putPipelineResponse = execute(
             request,
@@ -76,11 +72,7 @@ public void testGetPipeline() throws IOException {
         String id = "some_pipeline_id";
         XContentBuilder pipelineBuilder = buildRandomXContentPipeline();
         {
-            PutPipelineRequest request = new PutPipelineRequest(
-                id,
-                BytesReference.bytes(pipelineBuilder),
-                (XContentType) pipelineBuilder.contentType()
-            );
+            PutPipelineRequest request = new PutPipelineRequest(id, BytesReference.bytes(pipelineBuilder), pipelineBuilder.contentType());
             createPipeline(request);
         }
 

diff --git a/...high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java b/...high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java
@@ -228,7 +228,7 @@ protected static void createFieldAddingPipleine(String id, String fieldName, Str
 
     protected static void createPipeline(String pipelineId) throws IOException {
         XContentBuilder builder = buildRandomXContentPipeline();
-        createPipeline(new PutPipelineRequest(pipelineId, BytesReference.bytes(builder), (XContentType) builder.contentType()));
+        createPipeline(new PutPipelineRequest(pipelineId, BytesReference.bytes(builder), builder.contentType()));
     }
 
     protected static void createPipeline(PutPipelineRequest putPipelineRequest) throws IOException {
@@ -267,7 +267,7 @@ protected void putConflictPipeline() throws IOException {
         final PutPipelineRequest putPipelineRequest = new PutPipelineRequest(
             CONFLICT_PIPELINE_ID,
             BytesReference.bytes(pipelineBuilder),
-            (XContentType) pipelineBuilder.contentType()
+            pipelineBuilder.contentType()
         );
         assertTrue(highLevelClient().ingest().putPipeline(putPipelineRequest, RequestOptions.DEFAULT).isAcknowledged());
     }

diff --git a/...java/org/opensearch/action/admin/indices/replication/SegmentReplicationStatsResponse.java b/...java/org/opensearch/action/admin/indices/replication/SegmentReplicationStatsResponse.java
@@ -13,8 +13,8 @@
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.indices.replication.SegmentReplicationState;
 
 import java.io.IOException;

diff --git a/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationState.java b/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationState.java
@@ -14,9 +14,9 @@
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.ToXContentFragment;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.ToXContentFragment;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
 import org.opensearch.indices.replication.common.ReplicationState;
 import org.opensearch.indices.replication.common.ReplicationTimer;

diff --git a/server/src/test/java/org/opensearch/common/xcontent/support/XContentMapValuesTests.java b/server/src/test/java/org/opensearch/common/xcontent/support/XContentMapValuesTests.java
@@ -429,11 +429,7 @@ public void testFilterWithEmptyIncludesExcludes() {
     public void testThatFilterIncludesEmptyObjectWhenUsingIncludes() throws Exception {
         XContentBuilder builder = XContentFactory.jsonBuilder().startObject().startObject("obj").endObject().endObject();
 
-        Tuple<XContentType, Map<String, Object>> mapTuple = convertToMap(
-            BytesReference.bytes(builder),
-            true,
-            (XContentType) builder.contentType()
-        );
+        Tuple<? extends MediaType, Map<String, Object>> mapTuple = convertToMap(BytesReference.bytes(builder), true, builder.contentType());
         Map<String, Object> filteredSource = XContentMapValues.filter(mapTuple.v2(), new String[] { "obj" }, Strings.EMPTY_ARRAY);
 
         assertThat(mapTuple.v2(), equalTo(filteredSource));
@@ -442,11 +438,7 @@ public void testThatFilterIncludesEmptyObjectWhenUsingIncludes() throws Exceptio
     public void testThatFilterIncludesEmptyObjectWhenUsingExcludes() throws Exception {
         XContentBuilder builder = XContentFactory.jsonBuilder().startObject().startObject("obj").endObject().endObject();
 
-        Tuple<XContentType, Map<String, Object>> mapTuple = convertToMap(
-            BytesReference.bytes(builder),
-            true,
-            (XContentType) builder.contentType()
-        );
+        Tuple<? extends MediaType, Map<String, Object>> mapTuple = convertToMap(BytesReference.bytes(builder), true, builder.contentType());
         Map<String, Object> filteredSource = XContentMapValues.filter(
             mapTuple.v2(),
             Strings.EMPTY_ARRAY,
@@ -460,11 +452,7 @@ public void testThatFilterIncludesEmptyObjectWhenUsingExcludes() throws Exceptio
     public void testNotOmittingObjectsWithExcludedProperties() throws Exception {
         XContentBuilder builder = XContentFactory.jsonBuilder().startObject().startObject("obj").field("f1", "v1").endObject().endObject();
 
-        Tuple<XContentType, Map<String, Object>> mapTuple = convertToMap(
-            BytesReference.bytes(builder),
-            true,
-            (XContentType) builder.contentType()
-        );
+        Tuple<? extends MediaType, Map<String, Object>> mapTuple = convertToMap(BytesReference.bytes(builder), true, builder.contentType());
         Map<String, Object> filteredSource = XContentMapValues.filter(mapTuple.v2(), Strings.EMPTY_ARRAY, new String[] { "obj.f1" });
 
         assertThat(filteredSource.size(), equalTo(1));
@@ -485,11 +473,7 @@ public void testNotOmittingObjectWithNestedExcludedObject() throws Exception {
             .endObject();
 
         // implicit include
-        Tuple<XContentType, Map<String, Object>> mapTuple = convertToMap(
-            BytesReference.bytes(builder),
-            true,
-            (XContentType) builder.contentType()
-        );
+        Tuple<? extends MediaType, Map<String, Object>> mapTuple = convertToMap(BytesReference.bytes(builder), true, builder.contentType());
         Map<String, Object> filteredSource = XContentMapValues.filter(mapTuple.v2(), Strings.EMPTY_ARRAY, new String[] { "*.obj2" });
 
         assertThat(filteredSource.size(), equalTo(1));

diff --git a/server/src/test/java/org/opensearch/index/mapper/MultiFieldTests.java b/server/src/test/java/org/opensearch/index/mapper/MultiFieldTests.java
@@ -205,7 +205,7 @@ public void testMultiFieldsInConsistentOrder() throws Exception {
         Map<String, Object> sourceAsMap = XContentHelper.convertToMap(
             docMapper.mappingSource().compressedReference(),
             true,
-            (XContentType) builder.contentType()
+            builder.contentType()
         ).v2();
         @SuppressWarnings("unchecked")
         Map<String, Object> multiFields = (Map<String, Object>) XContentMapValues.extractValue(

diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotRequestsTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotRequestsTests.java
@@ -36,7 +36,6 @@
 import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.test.OpenSearchTestCase;
@@ -97,7 +96,7 @@ public void testRestoreSnapshotRequestParsing() throws IOException {
 
         BytesReference bytes = BytesReference.bytes(builder.endObject());
 
-        request.source(XContentHelper.convertToMap(bytes, true, (XContentType) builder.contentType()).v2());
+        request.source(XContentHelper.convertToMap(bytes, true, builder.contentType()).v2());
 
         assertEquals("test-repo", request.repository());
         assertEquals("test-snap", request.snapshot());
@@ -163,7 +162,7 @@ public void testCreateSnapshotRequestParsing() throws IOException {
 
         BytesReference bytes = BytesReference.bytes(builder.endObject());
 
-        request.source(XContentHelper.convertToMap(bytes, true, (XContentType) builder.contentType()).v2());
+        request.source(XContentHelper.convertToMap(bytes, true, builder.contentType()).v2());
 
         assertEquals("test-repo", request.repository());
         assertEquals("test-snap", request.snapshot());

diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java
@@ -46,7 +46,6 @@
 import org.opensearch.common.SetOnce;
 import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
@@ -235,29 +234,26 @@ public void testMeta() throws IOException {
             b.field("meta", Collections.singletonMap("foo", "bar"));
         });
         MapperService mapperService = createMapperService(mapping);
-        XContentType xContentType = (XContentType) mapping.contentType();
         assertEquals(
-            XContentHelper.convertToMap(BytesReference.bytes(mapping), false, xContentType).v2(),
-            XContentHelper.convertToMap(mapperService.documentMapper().mappingSource().uncompressed(), false, xContentType).v2()
+            XContentHelper.convertToMap(BytesReference.bytes(mapping), false, mapping.contentType()).v2(),
+            XContentHelper.convertToMap(mapperService.documentMapper().mappingSource().uncompressed(), false, mapping.contentType()).v2()
         );
 
         mapping = fieldMapping(this::metaMapping);
-        xContentType = (XContentType) mapping.contentType();
         merge(mapperService, mapping);
         assertEquals(
-            XContentHelper.convertToMap(BytesReference.bytes(mapping), false, xContentType).v2(),
-            XContentHelper.convertToMap(mapperService.documentMapper().mappingSource().uncompressed(), false, xContentType).v2()
+            XContentHelper.convertToMap(BytesReference.bytes(mapping), false, mapping.contentType()).v2(),
+            XContentHelper.convertToMap(mapperService.documentMapper().mappingSource().uncompressed(), false, mapping.contentType()).v2()
         );
 
         mapping = fieldMapping(b -> {
             metaMapping(b);
             b.field("meta", Collections.singletonMap("baz", "quux"));
         });
-        xContentType = (XContentType) mapping.contentType();
         merge(mapperService, mapping);
         assertEquals(
-            XContentHelper.convertToMap(BytesReference.bytes(mapping), false, xContentType).v2(),
-            XContentHelper.convertToMap(mapperService.documentMapper().mappingSource().uncompressed(), false, xContentType).v2()
+            XContentHelper.convertToMap(BytesReference.bytes(mapping), false, mapping.contentType()).v2(),
+            XContentHelper.convertToMap(mapperService.documentMapper().mappingSource().uncompressed(), false, mapping.contentType()).v2()
         );
     }
 

diff --git a/test/framework/src/main/java/org/opensearch/test/XContentTestUtils.java b/test/framework/src/main/java/org/opensearch/test/XContentTestUtils.java
@@ -71,8 +71,7 @@ public static Map<String, Object> convertToMap(ToXContent part) throws IOExcepti
         builder.startObject();
         part.toXContent(builder, EMPTY_PARAMS);
         builder.endObject();
-        XContentType xContentType = (XContentType) builder.contentType();
-        return XContentHelper.convertToMap(BytesReference.bytes(builder), false, xContentType).v2();
+        return XContentHelper.convertToMap(BytesReference.bytes(builder), false, builder.contentType()).v2();
     }
 
     public static BytesReference convertToXContent(Map<String, ?> map, XContentType xContentType) throws IOException {