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

[Spotless] Applying Google Code Format for entire project #22 #2005

Merged

Conversation

MitchellGale
Copy link
Contributor

Description

Applies spotless on entire project with **/*.java
Removes checkstyles from project

Issues Resolved

#1101

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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.

Signed-off-by: Mitchell Gale <[email protected]>
@codecov
Copy link

codecov bot commented Aug 22, 2023

Codecov Report

Merging #2005 (25571f9) into main (6055c7e) will increase coverage by 0.00%.
Report is 2 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #2005   +/-   ##
=========================================
  Coverage     97.30%   97.30%           
- Complexity     4622     4623    +1     
=========================================
  Files           407      407           
  Lines         11934    11935    +1     
  Branches        827      828    +1     
=========================================
+ Hits          11612    11613    +1     
  Misses          315      315           
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.30% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 1 file with indirect coverage changes

Copy link
Collaborator

@Yury-Fridlyand Yury-Fridlyand left a comment

Choose a reason for hiding this comment

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

Can you move left of changes in :legacy into another PR?

.github/workflows/sql-test-workflow.yml Show resolved Hide resolved
acarbonetto
acarbonetto previously approved these changes Aug 22, 2023
… opensearch, plugin, ppl, protocol, sql

Signed-off-by: Mitchell Gale <[email protected]>
acarbonetto
acarbonetto previously approved these changes Aug 22, 2023
exclude '**/build/**', '**/build-*/**'
}
importOrder()
// licenseHeader("/*\n" +
Copy link
Collaborator

Choose a reason for hiding this comment

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

if we aren't going to apply this, we should either have a comment or remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea, just added a comment that references the blocking issue

Signed-off-by: Mitchell Gale <[email protected]>
@Yury-Fridlyand Yury-Fridlyand merged commit 09d222b into opensearch-project:main Aug 22, 2023
20 of 21 checks passed
@Yury-Fridlyand Yury-Fridlyand deleted the dev/sl_GoogleJavaFormat22 branch August 22, 2023 18:15
@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/sql/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.x
# Create a new branch
git switch --create backport/backport-2005-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 09d222bd83d6ee1f2ab0933b09499cea92d71b5a
# Push it to GitHub
git push --set-upstream origin backport/backport-2005-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.x

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

@joshuali925
Copy link
Member

removing backport-failed since there's a PR merged for 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.

5 participants