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

Enabling spotless for all modules #651

Merged
merged 10 commits into from
Oct 9, 2023

Conversation

VachaShah
Copy link
Collaborator

@VachaShah VachaShah commented Oct 4, 2023

Description

Enabled spotless for all modules in the repo. Did it module by module per commit by running ./gradlew spotlessApply for each.

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

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.

dblock
dblock previously approved these changes Oct 4, 2023
Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

If you want to do a whole codebase like this at once, I don't mind merging a massive PR.

@VachaShah
Copy link
Collaborator Author

If you want to do a whole codebase like this at once, I don't mind merging a massive PR.

Thank you @dblock! I will add all files for spotless changes in this PR divided by commits.

@VachaShah VachaShah changed the title Enabling spotless for _types module Enabling spotless for all modules Oct 4, 2023
@VachaShah VachaShah requested a review from dblock October 4, 2023 22:35
dblock
dblock previously approved these changes Oct 5, 2023
Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

Great! Who's fixing the link checker? :)

@VachaShah
Copy link
Collaborator Author

Great! Who's fixing the link checker? :)

Haha, weird javadoc.io is not reachable since many days. Let me see if we can replace the link.

@VachaShah
Copy link
Collaborator Author

VachaShah commented Oct 5, 2023

Found maxcellent/javadoc.io#180

@VachaShah
Copy link
Collaborator Author

@dblock I added the javadoc.io link in excludes in the latest commit till it is fixed.

I will create an issue to track this.

dblock
dblock previously approved these changes Oct 5, 2023
@dblock
Copy link
Member

dblock commented Oct 6, 2023

Let's merge this before it hits a conflict? @Bukhtawar @saratvemulapalli ?

@saratvemulapalli
Copy link
Member

@VachaShah couple of conflicts :/

Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
…asks modules

Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
@VachaShah
Copy link
Collaborator Author

@dblock @saratvemulapalli Review again please? I fixed the merge conflicts and also removed the exclusion of the javadoc.io link since it is fixed now.

@dblock dblock merged commit dc41a99 into opensearch-project:main Oct 9, 2023
33 checks passed
@dblock
Copy link
Member

dblock commented Oct 9, 2023

Do we backport this?

@VachaShah
Copy link
Collaborator Author

Do we backport this?

Yeah I will backport this PR and the previous PR #648 manually to 2.x since there will be a lot of conflicts.

@VachaShah VachaShah deleted the checkstyle-to-spotless-1 branch October 10, 2023 05:29
VachaShah added a commit to VachaShah/opensearch-java that referenced this pull request Oct 11, 2023
* Enabling spotless for _types module

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for cat module

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for cluster module

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for core module

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for dangling_indices, features, ingest, shutdown, tasks modules

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for indices module

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for nodes and snapshot modules

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for remaining opensearch module

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for rest of the code including tests

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Fixing spotless from merge conflicts

Signed-off-by: Vacha Shah <vachshah@amazon.com>

---------

Signed-off-by: Vacha Shah <vachshah@amazon.com>
dblock pushed a commit that referenced this pull request Oct 12, 2023
…661)

* Migrating from checkstyle to spotless for formatting (#648)

* Adding spotless for checking and fixing formatting and removing checkstyle

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Making build task depend on spotlessJavaCheck

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Removing resources and documentation related to checkstyle

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Running spotless for json, transport and util folders

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Running spotless for samples

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Removing commented code

Signed-off-by: Vacha Shah <vachshah@amazon.com>

---------

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Fixing merge conflicts and build

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Enabling spotless for all modules from PR 651

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Applying spotless to all the remaining files

Signed-off-by: Vacha Shah <vachshah@amazon.com>

---------

Signed-off-by: Vacha Shah <vachshah@amazon.com>
@BrendonFaleiro BrendonFaleiro mentioned this pull request Jun 21, 2024
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