refactor XContent.type to XContent.mediaType

nknize · nknize · commit ded5906e2ba9 · 2023-02-08T08:35:16.000-06:00
Signed-off-by: Nicholas Walter Knize &lt;nknize@apache.org&gt;
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java b/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
@@ -520,7 +520,7 @@ static Request multiSearch(MultiSearchRequest multiSearchRequest) throws IOExcep
         XContent xContent = REQUEST_BODY_CONTENT_TYPE.xContent();
         byte[] source = MultiSearchRequest.writeMultiLineFormat(multiSearchRequest, xContent);
         request.addParameters(params.asMap());
-        request.setEntity(new ByteArrayEntity(source, createContentType(xContent.type())));
+        request.setEntity(new ByteArrayEntity(source, createContentType(xContent.mediaType())));
         return request;
     }
 
@@ -555,7 +555,7 @@ static Request multiSearchTemplate(MultiSearchTemplateRequest multiSearchTemplat
 
         XContent xContent = REQUEST_BODY_CONTENT_TYPE.xContent();
         byte[] source = MultiSearchTemplateRequest.writeMultiLineFormat(multiSearchTemplateRequest, xContent);
-        request.setEntity(new ByteArrayEntity(source, createContentType(xContent.type())));
+        request.setEntity(new ByteArrayEntity(source, createContentType(xContent.mediaType())));
         return request;
     }
 
diff --git a/libs/x-content/src/main/java/org/opensearch/common/xcontent/XContent.java b/libs/x-content/src/main/java/org/opensearch/common/xcontent/XContent.java
@@ -46,7 +46,7 @@ public interface XContent {
     /**
      * The type this content handles and produces.
      */
-    MediaType type();
+    MediaType mediaType();
 
     byte streamSeparator();
 
diff --git a/libs/x-content/src/main/java/org/opensearch/common/xcontent/cbor/CborXContent.java b/libs/x-content/src/main/java/org/opensearch/common/xcontent/cbor/CborXContent.java
@@ -76,7 +76,7 @@ public static XContentBuilder contentBuilder() throws IOException {
     private CborXContent() {}
 
     @Override
-    public MediaType type() {
+    public MediaType mediaType() {
         return XContentType.CBOR;
     }
 
diff --git a/libs/x-content/src/main/java/org/opensearch/common/xcontent/json/JsonXContent.java b/libs/x-content/src/main/java/org/opensearch/common/xcontent/json/JsonXContent.java
@@ -78,7 +78,7 @@ public static XContentBuilder contentBuilder() throws IOException {
     private JsonXContent() {}
 
     @Override
-    public MediaType type() {
+    public MediaType mediaType() {
         return XContentType.JSON;
     }
 
diff --git a/libs/x-content/src/main/java/org/opensearch/common/xcontent/smile/SmileXContent.java b/libs/x-content/src/main/java/org/opensearch/common/xcontent/smile/SmileXContent.java
@@ -78,7 +78,7 @@ public static XContentBuilder contentBuilder() throws IOException {
     private SmileXContent() {}
 
     @Override
-    public MediaType type() {
+    public MediaType mediaType() {
         return XContentType.SMILE;
     }
 
diff --git a/libs/x-content/src/main/java/org/opensearch/common/xcontent/yaml/YamlXContent.java b/libs/x-content/src/main/java/org/opensearch/common/xcontent/yaml/YamlXContent.java
@@ -71,7 +71,7 @@ public static XContentBuilder contentBuilder() throws IOException {
     private YamlXContent() {}
 
     @Override
-    public MediaType type() {
+    public MediaType mediaType() {
         return XContentType.YAML;
     }
 
diff --git a/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java b/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java
@@ -308,7 +308,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.startObject("source");
             if (remoteInfo != null) {
                 builder.field("remote", remoteInfo);
-                builder.rawField("query", remoteInfo.getQuery().streamInput(), (XContentType) RemoteInfo.QUERY_CONTENT_TYPE.type());
+                builder.rawField("query", remoteInfo.getQuery().streamInput(), (XContentType) RemoteInfo.QUERY_CONTENT_TYPE.mediaType());
             }
             builder.array("index", getSearchRequest().indices());
             getSearchRequest().source().innerToXContent(builder, params);
diff --git a/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java b/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java
@@ -742,7 +742,7 @@ public void testThrowableToAndFromXContent() throws IOException {
         BytesReference throwableBytes = toShuffledXContent((builder, params) -> {
             OpenSearchException.generateThrowableXContent(builder, params, throwable);
             return builder;
-        }, xContent.type(), ToXContent.EMPTY_PARAMS, randomBoolean());
+        }, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
         OpenSearchException parsedException;
         try (XContentParser parser = createParser(xContent, throwableBytes)) {
@@ -774,7 +774,7 @@ public void testUnknownFailureToAndFromXContent() throws IOException {
             // Prints a null failure using generateFailureXContent()
             OpenSearchException.generateFailureXContent(builder, params, null, randomBoolean());
             return builder;
-        }, xContent.type(), ToXContent.EMPTY_PARAMS, randomBoolean());
+        }, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
         OpenSearchException parsedFailure;
         try (XContentParser parser = createParser(xContent, failureBytes)) {
@@ -798,7 +798,7 @@ public void testFailureToAndFromXContentWithNoDetails() throws IOException {
         BytesReference failureBytes = toShuffledXContent((builder, params) -> {
             OpenSearchException.generateFailureXContent(builder, params, failure, false);
             return builder;
-        }, xContent.type(), ToXContent.EMPTY_PARAMS, randomBoolean());
+        }, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
         try (XContentParser parser = createParser(xContent, failureBytes)) {
             failureBytes = BytesReference.bytes(shuffleXContent(parser, randomBoolean()));
@@ -952,7 +952,7 @@ public void testFailureToAndFromXContentWithDetails() throws IOException {
         BytesReference failureBytes = toShuffledXContent((builder, params) -> {
             OpenSearchException.generateFailureXContent(builder, params, finalFailure, true);
             return builder;
-        }, xContent.type(), ToXContent.EMPTY_PARAMS, randomBoolean());
+        }, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
         try (XContentParser parser = createParser(xContent, failureBytes)) {
             failureBytes = BytesReference.bytes(shuffleXContent(parser, randomBoolean()));
diff --git a/server/src/test/java/org/opensearch/action/search/SearchPhaseExecutionExceptionTests.java b/server/src/test/java/org/opensearch/action/search/SearchPhaseExecutionExceptionTests.java
@@ -134,7 +134,7 @@ public void testToAndFromXContent() throws IOException {
         final String phase = randomFrom("query", "search", "other");
         SearchPhaseExecutionException actual = new SearchPhaseExecutionException(phase, "unexpected failures", shardSearchFailures);
 
-        BytesReference exceptionBytes = toShuffledXContent(actual, xContent.type(), ToXContent.EMPTY_PARAMS, randomBoolean());
+        BytesReference exceptionBytes = toShuffledXContent(actual, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
         OpenSearchException parsedException;
         try (XContentParser parser = createParser(xContent, exceptionBytes)) {
diff --git a/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java b/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java
@@ -941,7 +941,7 @@ void doTestRawValue(XContent source) throws Exception {
 
         os = new ByteArrayOutputStream();
         try (XContentGenerator generator = xcontentType().xContent().createGenerator(os)) {
-            generator.writeRawValue(new BytesArray(rawData).streamInput(), source.type());
+            generator.writeRawValue(new BytesArray(rawData).streamInput(), source.mediaType());
         }
 
         try (
@@ -966,7 +966,7 @@ public void close() {
         try (XContentGenerator generator = xcontentType().xContent().createGenerator(os)) {
             generator.writeStartObject();
             generator.writeFieldName("test");
-            generator.writeRawValue(new BytesArray(rawData).streamInput(), source.type());
+            generator.writeRawValue(new BytesArray(rawData).streamInput(), source.mediaType());
             assertFalse("Generator should not have closed the output stream", closed.get());
             generator.writeEndObject();
         }

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ static Request multiSearch(MultiSearchRequest multiSearchRequest) throws IOExcep`
`520`	`520`	`XContent xContent = REQUEST_BODY_CONTENT_TYPE.xContent();`
`521`	`521`	`byte[] source = MultiSearchRequest.writeMultiLineFormat(multiSearchRequest, xContent);`
`522`	`522`	`request.addParameters(params.asMap());`
`523`		`- request.setEntity(new ByteArrayEntity(source, createContentType(xContent.type())));`
	`523`	`+ request.setEntity(new ByteArrayEntity(source, createContentType(xContent.mediaType())));`
`524`	`524`	`return request;`
`525`	`525`	`}`
`526`	`526`
`@@ -555,7 +555,7 @@ static Request multiSearchTemplate(MultiSearchTemplateRequest multiSearchTemplat`
`555`	`555`
`556`	`556`	`XContent xContent = REQUEST_BODY_CONTENT_TYPE.xContent();`
`557`	`557`	`byte[] source = MultiSearchTemplateRequest.writeMultiLineFormat(multiSearchTemplateRequest, xContent);`
`558`		`- request.setEntity(new ByteArrayEntity(source, createContentType(xContent.type())));`
	`558`	`+ request.setEntity(new ByteArrayEntity(source, createContentType(xContent.mediaType())));`
`559`	`559`	`return request;`
`560`	`560`	`}`
`561`	`561`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static XContentBuilder contentBuilder() throws IOException {`
`76`	`76`	`private CborXContent() {}`
`77`	`77`
`78`	`78`	`@Override`
`79`		`- public MediaType type() {`
	`79`	`+ public MediaType mediaType() {`
`80`	`80`	`return XContentType.CBOR;`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static XContentBuilder contentBuilder() throws IOException {`
`78`	`78`	`private JsonXContent() {}`
`79`	`79`
`80`	`80`	`@Override`
`81`		`- public MediaType type() {`
	`81`	`+ public MediaType mediaType() {`
`82`	`82`	`return XContentType.JSON;`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static XContentBuilder contentBuilder() throws IOException {`
`71`	`71`	`private YamlXContent() {}`
`72`	`72`
`73`	`73`	`@Override`
`74`		`- public MediaType type() {`
	`74`	`+ public MediaType mediaType() {`
`75`	`75`	`return XContentType.YAML;`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws`
`308`	`308`	`builder.startObject("source");`
`309`	`309`	`if (remoteInfo != null) {`
`310`	`310`	`builder.field("remote", remoteInfo);`
`311`		`- builder.rawField("query", remoteInfo.getQuery().streamInput(), (XContentType) RemoteInfo.QUERY_CONTENT_TYPE.type());`
	`311`	`+ builder.rawField("query", remoteInfo.getQuery().streamInput(), (XContentType) RemoteInfo.QUERY_CONTENT_TYPE.mediaType());`
`312`	`312`	`}`
`313`	`313`	`builder.array("index", getSearchRequest().indices());`
`314`	`314`	`getSearchRequest().source().innerToXContent(builder, params);`