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

[BUG] The spotless should take care of unified imports ordering (libs/ subprojects) #9309

Merged
merged 1 commit into from
Aug 14, 2023

Conversation

owaiskazi19
Copy link
Member

@owaiskazi19 owaiskazi19 commented Aug 14, 2023

Description

Came out of #9082 (review), the spotless does not enforce any formatting on order of imports statements, as such those are very chaotic in the codebase.

Related Issues

Part of #9306, since there are ~3k files changed across all subprojects, sending smaller pull requests for each of the subproject.

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

…rojects)

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@owaiskazi19
Copy link
Member Author

Unrelated failures:

Tests with failures:
 - org.opensearch.remotestore.RemoteRestoreSnapshotIT.testRestoreInSameRemoteStoreEnabledIndex
 - org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testDropPrimaryDuringReplication
 - org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing
 - org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.classMethod

@opensearch-trigger-bot
Copy link
Contributor

Compatibility status:



> Task :checkCompatibility
Incompatible components: [https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git]
Compatible components: [https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/performance-analyzer-rca.git]

BUILD SUCCESSFUL in 29m 43s

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Aug 14, 2023

Codecov Report

Merging #9309 (ae902da) into main (5fdebee) will decrease coverage by 0.03%.
Report is 3 commits behind head on main.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #9309      +/-   ##
============================================
- Coverage     71.12%   71.09%   -0.03%     
- Complexity    57433    57447      +14     
============================================
  Files          4775     4775              
  Lines        270700   270700              
  Branches      39566    39566              
============================================
- Hits         192535   192463      -72     
- Misses        61958    62088     +130     
+ Partials      16207    16149      -58     
Files Changed Coverage Δ
...src/main/java/org/opensearch/ExceptionsHelper.java 82.71% <ø> (ø)
.../main/java/org/opensearch/OpenSearchException.java 89.44% <ø> (-0.28%) ⬇️
...rch/core/action/ShardOperationFailedException.java 100.00% <ø> (ø)
.../support/DefaultShardOperationFailedException.java 95.65% <ø> (ø)
...a/org/opensearch/core/common/ParsingException.java 96.66% <ø> (ø)
.../core/common/breaker/CircuitBreakingException.java 100.00% <ø> (ø)
.../opensearch/core/common/io/stream/StreamInput.java 88.45% <ø> (+0.58%) ⬆️
...opensearch/core/common/io/stream/StreamOutput.java 94.86% <ø> (+0.32%) ⬆️
...src/main/java/org/opensearch/core/index/Index.java 100.00% <ø> (ø)
.../java/org/opensearch/core/index/shard/ShardId.java 97.56% <ø> (ø)
... and 38 more

... and 477 files with indirect coverage changes

@owaiskazi19 owaiskazi19 added the backport 2.x Backport to 2.x branch label Aug 14, 2023
@owaiskazi19 owaiskazi19 merged commit 301c766 into opensearch-project:main Aug 14, 2023
@opensearch-trigger-bot
Copy link
Contributor

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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-9309-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 301c766075a4a91870439482cab4cfb09d9299bd
# Push it to GitHub
git push --set-upstream origin backport/backport-9309-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

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

@reta
Copy link
Collaborator

reta commented Aug 14, 2023

@owaiskazi19 I will take care of backport, thanks for help!

@owaiskazi19
Copy link
Member Author

owaiskazi19 commented Aug 14, 2023

@owaiskazi19 I will take care of backport, thanks for help!

Ah just saw your comment after opening a backport PR. I'll close mine. Thanks for taking care of the backport.

owaiskazi19 added a commit that referenced this pull request Aug 14, 2023
…rojects) (#9309) (#9319)

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
(cherry picked from commit 301c766)

Co-authored-by: Owais Kazi <owaiskazi19@gmail.com>
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
…rojects) (opensearch-project#9309)

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
…rojects) (opensearch-project#9309)

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…rojects) (opensearch-project#9309)

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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.

2 participants