Skip to content
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.

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

Change use of XContentType.fromMediaType to MediaType.fromMediaType #1094

Merged

Conversation

monusingh-1
Copy link
Collaborator

@monusingh-1 monusingh-1 commented Jul 25, 2023

Description

Refactor to use MediaType.fromMediaType due to upstream change opensearch-project/OpenSearch#8636

Issues Resolved


e: file:///Users/msnghgw/main/ccr-dev/src/test/kotlin/org/opensearch/replication/ReplicationHelpers.kt:99:37 Unresolved reference: fromMediaType

> Task :compileTestKotlin FAILED

FAILURE: Build failed with an exception.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@monusingh-1 monusingh-1 marked this pull request as ready for review July 25, 2023 07:00
@codecov
Copy link

codecov bot commented Jul 25, 2023

Codecov Report

Merging #1094 (1e280f2) into main (fa7b9c5) will decrease coverage by 0.13%.
The diff coverage is n/a.

❗ Current head 1e280f2 differs from pull request most recent head cd55a37. Consider uploading reports for the commit cd55a37 to get more accurate results

@@             Coverage Diff              @@
##               main    #1094      +/-   ##
============================================
- Coverage     74.98%   74.85%   -0.13%     
- Complexity     1023     1026       +3     
============================================
  Files           141      141              
  Lines          4761     4761              
  Branches        521      521              
============================================
- Hits           3570     3564       -6     
- Misses          855      864       +9     
+ Partials        336      333       -3     

see 6 files with indirect coverage changes

@monusingh-1 monusingh-1 enabled auto-merge (squash) July 25, 2023 07:30
@monusingh-1 monusingh-1 merged commit bcf1144 into opensearch-project:main Jul 25, 2023
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

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

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1094-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 bcf1144a48671de372542b032de93f2ffbd46f19
# Push it to GitHub
git push --set-upstream origin backport/backport-1094-to-2.x
# Go back to the original working tree
cd ../..
# 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-1094-to-2.x.

@monusingh-1 monusingh-1 deleted the fix_Xconent_fromMediaType branch November 2, 2023 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants