Fix additional deprecations

pull/22760/head
Madhura Bhave 4 years ago
parent 0d79bd08a6
commit f0ef47dfad

@ -67,7 +67,7 @@ public final class OAuth2ClientPropertiesRegistrationAdapter {
.to(builder::clientAuthenticationMethod); .to(builder::clientAuthenticationMethod);
map.from(properties::getAuthorizationGrantType).as(AuthorizationGrantType::new) map.from(properties::getAuthorizationGrantType).as(AuthorizationGrantType::new)
.to(builder::authorizationGrantType); .to(builder::authorizationGrantType);
map.from(properties::getRedirectUri).to(builder::redirectUriTemplate); map.from(properties::getRedirectUri).to(builder::redirectUri);
map.from(properties::getScope).as(StringUtils::toStringArray).to(builder::scope); map.from(properties::getScope).as(StringUtils::toStringArray).to(builder::scope);
map.from(properties::getClientName).to(builder::clientName); map.from(properties::getClientName).to(builder::clientName);
return builder.build(); return builder.build();

@ -207,7 +207,7 @@ class ReactiveOAuth2ClientAutoConfigurationTests {
.clientAuthenticationMethod( .clientAuthenticationMethod(
org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC) org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC)
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE).scope("read") .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE).scope("read")
.clientSecret("secret").redirectUriTemplate("https://redirect-uri.com") .clientSecret("secret").redirectUri("https://redirect-uri.com")
.authorizationUri("https://authorization-uri.com").tokenUri("https://token-uri.com") .authorizationUri("https://authorization-uri.com").tokenUri("https://token-uri.com")
.userInfoUri(userInfoUri).userNameAttributeName("login"); .userInfoUri(userInfoUri).userNameAttributeName("login");
return builder.build(); return builder.build();

@ -197,7 +197,7 @@ class OAuth2WebSecurityConfigurationTests {
.clientAuthenticationMethod( .clientAuthenticationMethod(
org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC) org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC)
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE).scope("read") .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE).scope("read")
.clientSecret("secret").redirectUriTemplate("https://redirect-uri.com") .clientSecret("secret").redirectUri("https://redirect-uri.com")
.authorizationUri("https://authorization-uri.com").tokenUri("https://token-uri.com") .authorizationUri("https://authorization-uri.com").tokenUri("https://token-uri.com")
.userInfoUri(userInfoUri).userNameAttributeName("login"); .userInfoUri(userInfoUri).userNameAttributeName("login");
return builder.build(); return builder.build();

Loading…
Cancel
Save