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 (all other subprojects) #9399

Merged
merged 1 commit into from
Aug 16, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Aug 16, 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

Closes #9306

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.

@reta reta changed the title [BUG] The spotless should take care of unified imports ordering (all … [BUG] The spotless should take care of unified imports ordering (all other subprojects) Aug 16, 2023
Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last one. Thanks @reta!

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Aug 16, 2023

Codecov Report

Merging #9399 (6b00a0d) into main (9ce008d) will decrease coverage by 0.08%.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #9399      +/-   ##
============================================
- Coverage     71.20%   71.13%   -0.08%     
+ Complexity    57529    57471      -58     
============================================
  Files          4777     4777              
  Lines        270822   270822              
  Branches      39586    39586              
============================================
- Hits         192833   192639     -194     
- Misses        61808    62001     +193     
- Partials      16181    16182       +1     
Files Changed Coverage Δ
...nsearch/common/settings/CreateKeyStoreCommand.java 81.25% <ø> (ø)
...pensearch/common/settings/ListKeyStoreCommand.java 100.00% <ø> (ø)
...rc/main/java/org/opensearch/plugins/PluginCli.java 0.00% <ø> (ø)
...g/opensearch/upgrade/DetectEsInstallationTask.java 38.00% <ø> (ø)
...va/org/opensearch/upgrade/ImportYmlConfigTask.java 77.27% <ø> (ø)
...n/java/org/opensearch/compress/ZstdCompressor.java 70.58% <ø> (+17.64%) ⬆️
...g/opensearch/compress/spi/CompressionProvider.java 100.00% <ø> (ø)
...rg/opensearch/telemetry/tracing/DefaultTracer.java 92.59% <ø> (ø)
.../opensearch/telemetry/tracing/noop/NoopTracer.java 66.66% <ø> (ø)
...transport/RestHighLevelClientEmployeeResource.java 0.00% <ø> (ø)
... and 2 more

... and 431 files with indirect coverage changes

@opensearch-trigger-bot
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 9ce008d

Incompatible components

Incompatible components: [https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/asynchronous-search.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/notifications.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/observability.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/ml-commons.git]

@reta reta merged commit 7ffcd65 into opensearch-project:main Aug 16, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Aug 16, 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-9399-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7ffcd6500e0bd5956cef5c289ee66d9f99d533fc
# Push it to GitHub
git push --set-upstream origin backport/backport-9399-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-9399-to-2.x.

@kotwanikunal
Copy link
Member

@reta I was praying for the backport to work. But 304 files was too optimistic 😉

@reta
Copy link
Collaborator Author

reta commented Aug 16, 2023

@reta I was praying for the backport to work. But 304 files was too optimistic 😉

🙏 thanks @kotwanikunal , will do manually right after #9398

reta added a commit to reta/OpenSearch that referenced this pull request Aug 16, 2023
…other subprojects) (opensearch-project#9399)

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 7ffcd65)
reta added a commit that referenced this pull request Aug 17, 2023
…other subprojects) (#9399) (#9404)

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 7ffcd65)
austintlee pushed a commit to austintlee/OpenSearch that referenced this pull request Aug 25, 2023
kkmr pushed a commit to kkmr/OpenSearch that referenced this pull request Aug 28, 2023
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…other subprojects) (opensearch-project#9399)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
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.

[BUG] The spotless should take care of unified imports ordering
3 participants