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 core/src/main files #3 #1932

Merged

Conversation

MitchellGale
Copy link
Contributor

@MitchellGale MitchellGale commented Aug 3, 2023

Description

This PR applies Spotless on Java code for:
core/src/main/java/org/opensearch/sql/planner
core/src/main/java/org/opensearch/sql/storage
core/src/main/java/org/opensearch/sql/utils

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.

MitchellGale and others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils

Signed-off-by: Mitchell Gale <[email protected]>
…ava OperatorUtils.java Planner.java

Signed-off-by: Mitchell Gale <[email protected]>
[Spotless] Applying Google Code Format for core/src/main files #3
@codecov
Copy link

codecov bot commented Aug 3, 2023

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #1932      +/-   ##
============================================
- Coverage     97.51%   97.51%   -0.01%     
  Complexity     4658     4658              
============================================
  Files           408      408              
  Lines         11934    11930       -4     
  Branches        834      832       -2     
============================================
- Hits          11637    11633       -4     
  Misses          290      290              
  Partials          7        7              
Flag Coverage Δ
sql-engine 97.51% <100.00%> (-0.01%) ⬇️

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

Files Changed Coverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java 100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java 100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java 100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java 100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java 100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java 100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java 100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java 100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java 100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java 100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;
Copy link
Collaborator

@GumpacG GumpacG Aug 4, 2023

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023
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.

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;
Copy link
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <[email protected]>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
@MitchellGale MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcd August 9, 2023 20:08
@Yury-Fridlyand Yury-Fridlyand merged commit 9914580 into opensearch-project:main Aug 9, 2023
@Yury-Fridlyand Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…ensearch-project#1932)

* Applying Google Java code format changes to core/src/main/java/org/opensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils

Signed-off-by: Mitchell Gale <[email protected]>

* Ignore on failure for checkstyle in core and added the three spotless fixes files.

Signed-off-by: Mitchell Gale <[email protected]>

* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java

Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply, fixing include for spotless build.gradle and adding pre tag.

Signed-off-by: Mitchell Gale <[email protected]>

* addressed PR comments.

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…ensearch-project#1932)

* Applying Google Java code format changes to core/src/main/java/org/opensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils

Signed-off-by: Mitchell Gale <[email protected]>

* Ignore on failure for checkstyle in core and added the three spotless fixes files.

Signed-off-by: Mitchell Gale <[email protected]>

* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java

Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply, fixing include for spotless build.gradle and adding pre tag.

Signed-off-by: Mitchell Gale <[email protected]>

* addressed PR comments.

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)

* [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)

* Applying Google Java code format changes to core/src/main/java/org/opensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils

Signed-off-by: Mitchell Gale <[email protected]>

* Ignore on failure for checkstyle in core and added the three spotless fixes files.

Signed-off-by: Mitchell Gale <[email protected]>

* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java

Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply, fixing include for spotless build.gradle and adding pre tag.

Signed-off-by: Mitchell Gale <[email protected]>

* addressed PR comments.

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply

Signed-off-by: Mitchell Gale <[email protected]>

* add checkstyle ignore

Signed-off-by: Mitchell Gale <[email protected]>

* addressed PR comments

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants