Remove internal Optional usage in favor of null checks #7295
Conversation
…ster' of https://github.com/watsta/spring-security into spring-projectsgh-7155-remove-optional-usage # Conflicts: # oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java
spring-projects-issues
added
the
status: waiting-for-triage
| .map(configurationMetadata -> configurationMetadata.get("end_session_endpoint")) | ||
| .map(Object::toString) | ||
| .map(URI::create); | ||
| ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId(registrationId); |
There was a problem hiding this comment.
clientRegistration may be null. Please add a null check here.
There was a problem hiding this comment.
Fixed in 6a4425c
| @@ -67,7 +67,6 @@ | |||
| import java.util.HashSet; | |||
| import java.util.List; | |||
| import java.util.Map; | |||
| import java.util.Optional; | |||
There was a problem hiding this comment.
There is no need to change this file since it is a test. Please revert this change.
There was a problem hiding this comment.
Reverted in f6f4378
| if (this.accessTokenResponseClient != null) { | ||
| authorizedClientProviderBuilder.clientCredentials(configurer -> | ||
| configurer.accessTokenResponseClient(this.accessTokenResponseClient)); | ||
| } |
There was a problem hiding this comment.
This code changes the existing functionality. If accessTokenResponseClient is null, clientCredentials should still be enabled. Please add an else statement containing authorizedClientProviderBuilder.clientCredentials() to ensure clientCredentials is enabled by default.
There was a problem hiding this comment.
Updated in 3fef167
|
Hi @eleftherias, Thank you for the comments! I updated the PR with the requested changes. |
|
Thanks for the PR @watsta! This is now merged into master. |
rwinch
added
type: task
Fixes gh-7155
I did not modify public APIs, tests, examples and samples. Optional usage in the codebase after this PR:
Note that Optional is still used in
org.springframework.security.oauth2.client.web.reactive.function.client.OAuth2AuthorizedClientResolverorg.springframework.security.oauth2.client.web.reactive.result.method.annotation.OAuth2AuthorizedClientResolverAs I couldn't think of a nice way to resolve it.