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

Fix javadoc for migration from WebSecurityConfigurerAdapter #12996

Merged
merged 1 commit into from Apr 24, 2023

Conversation

xak2000
Copy link
Contributor

@xak2000 xak2000 commented Apr 11, 2023

This PR just fixes the code sample in javadocs that errorneously uses WebSecurity parameter in a bean-creation method that doesn't need to have any parameters, as WebSecurity parameter is already provided in WebSecurityCustomizer.customize(WebSecurity web) functional method. Moreover, the sample doesn't even compile because of parameter names collision (the bean factory paramter and lambda parameter).

This fix could also be backported to 5.7.x branch.

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Apr 11, 2023
@jzheaux jzheaux self-assigned this Apr 18, 2023
@jzheaux jzheaux added in: docs An issue in Documentation or samples type: bug A general bug and removed status: waiting-for-triage An issue we've not yet triaged labels Apr 18, 2023
@jzheaux
Copy link
Contributor

jzheaux commented Apr 18, 2023

@xak2000, thanks for the PR. We've recently changed to use forward porting. To that end, will you please rebase this PR to 5.7.x and then upon merging, I'll forward port to 5.8.x, 6.0.x, and main?

@jzheaux jzheaux added this to the 5.7.x milestone Apr 18, 2023
@xak2000 xak2000 changed the base branch from 5.8.x to 5.7.x April 18, 2023 17:47
@xak2000
Copy link
Contributor Author

xak2000 commented Apr 18, 2023

@jzheaux Rebased the PR to 5.7.x and changed target branch to 5.7.x. Should I also rebase on the fresh 5.7.x version or it's good in the current state?

@jzheaux jzheaux modified the milestones: 5.7.x, 5.7.9 Apr 24, 2023
@jzheaux jzheaux merged commit caa4093 into spring-projects:5.7.x Apr 24, 2023
2 checks passed
@jzheaux
Copy link
Contributor

jzheaux commented Apr 24, 2023

Thanks for checking, @xak2000. No need to do a fresh rebase. This is now merged to 5.7.x as well as 5.8.x. In the end, I didn't need to forward-port to 6.0.x or main as I had though, since WebSecurityConfigurerAdapter is removed in those versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in: docs An issue in Documentation or samples type: bug A general bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants