Skip to content

Change imports for xcontent#482

Merged
joshpalis merged 1 commit intoopensearch-project:mainfrom
ryanbogan:change_xcontent_imports
Feb 22, 2023
Merged

Change imports for xcontent#482
joshpalis merged 1 commit intoopensearch-project:mainfrom
ryanbogan:change_xcontent_imports

Conversation

@ryanbogan
Copy link
Copy Markdown
Member

Description

XContent was refactored from org.opensearch.common to org.opensearch.core in the OpenSearch repository. This PR makes the appropriate adjustments to accomodate this change.

Issues Resolved

#481

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.

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Merging #482 (8b53960) into main (b68bf20) will not change coverage.
The diff coverage is n/a.

📣 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     #482   +/-   ##
=========================================
  Coverage     66.17%   66.17%           
  Complexity      186      186           
=========================================
  Files            35       35           
  Lines           813      813           
  Branches         24       24           
=========================================
  Hits            538      538           
  Misses          264      264           
  Partials         11       11           
Impacted Files Coverage Δ
src/main/java/org/opensearch/sdk/Extension.java 100.00% <ø> (ø)
...main/java/org/opensearch/sdk/ExtensionsRunner.java 70.76% <ø> (ø)
...a/org/opensearch/sdk/SDKNamedXContentRegistry.java 100.00% <ø> (ø)
.../main/java/org/opensearch/sdk/SearchExtension.java 15.09% <ø> (ø)
...ch/sdk/sample/helloworld/rest/RestHelloAction.java 85.10% <ø> (ø)

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

@joshpalis joshpalis merged commit b5aa7cd into opensearch-project:main Feb 22, 2023
@ryanbogan ryanbogan deleted the change_xcontent_imports branch February 22, 2023 00:39
kokibas pushed a commit to kokibas/opensearch-sdk-java that referenced this pull request Mar 17, 2023
Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@opensearch-trigger-bot
Copy link
Copy Markdown

The backport to 1.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-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-482-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b5aa7cd36e51cb2deaac928f9f34b8e3e5b54988
# Push it to GitHub
git push --set-upstream origin backport/backport-482-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x

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

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.

4 participants