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

Update UpdateIndexHandler.kt to use org.opensearch.core.common.Strings; #837

Merged
merged 1 commit into from
May 22, 2023

Conversation

monusingh-1
Copy link
Collaborator

@monusingh-1 monusingh-1 commented May 19, 2023

Update UpdateIndexHandler.kt to use org.opensearch.core.common.Strings;

Description

Upstream change opensearch-project/OpenSearch@1e08b5a

The change moved from
import org.opensearch.common.Strings; to import org.opensearch.core.common.Strings;

This started breaking changes

> Task :clean
> Task :compileKotlin
e: /Users/runner/work/cross-cluster-replication/cross-cluster-replication/src/main/kotlin/org/opensearch/replication/rest/UpdateIndexHandler.kt: (43, 77): Unresolved reference: splitStringByCommaToArray

Issues Resolved

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.

Update UpdateIndexHandler.kt to use org.opensearch.core.common.Strings;

Signed-off-by: Monu Singh <[email protected]>


Signed-off-by: Monu Singh <[email protected]>
@monusingh-1 monusingh-1 marked this pull request as ready for review May 19, 2023 05:50
@monusingh-1 monusingh-1 requested a review from gbbafna as a code owner May 19, 2023 05:50
@codecov
Copy link

codecov bot commented May 19, 2023

Codecov Report

Merging #837 (ed6e162) into main (9408b3d) will increase coverage by 0.06%.
The diff coverage is n/a.

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

@@             Coverage Diff              @@
##               main     #837      +/-   ##
============================================
+ Coverage     73.26%   73.32%   +0.06%     
- Complexity     1005     1007       +2     
============================================
  Files           141      141              
  Lines          4653     4653              
  Branches        526      526              
============================================
+ Hits           3409     3412       +3     
+ Misses          919      915       -4     
- Partials        325      326       +1     
Impacted Files Coverage Δ
.../opensearch/replication/rest/UpdateIndexHandler.kt 100.00% <ø> (ø)

... and 3 files with indirect coverage changes

@monusingh-1 monusingh-1 reopened this May 19, 2023
@monusingh-1
Copy link
Collaborator Author

Builds will pass after opensearch-project/common-utils#432

Tested locally by publishing common-utils locally.

@soosinha soosinha merged commit cbc2c96 into opensearch-project:main May 22, 2023
@monusingh-1 monusingh-1 deleted the patch-5 branch May 22, 2023 05:35
@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-837-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 cbc2c96425344fc3c7fc02c5944895ebda64ca11
# Push it to GitHub
git push --set-upstream origin backport/backport-837-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-837-to-2.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.

3 participants