[Refactor] Requests to use MediaType instead of XContentType by nknize · Pull Request #6218 · opensearch-project/OpenSearch

nknize · 2023-02-07T13:30:58Z

Refactors various REST requests to use MediaType instead of XContentType to abstract media format from the REST interfaces.

relates #5910

client/rest-high-level/src/main/java/org/opensearch/client/indices/PutMappingRequest.java

github-actions · 2023-02-07T14:00:30Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/10776/
CommitID: c5f0c89
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

client/rest-high-level/src/main/java/org/opensearch/client/indices/PutMappingRequest.java

github-actions · 2023-02-07T15:32:18Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/10779/
CommitID: 739d524
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-02-07T16:24:09Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/10782/
CommitID: 986a83d

Refactors various REST requests to use MediaType instead of XContentType to abstract media format from the REST interfaces. Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

github-actions · 2023-02-08T14:36:58Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/10840/
CommitID: 6978118
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java

github-actions · 2023-02-08T15:06:16Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/10841/
CommitID: ded5906

codecov-commenter · 2023-02-08T15:08:17Z

Codecov Report

Merging #6218 (ded5906) into main (2b77985) will decrease coverage by 0.06%.
The diff coverage is 43.47%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main    #6218      +/-   ##
============================================
- Coverage     70.91%   70.86%   -0.06%     
- Complexity    58898    58915      +17     
============================================
  Files          4780     4780              
  Lines        281380   281453      +73     
  Branches      40635    40639       +4     
============================================
- Hits         199536   199444      -92     
- Misses        65426    65633     +207     
+ Partials      16418    16376      -42

Impacted Files	Coverage Δ
.../java/org/opensearch/common/xcontent/XContent.java	`100.00% <ø> (ø)`
...rg/opensearch/common/xcontent/XContentFactory.java	`64.15% <ø> (+0.94%)`	⬆️
.../opensearch/common/xcontent/XContentGenerator.java	`73.33% <ø> (ø)`
...a/org/opensearch/common/xcontent/XContentType.java	`100.00% <ø> (ø)`
.../opensearch/common/xcontent/cbor/CborXContent.java	`80.00% <ø> (ø)`
.../opensearch/common/xcontent/json/JsonXContent.java	`100.00% <ø> (ø)`
...pensearch/common/xcontent/smile/SmileXContent.java	`87.50% <ø> (ø)`
.../opensearch/common/xcontent/yaml/YamlXContent.java	`84.61% <ø> (ø)`
...ction/admin/indices/create/CreateIndexRequest.java	`66.22% <0.00%> (-9.32%)`	⬇️
...g/opensearch/action/ingest/PutPipelineRequest.java	`67.74% <0.00%> (-19.76%)`	⬇️
... and 514 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

github-actions · 2023-02-08T16:28:06Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/10844/
CommitID: 2f0ec23

opensearch-trigger-bot · 2023-02-08T16:30:02Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-6218-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1f4cdd2f75ca5e98bd81f3226566d263ec00455c
# Push it to GitHub
git push --set-upstream origin backport/backport-6218-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-6218-to-2.x.

…rch-project#6218) Refactors various REST requests to use MediaType instead of XContentType to abstract media format from the REST interfaces. Signed-off-by: Nicholas Walter Knize <nknize@apache.org> (cherry picked from commit 1f4cdd2) Signed-off-by: Andrew Ross <andrross@amazon.com>

andrross · 2023-02-20T18:18:54Z

@nknize Is this going to be backported? It builds on some changes from #6009 which has not been backported. I spent a couple minutes looking at it and it wasn't immediately obvious to me how to reconcile the changes.

nknize · 2023-02-21T14:46:13Z

Yes. I'll take care of both.

…rch-project#6218) Refactors various REST requests to use MediaType instead of XContentType to abstract media format from the REST interfaces. Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

…6433) Refactors various REST requests to use MediaType instead of XContentType to abstract media format from the REST interfaces. Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

…pensearch-project#6218) (opensearch-project#6433)" This reverts commit f2faf01.

nknize added enhancement Enhancement or improvement to existing feature or request skip-changelog v2.6.0 'Issues and PRs related to version v2.6.0' labels Feb 7, 2023

nknize requested review from Bukhtawar, CEHENKLE, Rishikesh1159, VachaShah, adnapibar, anasalkouz, andrross, dblock, dreamer-89, gbbafna, kartg, kotwanikunal, mch2, owaiskazi19, reta, ryanbogan, saratvemulapalli, setiah, shwetathareja, tlfeng and xuezhou25 as code owners February 7, 2023 13:31

nknize mentioned this pull request Feb 7, 2023

[Refactor] XContent base classes from xcontent to core library #5902

Merged

reta reviewed Feb 7, 2023

View reviewed changes

client/rest-high-level/src/main/java/org/opensearch/client/indices/PutMappingRequest.java Show resolved Hide resolved

reta reviewed Feb 7, 2023

View reviewed changes

client/rest-high-level/src/main/java/org/opensearch/client/indices/PutMappingRequest.java Outdated Show resolved Hide resolved

nknize force-pushed the hlrcMediaTypeMethods branch from 29abae8 to 739d524 Compare February 7, 2023 15:15

nknize added 5 commits February 8, 2023 08:35

[Refactor] Requests to use MediaType instead of XContentType

28fda37

Refactors various REST requests to use MediaType instead of XContentType to abstract media format from the REST interfaces. Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

update deprecation methods

9110ae0

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

remove instance check

728a647

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

fix build failure

199dde6

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

refactor XContent.type to XContent.mediaType

ded5906

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

nknize force-pushed the hlrcMediaTypeMethods branch from 6978118 to ded5906 Compare February 8, 2023 14:35

reta reviewed Feb 8, 2023

View reviewed changes

server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java Outdated Show resolved Hide resolved

add writeRawField mediaType method

2f0ec23

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

reta approved these changes Feb 8, 2023

View reviewed changes

nknize merged commit 1f4cdd2 into opensearch-project:main Feb 8, 2023

nknize added the backport 2.x Backport to 2.x branch label Feb 8, 2023

andrross removed the v2.6.0 'Issues and PRs related to version v2.6.0' label Feb 21, 2023

cwperks mentioned this pull request Feb 21, 2023

[Backport 2.x] Increment version to 2.7.0-SNAPSHOT and update usage of XContentFactory.xContent opensearch-project/security#2451

Merged

nknize mentioned this pull request Feb 22, 2023

[Backport 2.x] [Refactor] Requests to use MediaType instead of XContentType (#6218) #6433

Merged

sejli mentioned this pull request Mar 9, 2023

[REFACTORING] Updating search-processor for XContentType refactor opensearch-project/search-processor#116

Closed

Rishikesh1159 added a commit to Rishikesh1159/OpenSearch that referenced this pull request Mar 16, 2023

Revert "[Refactor] Requests to use MediaType instead of XContentType (o…

241b269

…pensearch-project#6218) (opensearch-project#6433)" This reverts commit f2faf01.

Rishikesh1159 added a commit to Rishikesh1159/OpenSearch that referenced this pull request Mar 19, 2023

Revert "[Refactor] Requests to use MediaType instead of XContentType (o…

b74c1f1

…pensearch-project#6218) (opensearch-project#6433)" This reverts commit f2faf01.

Rishikesh1159 added a commit to Rishikesh1159/OpenSearch that referenced this pull request Mar 30, 2023

Revert "[Refactor] Requests to use MediaType instead of XContentType (o…

c32fec8

…pensearch-project#6218) (opensearch-project#6433)" This reverts commit f2faf01.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Refactor] Requests to use MediaType instead of XContentType#6218

[Refactor] Requests to use MediaType instead of XContentType#6218
nknize merged 6 commits intoopensearch-project:mainfrom
nknize:hlrcMediaTypeMethods

nknize commented Feb 7, 2023

Uh oh!

Uh oh!

github-actions bot commented Feb 7, 2023

Uh oh!

Uh oh!

github-actions bot commented Feb 7, 2023

Uh oh!

github-actions bot commented Feb 7, 2023

Uh oh!

github-actions bot commented Feb 8, 2023

Uh oh!

Uh oh!

github-actions bot commented Feb 8, 2023

Uh oh!

codecov-commenter commented Feb 8, 2023

Uh oh!

github-actions bot commented Feb 8, 2023

Uh oh!

opensearch-trigger-bot bot commented Feb 8, 2023

Uh oh!

andrross commented Feb 20, 2023

Uh oh!

nknize commented Feb 21, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

nknize commented Feb 7, 2023

Uh oh!

Uh oh!

github-actions bot commented Feb 7, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

Uh oh!

github-actions bot commented Feb 7, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

github-actions bot commented Feb 7, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

github-actions bot commented Feb 8, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

Uh oh!

github-actions bot commented Feb 8, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

codecov-commenter commented Feb 8, 2023

Codecov Report

Uh oh!

github-actions bot commented Feb 8, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

opensearch-trigger-bot bot commented Feb 8, 2023

Uh oh!

andrross commented Feb 20, 2023

Uh oh!

nknize commented Feb 21, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants