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

[Spotless] Adds new line at end of java files #1896

Merged
merged 15 commits into from
Aug 3, 2023
Merged

[Spotless] Adds new line at end of java files #1896

merged 15 commits into from
Aug 3, 2023

Conversation

MitchellGale
Copy link
Contributor

Description

Adds new line at end of files missing it. Uncommented spotless line for verification.

Note: line endings updated from /r/n to /n in common/src/main/java/org/opensearch/sql/common/grok/Converter.java

Related to:
#1888

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 12 commits July 19, 2023 23:32
@MitchellGale @Yury-Fridlyand
Adding spotless plugin to project build.gradle.
1b01c71 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Remove commented out spotless changes.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Adding Spotless to DEVELOPER_GUIDE.rst

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Added Google Java format to spotless.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Update DEVELOPER_GUIDE.rst

Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
@MitchellGale
Added apply false for spotless
3d87ab5 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Adding ratchetFrom to build.gradle
98479d0 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Adding license header to build.gradle for spotless.
bf595d3 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Uncommenting all changes to build.gradle for spotless.
b23f84c 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Commented out spotless checks.
5e15e79 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Add specific version for java format spotless (1.17.0)
18a75bd 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Merge pull request #288 from Bit-Quill/dev/spotless
e645a51 
Adds Spotless code formatter
@MitchellGale
Add spotless end with new line check.
f26d188 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Add new line at end of files missing lines.
aeda307 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Removed include path
760d64d 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale
Merge pull request #302 from Bit-Quill/dev/sl_endWithNewLine
ccce743 
[Spotless] Adds new line at end of java files
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Jul 24, 2023
View reviewed changes
GumpacG
GumpacG previously approved these changes Jul 24, 2023
View reviewed changes
@MitchellGale
Merge branch 'main' into integ/sl_endWithNewLine
b9e63c7 
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale MitchellGale dismissed stale reviews from GumpacG and Yury-Fridlyand via b9e63c7 July 26, 2023 18:58
@MitchellGale MitchellGale mentioned this pull request Jul 26, 2023
Merged
6 tasks
@codecov
Copy link

codecov bot commented Jul 26, 2023 •
edited
Loading

Codecov Report

Merging #1896 (1b81183) into main (430d7a9) will not change coverage.
Report is 3 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1896   +/-   ##
=========================================
  Coverage     97.42%   97.42%           
  Complexity     4647     4647           
=========================================
  Files           408      408           
  Lines         11526    11526           
  Branches        839      839           
=========================================
  Hits          11229    11229           
  Misses          290      290           
  Partials          7        7
Flag Coverage Δ
sql-engine 97.42% <ø> (ø)

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

Files Changed Coverage Δ
...ression/operator/arthmetic/ArithmeticFunction.java 100.00% <ø> (ø)
...g/opensearch/sql/expression/text/TextFunction.java 100.00% <ø> (ø)
...earch/sql/datasources/encryptor/EncryptorImpl.java 100.00% <ø> (ø)
...model/transport/CreateDataSourceActionRequest.java 27.27% <ø> (ø)
...odel/transport/CreateDataSourceActionResponse.java 0.00% <ø> (ø)
...model/transport/DeleteDataSourceActionRequest.java 18.75% <ø> (ø)
...odel/transport/DeleteDataSourceActionResponse.java 0.00% <ø> (ø)
...es/model/transport/GetDataSourceActionRequest.java 27.27% <ø> (ø)
...s/model/transport/GetDataSourceActionResponse.java 0.00% <ø> (ø)
...model/transport/UpdateDataSourceActionRequest.java 27.27% <ø> (ø)
... and 13 more

@GumpacG
Copy link
Collaborator

GumpacG commented Jul 27, 2023

Could you resolve conflicts?

@MitchellGale
Merge branch 'main' into integ/sl_endWithNewLine
0b4874d 
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
Copy link
Contributor Author

Could you resolve conflicts?

Resolved.

@MitchellGale
Correcting ending new line for QueryExemplars.
1b81183 
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@MitchellGale MitchellGale mentioned this pull request Aug 2, 2023
Closed
6 tasks
@acarbonetto acarbonetto merged commit d2de909 into opensearch-project:main Aug 3, 2023
15 checks passed
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Aug 3, 2023
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 3, 2023
@github-actions @Yury-Fridlyand
[Spotless] Adds new line at end of java files (#1896)
c2e2d23 
* Adding spotless plugin to project build.gradle.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Remove commented out spotless changes.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Adding Spotless to DEVELOPER_GUIDE.rst

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Added Google Java format to spotless.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Update DEVELOPER_GUIDE.rst

Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Added apply false for spotless

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding ratchetFrom to build.gradle

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding license header to build.gradle for spotless.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Uncommenting all changes to build.gradle for spotless.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Commented out spotless checks.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Add specific version for java format spotless (1.17.0)

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Add spotless end with new line check.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Add new line at end of files missing lines.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Removed include path

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Correcting ending new line for QueryExemplars.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
(cherry picked from commit d2de909)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@acarbonetto acarbonetto deleted the integ/sl_endWithNewLine branch August 3, 2023 00:20
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 3, 2023
@MitchellGale @Yury-Fridlyand
[Spotless] Adds new line at end of java files (opensearch-project#1896)
7a52c9b 
* Adding spotless plugin to project build.gradle.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Remove commented out spotless changes.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Adding Spotless to DEVELOPER_GUIDE.rst

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Added Google Java format to spotless.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Update DEVELOPER_GUIDE.rst

Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Added apply false for spotless

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding ratchetFrom to build.gradle

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Adding license header to build.gradle for spotless.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Uncommenting all changes to build.gradle for spotless.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Commented out spotless checks.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Add specific version for java format spotless (1.17.0)

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Add spotless end with new line check.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Add new line at end of files missing lines.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Removed include path

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Correcting ending new line for QueryExemplars.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 4, 2023
@opensearch-trigger-bot @github-actions @Yury-Fridlyand
[Spotless] Adds new line at end of java files (#1896) (#1925)
5c91071 
* Adding spotless plugin to project build.gradle.



Remove commented out spotless changes.



Adding Spotless to DEVELOPER_GUIDE.rst



Added Google Java format to spotless.



Update DEVELOPER_GUIDE.rst



* Added apply false for spotless



* Adding ratchetFrom to build.gradle



* Adding license header to build.gradle for spotless.



* Uncommenting all changes to build.gradle for spotless.



* Commented out spotless checks.



* Add specific version for java format spotless (1.17.0)



* Add spotless end with new line check.



* Add new line at end of files missing lines.



* Removed include path



* Correcting ending new line for QueryExemplars.



---------




(cherry picked from commit d2de909)

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
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

@GumpacG GumpacG GumpacG left review comments

@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

Assignees
No one assigned
Labels
backport 2.x
Projects
None yet
Milestone
No milestone
Development

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