Adapt MediaType library change in core (#3050)

RyanL1997 · cwperks · commit 96dc266a5fee · 2023-08-02T14:32:11.000-04:00
* Adapt the MediaType changes in core

Signed-off-by: Ryan Liang &lt;jiallian@amazon.com&gt;
diff --git a/src/main/java/com/amazon/dlic/auth/http/saml/AuthTokenProcessorHandler.java b/src/main/java/com/amazon/dlic/auth/http/saml/AuthTokenProcessorHandler.java
@@ -194,7 +194,7 @@ private boolean handleLowLevel(RestRequest restRequest, RestChannel restChannel)
         XPathExpressionException, ParserConfigurationException, SAXException, SettingsException {
         try {
 
-            if (restRequest.getXContentType() != XContentType.JSON) {
+            if (restRequest.getMediaType() != XContentType.JSON) {
                 throw new OpenSearchSecurityException(
                     "/_opendistro/_security/api/authtoken expects content with type application/json",
                     RestStatus.UNSUPPORTED_MEDIA_TYPE
diff --git a/src/main/java/org/opensearch/security/auditlog/impl/AbstractAuditLog.java b/src/main/java/org/opensearch/security/auditlog/impl/AbstractAuditLog.java
@@ -48,6 +48,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
@@ -656,7 +657,7 @@ public void logDocumentWritten(ShardId shardId, GetResult originalResult, Index
                 // originalResult.internalSourceRef()));
 
                 // current source, normally not null or empty
-                msg.addTupleToRequestBody(new Tuple<XContentType, BytesReference>(XContentType.JSON, currentIndex.source()));
+                msg.addTupleToRequestBody(new Tuple<MediaType, BytesReference>(XContentType.JSON, currentIndex.source()));
             }
 
         }
diff --git a/src/main/java/org/opensearch/security/auditlog/impl/AuditMessage.java b/src/main/java/org/opensearch/security/auditlog/impl/AuditMessage.java
@@ -38,6 +38,7 @@
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.core.common.Strings;
@@ -206,7 +207,7 @@ void addSecurityConfigWriteDiffSource(final String diff, final String id) {
     // }
     // }
 
-    public void addTupleToRequestBody(Tuple<XContentType, BytesReference> xContentTuple) {
+    public void addTupleToRequestBody(Tuple<MediaType, BytesReference> xContentTuple) {
         if (xContentTuple != null) {
             try {
                 auditInfo.put(REQUEST_BODY, XContentHelper.convertToJson(xContentTuple.v2(), false, xContentTuple.v1()));
@@ -378,7 +379,7 @@ void addRestRequestInfo(final RestRequest request, final AuditConfig.Filter filt
             addRestMethod(request.method());
             if (filter.shouldLogRequestBody() && request.hasContentOrSourceParam()) {
                 try {
-                    final Tuple<XContentType, BytesReference> xContentTuple = request.contentOrSourceParam();
+                    final Tuple<MediaType, BytesReference> xContentTuple = request.contentOrSourceParam();
                     final String requestBody = XContentHelper.convertToJson(xContentTuple.v2(), false, xContentTuple.v1());
                     if (path != null
                         && requestBody != null
diff --git a/src/main/java/org/opensearch/security/auditlog/impl/RequestResolver.java b/src/main/java/org/opensearch/security/auditlog/impl/RequestResolver.java
@@ -47,6 +47,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.index.Index;
@@ -381,7 +382,7 @@ private static void addIndicesSourceSafe(
         final String[] indices,
         final IndexNameExpressionResolver resolver,
         final ClusterService cs,
-        final XContentType xContentType,
+        final MediaType mediaType,
         final Object source,
         final Settings settings,
         boolean resolveIndices,
@@ -423,27 +424,27 @@ private static void addIndicesSourceSafe(
             if (sourceIsSensitive && source != null) {
                 if (!allIndicesMatcher.test(securityIndex)) {
                     if (source instanceof BytesReference) {
-                        msg.addTupleToRequestBody(convertSource(xContentType, (BytesReference) source));
+                        msg.addTupleToRequestBody(convertSource(mediaType, (BytesReference) source));
                     } else {
                         msg.addMapToRequestBody((Map) source);
                     }
                 }
             } else if (source != null) {
                 if (source instanceof BytesReference) {
-                    msg.addTupleToRequestBody(convertSource(xContentType, (BytesReference) source));
+                    msg.addTupleToRequestBody(convertSource(mediaType, (BytesReference) source));
                 } else {
                     msg.addMapToRequestBody((Map) source);
                 }
             }
         }
     }
 
-    private static Tuple<XContentType, BytesReference> convertSource(XContentType type, BytesReference bytes) {
+    private static Tuple<MediaType, BytesReference> convertSource(MediaType type, BytesReference bytes) {
         if (type == null) {
             type = XContentType.JSON;
         }
 
-        return new Tuple<XContentType, BytesReference>(type, bytes);
+        return new Tuple<MediaType, BytesReference>(type, bytes);
     }
 
     private static String[] arrayOrEmpty(String[] array) {
diff --git a/src/main/java/org/opensearch/security/dlic/rest/api/PatchableResourceApiAction.java b/src/main/java/org/opensearch/security/dlic/rest/api/PatchableResourceApiAction.java
@@ -71,7 +71,7 @@ public PatchableResourceApiAction(
     }
 
     private void handlePatch(RestChannel channel, final RestRequest request, final Client client) throws IOException {
-        if (request.getXContentType() != XContentType.JSON) {
+        if (request.getMediaType() != XContentType.JSON) {
             badRequestResponse(channel, "PATCH accepts only application/json");
             return;
         }
diff --git a/src/test/java/com/amazon/dlic/auth/http/saml/HTTPSamlAuthenticatorTest.java b/src/test/java/com/amazon/dlic/auth/http/saml/HTTPSamlAuthenticatorTest.java
@@ -45,7 +45,7 @@
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
@@ -992,7 +992,7 @@ public XContentBuilder newErrorBuilder() throws IOException {
         }
 
         @Override
-        public XContentBuilder newBuilder(XContentType xContentType, boolean useFiltering) throws IOException {
+        public XContentBuilder newBuilder(MediaType mediaType, boolean useFiltering) throws IOException {
             return null;
         }
 
@@ -1018,8 +1018,7 @@ public void sendResponse(RestResponse response) {
         }
 
         @Override
-        public XContentBuilder newBuilder(XContentType xContentType, XContentType responseContentType, boolean useFiltering)
-            throws IOException {
+        public XContentBuilder newBuilder(MediaType mediaType, MediaType responseContentType, boolean useFiltering) throws IOException {
             return null;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`import org.opensearch.common.settings.Settings;`
`49`	`49`	`import org.opensearch.common.transport.TransportAddress;`
`50`	`50`	`import org.opensearch.common.xcontent.XContentHelper;`
	`51`	`+import org.opensearch.core.xcontent.MediaType;`
`51`	`52`	`import org.opensearch.common.xcontent.XContentType;`
`52`	`53`	`import org.opensearch.common.xcontent.json.JsonXContent;`
`53`	`54`	`import org.opensearch.core.xcontent.NamedXContentRegistry;`
`@@ -656,7 +657,7 @@ public void logDocumentWritten(ShardId shardId, GetResult originalResult, Index`
`656`	`657`	`// originalResult.internalSourceRef()));`
`657`	`658`
`658`	`659`	`// current source, normally not null or empty`
`659`		`- msg.addTupleToRequestBody(new Tuple<XContentType, BytesReference>(XContentType.JSON, currentIndex.source()));`
	`660`	`+ msg.addTupleToRequestBody(new Tuple<MediaType, BytesReference>(XContentType.JSON, currentIndex.source()));`
`660`	`661`	`}`
`661`	`662`
`662`	`663`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@`
`47`	`47`	`import org.opensearch.common.settings.Settings;`
`48`	`48`	`import org.opensearch.common.transport.TransportAddress;`
`49`	`49`	`import org.opensearch.common.xcontent.XContentFactory;`
	`50`	`+import org.opensearch.core.xcontent.MediaType;`
`50`	`51`	`import org.opensearch.common.xcontent.XContentType;`
`51`	`52`	`import org.opensearch.core.xcontent.XContentBuilder;`
`52`	`53`	`import org.opensearch.core.index.Index;`
`@@ -381,7 +382,7 @@ private static void addIndicesSourceSafe(`
`381`	`382`	`final String[] indices,`
`382`	`383`	`final IndexNameExpressionResolver resolver,`
`383`	`384`	`final ClusterService cs,`
`384`		`- final XContentType xContentType,`
	`385`	`+ final MediaType mediaType,`
`385`	`386`	`final Object source,`
`386`	`387`	`final Settings settings,`
`387`	`388`	`boolean resolveIndices,`
`@@ -423,27 +424,27 @@ private static void addIndicesSourceSafe(`
`423`	`424`	`if (sourceIsSensitive && source != null) {`
`424`	`425`	`if (!allIndicesMatcher.test(securityIndex)) {`
`425`	`426`	`if (source instanceof BytesReference) {`
`426`		`- msg.addTupleToRequestBody(convertSource(xContentType, (BytesReference) source));`
	`427`	`+ msg.addTupleToRequestBody(convertSource(mediaType, (BytesReference) source));`
`427`	`428`	`} else {`
`428`	`429`	`msg.addMapToRequestBody((Map) source);`
`429`	`430`	`}`
`430`	`431`	`}`
`431`	`432`	`} else if (source != null) {`
`432`	`433`	`if (source instanceof BytesReference) {`
`433`		`- msg.addTupleToRequestBody(convertSource(xContentType, (BytesReference) source));`
	`434`	`+ msg.addTupleToRequestBody(convertSource(mediaType, (BytesReference) source));`
`434`	`435`	`} else {`
`435`	`436`	`msg.addMapToRequestBody((Map) source);`
`436`	`437`	`}`
`437`	`438`	`}`
`438`	`439`	`}`
`439`	`440`	`}`
`440`	`441`
`441`		`- private static Tuple<XContentType, BytesReference> convertSource(XContentType type, BytesReference bytes) {`
	`442`	`+ private static Tuple<MediaType, BytesReference> convertSource(MediaType type, BytesReference bytes) {`
`442`	`443`	`if (type == null) {`
`443`	`444`	`type = XContentType.JSON;`
`444`	`445`	`}`
`445`	`446`
`446`		`- return new Tuple<XContentType, BytesReference>(type, bytes);`
	`447`	`+ return new Tuple<MediaType, BytesReference>(type, bytes);`
`447`	`448`	`}`
`448`	`449`
`449`	`450`	`private static String[] arrayOrEmpty(String[] array) {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public PatchableResourceApiAction(`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`private void handlePatch(RestChannel channel, final RestRequest request, final Client client) throws IOException {`
`74`		`- if (request.getXContentType() != XContentType.JSON) {`
	`74`	`+ if (request.getMediaType() != XContentType.JSON) {`
`75`	`75`	`badRequestResponse(channel, "PATCH accepts only application/json");`
`76`	`76`	`return;`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`import org.opensearch.core.common.bytes.BytesReference;`
`46`	`46`	`import org.opensearch.common.io.stream.BytesStreamOutput;`
`47`	`47`	`import org.opensearch.common.settings.Settings;`
`48`		`-import org.opensearch.common.xcontent.XContentType;`
	`48`	`+import org.opensearch.core.xcontent.MediaType;`
`49`	`49`	`import org.opensearch.core.xcontent.XContentBuilder;`
`50`	`50`	`import org.opensearch.rest.RestChannel;`
`51`	`51`	`import org.opensearch.rest.RestRequest;`
`@@ -992,7 +992,7 @@ public XContentBuilder newErrorBuilder() throws IOException {`
`992`	`992`	`}`
`993`	`993`
`994`	`994`	`@Override`
`995`		`- public XContentBuilder newBuilder(XContentType xContentType, boolean useFiltering) throws IOException {`
	`995`	`+ public XContentBuilder newBuilder(MediaType mediaType, boolean useFiltering) throws IOException {`
`996`	`996`	`return null;`
`997`	`997`	`}`
`998`	`998`
`@@ -1018,8 +1018,7 @@ public void sendResponse(RestResponse response) {`
`1018`	`1018`	`}`
`1019`	`1019`
`1020`	`1020`	`@Override`
`1021`		`- public XContentBuilder newBuilder(XContentType xContentType, XContentType responseContentType, boolean useFiltering)`
`1022`		`- throws IOException {`
	`1021`	`+ public XContentBuilder newBuilder(MediaType mediaType, MediaType responseContentType, boolean useFiltering) throws IOException {`
`1023`	`1022`	`return null;`
`1024`	`1023`	`}`
`1025`	`1024`