Browse Source

Fix additional deprecations

pull/22760/head
Madhura Bhave 6 years ago
parent
commit
f0ef47dfad
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java
  2. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java
  3. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java

@ -67,7 +67,7 @@ public final class OAuth2ClientPropertiesRegistrationAdapter { @@ -67,7 +67,7 @@ public final class OAuth2ClientPropertiesRegistrationAdapter {
.to(builder::clientAuthenticationMethod);
map.from(properties::getAuthorizationGrantType).as(AuthorizationGrantType::new)
.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::getClientName).to(builder::clientName);
return builder.build();

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java

@ -207,7 +207,7 @@ class ReactiveOAuth2ClientAutoConfigurationTests { @@ -207,7 +207,7 @@ class ReactiveOAuth2ClientAutoConfigurationTests {
.clientAuthenticationMethod(
org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC)
.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")
.userInfoUri(userInfoUri).userNameAttributeName("login");
return builder.build();

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java

@ -197,7 +197,7 @@ class OAuth2WebSecurityConfigurationTests { @@ -197,7 +197,7 @@ class OAuth2WebSecurityConfigurationTests {
.clientAuthenticationMethod(
org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC)
.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")
.userInfoUri(userInfoUri).userNameAttributeName("login");
return builder.build();

Loading…
Cancel
Save