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.

Sign up for GitHub

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

Jump to bottom

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #1 #1930 #1992

Merged
merged 9 commits into from
Aug 22, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #1 #1930 #1992

merged 9 commits into from
Aug 22, 2023

Conversation

MitchellGale
Copy link
Contributor

Description

This PR applies Spotless on Java code for:
core/src/main/java/org/opensearch/sql/analysis
core/src/main/java/org/opensearch/sql/ast
core/src/main/java/org/opensearch/sql/data
core/src/main/java/org/opensearch/sql/datasource

Issues Resolved

[List any issues this PR will resolve]

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
[Spotless] Applying Google Code Format for core/src/main files #1 (op…
10c29f6 
…ensearch-project#1930)

* # This is a combination of 9 commits.

Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)

* Added setDefaultMediaType for create_index and create_index_with_IOException

Signed-off-by: Mitchell Gale <[email protected]>
(cherry picked from commit 7b932a7)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

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

running spotless check on newly pre tagged javadocs.

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

Converts java doc table to proper java doc table.

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

Resolving merge conflicts for pre tag in java docs 2

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

running spotless check on newly pre tagged javadocs.

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

cherry pick 60c0018

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

Addressed PR comment for table format in AbstractExprValue.

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

Removed pre tag from ExpressionReferenceOptimizer.

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

Removed pre tag from AstDSL.java

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

Removed pre tag from AstDSL.java

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

Removed pre tag from SelectExpressionAnalyzer.java

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

fixed java doc in QualifiedName.java

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

Removing checkstyle test for core and added spotless for relevant directories.

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

Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java

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

Fix breaking changes. Disable some flaky tests in legacy.

Signed-off-by: Yury-Fridlyand <[email protected]>

(cherry picked from commit 809e656)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

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

running spotless check on newly pre tagged javadocs.

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

Fixed java doc spelling and improving string concatination.

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

improving string concatination.

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

Improving failure format on some functions.

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

spotless apply and fix of build.gradle

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

* parent 496fe8e
author Mitchell Gale <[email protected]> 1691080710 -0700
committer Mitchell Gale <[email protected]> 1691080766 -0700

Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)

* Added setDefaultMediaType for create_index and create_index_with_IOException

Signed-off-by: Mitchell Gale <[email protected]>
(cherry picked from commit 7b932a7)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

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

running spotless check on newly pre tagged javadocs.

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

Converts java doc table to proper java doc table.

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

Resolving merge conflicts for pre tag in java docs 2

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

running spotless check on newly pre tagged javadocs.

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

cherry pick 60c0018

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

Addressed PR comment for table format in AbstractExprValue.

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

Removed pre tag from ExpressionReferenceOptimizer.

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

Removed pre tag from AstDSL.java

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

Removed pre tag from AstDSL.java

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

Removed pre tag from SelectExpressionAnalyzer.java

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

fixed java doc in QualifiedName.java

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

Removing checkstyle test for core and added spotless for relevant directories.

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

Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java

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

Fix breaking changes. Disable some flaky tests in legacy.

Signed-off-by: Yury-Fridlyand <[email protected]>

(cherry picked from commit 809e656)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

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

running spotless check on newly pre tagged javadocs.

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

Fixed java doc spelling and improving string concatination.

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

improving string concatination.

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

Improving failure format on some functions.

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

spotless apply and fix of build.gradle

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

Resolving merge conflicts for pre tag in java docs.

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

running spotless check on newly pre tagged javadocs.

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

Converts java doc table to proper java doc table.

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

Removing unused import in OpenSearchRestClientTest.java

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

* running spotless apply.

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

* Addressed comments in PR 5.

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

---------

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

codecov bot commented Aug 18, 2023 •
edited
Loading

Codecov Report

Merging #1992 (62cb152) into 2.x (6c07ac7) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##                2.x    #1992   +/-   ##
=========================================
  Coverage     97.50%   97.51%           
  Complexity     4658     4658           
=========================================
  Files           408      408           
  Lines         11926    11930    +4     
  Branches        832      831    -1     
=========================================
+ Hits          11629    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 Δ
...rch/sql/analysis/ExpressionReferenceOptimizer.java 100.00% <ø> (ø)
...nsearch/sql/analysis/SelectExpressionAnalyzer.java 100.00% <ø> (ø)
...search/sql/data/model/AbstractExprNumberValue.java 100.00% <ø> (ø)
...g/opensearch/sql/data/model/AbstractExprValue.java 100.00% <ø> (ø)
...rg/opensearch/sql/data/model/ExprBooleanValue.java 100.00% <ø> (ø)
...a/org/opensearch/sql/data/model/ExprByteValue.java 100.00% <ø> (ø)
...org/opensearch/sql/data/model/ExprDoubleValue.java 100.00% <ø> (ø)
.../org/opensearch/sql/data/model/ExprFloatValue.java 100.00% <ø> (ø)
...rg/opensearch/sql/data/model/ExprIntegerValue.java 100.00% <ø> (ø)
...a/org/opensearch/sql/data/model/ExprLongValue.java 100.00% <ø> (ø)
... and 21 more

@Yury-Fridlyand
Copy link
Collaborator

There are a spotless failure, please, rerun

@MitchellGale
spotless apply
395f1e2 
Signed-off-by: Mitchell Gale <[email protected]>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
View reviewed changes
Yury-Fridlyand
Yury-Fridlyand reviewed Aug 21, 2023
View reviewed changes
core/build.gradle Outdated Show resolved Hide resolved
@MitchellGale
removed pitest
627e279 
Signed-off-by: Mitchell Gale <[email protected]>
Yury-Fridlyand
Yury-Fridlyand reviewed Aug 21, 2023
View reviewed changes
core/build.gradle Outdated Show resolved Hide resolved
@MitchellGale
remove pitest
cd270eb 
Signed-off-by: Mitchell Gale <[email protected]>
MitchellGale and others added 3 commits August 21, 2023 13:26
@MitchellGale
add spotless
efd38d1 
Signed-off-by: Mitchell Gale <[email protected]>
@MitchellGale
remove pitest
0815cea 
Signed-off-by: Mitchell Gale <[email protected]>
@MitchellGale
Merge branch '2.x' into backport2.x-1930
3319ad5 
Signed-off-by: Mitchell Gale <[email protected]>
@MitchellGale MitchellGale marked this pull request as draft August 21, 2023 21:32
@MitchellGale MitchellGale marked this pull request as ready for review August 22, 2023 17:46
@Yury-Fridlyand Yury-Fridlyand merged commit d205bd6 into opensearch-project:2.x Aug 22, 2023
15 checks passed
@Yury-Fridlyand Yury-Fridlyand deleted the backport2.x-1930 branch August 22, 2023 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Yury-Fridlyand Yury-Fridlyand Yury-Fridlyand approved these changes

@acarbonetto acarbonetto acarbonetto approved these changes

@matthewryanwells matthewryanwells matthewryanwells approved these changes

@pjfitzgibbons pjfitzgibbons Awaiting requested review from pjfitzgibbons

@ps48 ps48 Awaiting requested review from ps48 ps48 is a code owner

@kavithacm kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

@derek-ho derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@dai-chen dai-chen Awaiting requested review from dai-chen dai-chen is a code owner

@YANG-DB YANG-DB Awaiting requested review from YANG-DB YANG-DB is a code owner

@rupal-bq rupal-bq Awaiting requested review from rupal-bq rupal-bq is a code owner

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@vamsi-amazon vamsi-amazon Awaiting requested review from vamsi-amazon vamsi-amazon is a code owner

@Swiddis Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

@penghuo penghuo Awaiting requested review from penghuo penghuo is a code owner

@seankao-az seankao-az Awaiting requested review from seankao-az seankao-az is a code owner

@MaxKsyunz MaxKsyunz Awaiting requested review from MaxKsyunz MaxKsyunz is a code owner

@anirudha anirudha Awaiting requested review from anirudha anirudha is a code owner

@forestmvey forestmvey Awaiting requested review from forestmvey forestmvey is a code owner

@GumpacG GumpacG Awaiting requested review from GumpacG GumpacG is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MitchellGale @Yury-Fridlyand @acarbonetto @matthewryanwells