From f0ef47dfadb36e82f0ddac4c012cc2056bb84439 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Wed, 5 Aug 2020 15:09:51 -0700 Subject: [PATCH] Fix additional deprecations --- .../client/OAuth2ClientPropertiesRegistrationAdapter.java | 2 +- .../reactive/ReactiveOAuth2ClientAutoConfigurationTests.java | 2 +- .../client/servlet/OAuth2WebSecurityConfigurationTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java index 8f3acf16407..d1b97776759 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java +++ b/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 { .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(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java index 8898e3c97bb..688f0ed9f9e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java +++ b/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 { .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(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java index 715b8e6b41f..c53caf1ccc0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java +++ b/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 { .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();