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 (server/src/main/ subproject) #9391

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

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.

@opensearch-trigger-bot
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 5a25350

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/ml-commons.git, https://github.com/opensearch-project/performance-analyzer-rca.git]

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

…er/src/main/ subproject)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta force-pushed the spotless.server.main branch from f06e922 to 6af3c43 Compare August 16, 2023 12:53
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Aug 16, 2023

Codecov Report

Merging #9391 (6af3c43) into main (8d153ab) will decrease coverage by 0.10%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #9391      +/-   ##
============================================
- Coverage     71.17%   71.08%   -0.10%     
+ Complexity    57480    57440      -40     
============================================
  Files          4777     4777              
  Lines        270821   270821              
  Branches      39586    39586              
============================================
- Hits         192755   192510     -245     
- Misses        61868    62130     +262     
+ Partials      16198    16181      -17     
Files Changed Coverage Δ
...va/org/apache/lucene/queries/BlendedTermQuery.java 72.43% <ø> (+2.16%) ⬆️
.../java/org/apache/lucene/util/SPIClassIterator.java 55.73% <ø> (ø)
.../java/org/apache/lucene/util/packed/XPacked64.java 40.94% <ø> (ø)
...pache/lucene/util/packed/XPacked64SingleBlock.java 0.00% <ø> (ø)
...ava/org/apache/lucene/util/packed/XPackedInts.java 34.29% <ø> (+0.96%) ⬆️
...ensearch/action/ActionListenerResponseHandler.java 92.85% <ø> (ø)
.../main/java/org/opensearch/action/ActionModule.java 96.33% <ø> (ø)
...rc/main/java/org/opensearch/action/ActionType.java 88.88% <ø> (ø)
...in/java/org/opensearch/action/DocWriteRequest.java 49.31% <ø> (ø)
...n/java/org/opensearch/action/DocWriteResponse.java 82.45% <ø> (+1.16%) ⬆️
... and 288 more

... and 479 files with indirect coverage changes

@opensearch-trigger-bot
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 8d153ab

Incompatible components

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

Skipped components

Compatible components

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

@reta reta merged commit aca2e9d 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-9391-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 aca2e9de7daaadee77c33e21ff5215c3f1e8600f
# Push it to GitHub
git push --set-upstream origin backport/backport-9391-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-9391-to-2.x.

reta added a commit to reta/OpenSearch that referenced this pull request Aug 16, 2023
…er/src/main/ subproject) (opensearch-project#9391)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit that referenced this pull request Aug 16, 2023
…er/src/main/ subproject) (#9391) (#9397)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
austintlee pushed a commit to austintlee/OpenSearch that referenced this pull request Aug 25, 2023
…er/src/main/ subproject) (opensearch-project#9391)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
kkmr pushed a commit to kkmr/OpenSearch that referenced this pull request Aug 28, 2023
…er/src/main/ subproject) (opensearch-project#9391)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
…er/src/main/ subproject) (opensearch-project#9391)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
…er/src/main/ subproject) (opensearch-project#9391)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…er/src/main/ subproject) (opensearch-project#9391)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
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.

3 participants