Commit 840948c6 authored by Phillip Webb's avatar Phillip Webb

Polish

parent 3fb79194
...@@ -31,10 +31,13 @@ import org.springframework.core.type.AnnotatedTypeMetadata; ...@@ -31,10 +31,13 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
/** /**
* Condition that matches if any {@code spring.security.oauth2.client.registration} * Condition that matches if any {@code spring.security.oauth2.client.registration}
* properties are defined. * properties are defined.
*
* @author Madhura Bhave
* @since 2.1.0
*/ */
public class ClientsConfiguredCondition extends SpringBootCondition { public class ClientsConfiguredCondition extends SpringBootCondition {
private static final Bindable<Map<String, OAuth2ClientProperties.Registration>> BINDABLE_REGISTRATION = Bindable private static final Bindable<Map<String, OAuth2ClientProperties.Registration>> STRING_REGISTRATION_MAP = Bindable
.mapOf(String.class, OAuth2ClientProperties.Registration.class); .mapOf(String.class, OAuth2ClientProperties.Registration.class);
@Override @Override
...@@ -42,8 +45,8 @@ public class ClientsConfiguredCondition extends SpringBootCondition { ...@@ -42,8 +45,8 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
AnnotatedTypeMetadata metadata) { AnnotatedTypeMetadata metadata) {
ConditionMessage.Builder message = ConditionMessage ConditionMessage.Builder message = ConditionMessage
.forCondition("OAuth2 Clients Configured Condition"); .forCondition("OAuth2 Clients Configured Condition");
Map<String, OAuth2ClientProperties.Registration> registrations = this Map<String, OAuth2ClientProperties.Registration> registrations = getRegistrations(
.getRegistrations(context.getEnvironment()); context.getEnvironment());
if (!registrations.isEmpty()) { if (!registrations.isEmpty()) {
return ConditionOutcome.match(message return ConditionOutcome.match(message
.foundExactly("registered clients " + registrations.values().stream() .foundExactly("registered clients " + registrations.values().stream()
...@@ -55,9 +58,8 @@ public class ClientsConfiguredCondition extends SpringBootCondition { ...@@ -55,9 +58,8 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
private Map<String, OAuth2ClientProperties.Registration> getRegistrations( private Map<String, OAuth2ClientProperties.Registration> getRegistrations(
Environment environment) { Environment environment) {
return Binder.get(environment) return Binder.get(environment).bind("spring.security.oauth2.client.registration",
.bind("spring.security.oauth2.client.registration", BINDABLE_REGISTRATION) STRING_REGISTRATION_MAP).orElse(Collections.emptyMap());
.orElse(Collections.emptyMap());
} }
} }
...@@ -37,6 +37,7 @@ import org.springframework.util.StringUtils; ...@@ -37,6 +37,7 @@ import org.springframework.util.StringUtils;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Thiago Hirata * @author Thiago Hirata
* @since 2.1.0
*/ */
public final class OAuth2ClientPropertiesRegistrationAdapter { public final class OAuth2ClientPropertiesRegistrationAdapter {
......
...@@ -28,6 +28,7 @@ import org.springframework.security.oauth2.client.registration.ReactiveClientReg ...@@ -28,6 +28,7 @@ import org.springframework.security.oauth2.client.registration.ReactiveClientReg
* {@link ReactiveOAuth2AuthorizedClientService}. * {@link ReactiveOAuth2AuthorizedClientService}.
* *
* @author Madhura Bhave * @author Madhura Bhave
* @since 2.1.0
*/ */
@Configuration @Configuration
public class ReactiveOAuth2WebSecurityConfiguration { public class ReactiveOAuth2WebSecurityConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment