From 73e550a867048e0bad96ec58c2b7009a8812bf3f Mon Sep 17 00:00:00 2001
From: Joe Grandja <jgrandja@vmware.com>
Date: Tue, 4 Aug 2020 11:16:26 -0400
Subject: [PATCH] Polish gh-8906

---
 .../web/logout/OidcClientInitiatedLogoutSuccessHandler.java     | 2 +-
 .../logout/OidcClientInitiatedServerLogoutSuccessHandler.java   | 2 +-
 ...ClientReactiveAuthorizationCodeTokenResponseClientTests.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/logout/OidcClientInitiatedLogoutSuccessHandler.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/logout/OidcClientInitiatedLogoutSuccessHandler.java
index 54ff6b7737..2e329cfa8b 100644
--- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/logout/OidcClientInitiatedLogoutSuccessHandler.java
+++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/logout/OidcClientInitiatedLogoutSuccessHandler.java
@@ -132,7 +132,7 @@ public final class OidcClientInitiatedLogoutSuccessHandler extends SimpleUrlLogo
 	 * placeholder, for example:
 	 *
 	 * <pre>
-	 * 	handler.setPostLogoutRedirectUriTemplate("{baseUrl}");
+	 * 	handler.setPostLogoutRedirectUri("{baseUrl}");
 	 * </pre>
 	 *
 	 * will make so that {@code post_logout_redirect_uri} will be set to the base url for the client
diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java
index 7668fd9e0c..ce4a5dac77 100644
--- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java
+++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java
@@ -150,7 +150,7 @@ public class OidcClientInitiatedServerLogoutSuccessHandler
 	 * placeholder, for example:
 	 *
 	 * <pre>
-	 * 	handler.setPostLogoutRedirectUriTemplate("{baseUrl}");
+	 * 	handler.setPostLogoutRedirectUri("{baseUrl}");
 	 * </pre>
 	 *
 	 * will make so that {@code post_logout_redirect_uri} will be set to the base url for the client
diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java
index 7469885a95..64186e10cb 100644
--- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java
+++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java
@@ -112,7 +112,7 @@ public class WebClientReactiveAuthorizationCodeTokenResponseClientTests {
 //		this.exception.expect(IllegalArgumentException.class);
 //
 //		String redirectUri = "http:\\example.com";
-//		when(this.clientRegistration.getRedirectUriTemplate()).thenReturn(redirectUri);
+//		when(this.clientRegistration.getRedirectUri()).thenReturn(redirectUri);
 //
 //		this.tokenResponseClient.getTokenResponse(
 //				new OAuth2AuthorizationCodeGrantRequest(this.clientRegistration, this.authorizationExchange));