From 0d79bd08a6716991d7be9acbbf7a5772f9d1226a Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Wed, 5 Aug 2020 15:01:44 -0700 Subject: [PATCH] Fix deprecations --- ...OAuth2ClientPropertiesRegistrationAdapterTests.java | 10 +++++----- .../servlet/OAuth2WebSecurityConfigurationTests.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java index 483f98c05a..a04c0838de 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java @@ -89,7 +89,7 @@ class OAuth2ClientPropertiesRegistrationAdapterTests { .isEqualTo(org.springframework.security.oauth2.core.ClientAuthenticationMethod.POST); assertThat(adapted.getAuthorizationGrantType()) .isEqualTo(org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo("https://example.com/redirect"); + assertThat(adapted.getRedirectUri()).isEqualTo("https://example.com/redirect"); assertThat(adapted.getScopes()).containsExactly("user"); assertThat(adapted.getClientName()).isEqualTo("clientName"); } @@ -119,7 +119,7 @@ class OAuth2ClientPropertiesRegistrationAdapterTests { .isEqualTo(org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC); assertThat(adapted.getAuthorizationGrantType()) .isEqualTo(org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo("{baseUrl}/{action}/oauth2/code/{registrationId}"); + assertThat(adapted.getRedirectUri()).isEqualTo("{baseUrl}/{action}/oauth2/code/{registrationId}"); assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email"); assertThat(adapted.getClientName()).isEqualTo("Google"); } @@ -149,7 +149,7 @@ class OAuth2ClientPropertiesRegistrationAdapterTests { .isEqualTo(org.springframework.security.oauth2.core.ClientAuthenticationMethod.POST); assertThat(adapted.getAuthorizationGrantType()) .isEqualTo(org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo("https://example.com/redirect"); + assertThat(adapted.getRedirectUri()).isEqualTo("https://example.com/redirect"); assertThat(adapted.getScopes()).containsExactly("user"); assertThat(adapted.getClientName()).isEqualTo("clientName"); } @@ -190,7 +190,7 @@ class OAuth2ClientPropertiesRegistrationAdapterTests { .isEqualTo(org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC); assertThat(adapted.getAuthorizationGrantType()) .isEqualTo(org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo("{baseUrl}/{action}/oauth2/code/{registrationId}"); + assertThat(adapted.getRedirectUri()).isEqualTo("{baseUrl}/{action}/oauth2/code/{registrationId}"); assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email"); assertThat(adapted.getClientName()).isEqualTo("Google"); } @@ -259,7 +259,7 @@ class OAuth2ClientPropertiesRegistrationAdapterTests { assertThat(adapted.getRegistrationId()).isEqualTo("okta"); assertThat(adapted.getClientName()).isEqualTo(issuer); assertThat(adapted.getScopes()).containsOnly("user"); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo("https://example.com/redirect"); + assertThat(adapted.getRedirectUri()).isEqualTo("https://example.com/redirect"); assertThat(providerDetails.getAuthorizationUri()).isEqualTo("https://example.com/auth"); assertThat(providerDetails.getTokenUri()).isEqualTo("https://example.com/token"); assertThat(providerDetails.getJwkSetUri()).isEqualTo("https://example.com/jwk"); 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 3ebb0ebc94..715b8e6b41 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 @@ -155,7 +155,7 @@ class OAuth2WebSecurityConfigurationTests { result = result && ObjectUtils.nullSafeEquals(reg1.getClientName(), reg2.getClientName()); result = result && ObjectUtils.nullSafeEquals(reg1.getClientSecret(), reg2.getClientSecret()); result = result && ObjectUtils.nullSafeEquals(reg1.getScopes(), reg2.getScopes()); - result = result && ObjectUtils.nullSafeEquals(reg1.getRedirectUriTemplate(), reg2.getRedirectUriTemplate()); + result = result && ObjectUtils.nullSafeEquals(reg1.getRedirectUri(), reg2.getRedirectUri()); result = result && ObjectUtils.nullSafeEquals(reg1.getRegistrationId(), reg2.getRegistrationId()); result = result && ObjectUtils.nullSafeEquals(reg1.getAuthorizationGrantType(), reg2.getAuthorizationGrantType());