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

Forbid wildcard imports #1180

Merged
merged 5 commits into from
Sep 4, 2024

Conversation

Xtansia
Copy link
Collaborator

@Xtansia Xtansia commented Sep 3, 2024

Description

Needs to be implemented as an throwing custom step as Spotless doesn't have built in support to remove/deny wildcards: diffplug/spotless#649

Example failure:
Screenshot 2024-09-04 at 3 41 04 PM

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.

Needs to be implemented as an throwing custom step as Spotless doesn't have built in support to remove/deny wildcards: diffplug/spotless#649

Signed-off-by: Thomas Farr <[email protected]>
dblock
dblock previously approved these changes Sep 3, 2024
@dblock
Copy link
Member

dblock commented Sep 3, 2024

Signed-off-by: Thomas Farr <[email protected]>
Signed-off-by: Thomas Farr <[email protected]>
@Xtansia Xtansia force-pushed the fix/forbid-wildcard-import branch from e07fafe to d011749 Compare September 4, 2024 03:36
Signed-off-by: Thomas Farr <[email protected]>
@Xtansia Xtansia marked this pull request as ready for review September 4, 2024 03:41
@Xtansia Xtansia requested a review from dblock September 4, 2024 04:57
@dblock dblock added the backport 2.x Backport to 2.x branch label Sep 4, 2024
@dblock dblock merged commit e856ecb into opensearch-project:main Sep 4, 2024
64 checks passed
@Xtansia Xtansia deleted the fix/forbid-wildcard-import branch September 4, 2024 21:00
@Xtansia Xtansia added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Sep 4, 2024
@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:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1180-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e856ecb4657eb40e40b5e6f6d658bb1f4b646012
# Push it to GitHub
git push --set-upstream origin backport/backport-1180-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

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

Xtansia added a commit to Xtansia/opensearch-java that referenced this pull request Sep 4, 2024
* Forbid wildcard imports

Needs to be implemented as an throwing custom step as Spotless doesn't have built in support to remove/deny wildcards: diffplug/spotless#649

Signed-off-by: Thomas Farr <[email protected]>

* Make conventions plugin

Signed-off-by: Thomas Farr <[email protected]>

* Fix wildcard imports

Signed-off-by: Thomas Farr <[email protected]>

* Allow overriding eclipse formatter config file

Signed-off-by: Thomas Farr <[email protected]>

* Fix message formatting

Signed-off-by: Thomas Farr <[email protected]>

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit e856ecb)
reta pushed a commit that referenced this pull request Sep 5, 2024
* Forbid wildcard imports

Needs to be implemented as an throwing custom step as Spotless doesn't have built in support to remove/deny wildcards: diffplug/spotless#649

Signed-off-by: Thomas Farr <[email protected]>

* Make conventions plugin

Signed-off-by: Thomas Farr <[email protected]>

* Fix wildcard imports

Signed-off-by: Thomas Farr <[email protected]>

* Allow overriding eclipse formatter config file

Signed-off-by: Thomas Farr <[email protected]>

* Fix message formatting

Signed-off-by: Thomas Farr <[email protected]>

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit e856ecb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants