Skip to content

Changed XContentType to MediaType #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Changed XContentType to MediaType #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestHelloAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import org.opensearch.OpenSearchParseException;
import org.opensearch.core.common.bytes.BytesReference;
import org.opensearch.core.xcontent.MediaType;
import org.opensearch.core.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.common.xcontent.json.JsonXContent;
Expand Down Expand Up @@ -100,11 +101,11 @@ public List<NamedRoute> routes() {
private Function<RestRequest, RestResponse> handlePostRequest = (request) -> {
if (request.hasContent()) {
String adjective = "";
XContentType contentType = request.getXContentType();
if (contentType == null) {
MediaType mediaType = request.getMediaType();
if (mediaType == null) {
// Plain text
adjective = request.content().utf8ToString();
} else if (contentType.equals(XContentType.JSON)) {
} else if (mediaType.equals(XContentType.JSON)) {
try {
adjective = request.contentParser().mapStrings().get("adjective");
} catch (IOException | OpenSearchParseException e) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/opensearch/sdk/rest/TestSDKRestRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void testSDKRestRequestMethods() throws IOException {
assertEquals(expectedPath, sdkRestRequest.path());
assertEquals(expectedParams, sdkRestRequest.params());
assertEquals(expectedHeaders, sdkRestRequest.getHeaders());
assertEquals(exptectedXContentType, sdkRestRequest.getXContentType());
assertEquals(exptectedXContentType, sdkRestRequest.getMediaType());
assertEquals(expectedContent, sdkRestRequest.content());

Map<String, String> source = sdkRestRequest.contentParser().mapStrings();
Expand Down