From 993e11dcd3b8940e50451bea28fb51b787a73520 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 7 Jan 2019 13:22:06 -0500 Subject: [PATCH] Polish gh-6127 --- ...rizedClientExchangeFilterFunctionTests.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java index 1f20a75cbb..eaa5613e54 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java @@ -89,7 +89,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { private ReactiveClientRegistrationRepository clientRegistrationRepository; @Mock - private OAuth2AuthorizedClientResolver oAuth2AuthorizedClientResolver; + private OAuth2AuthorizedClientResolver authorizedClientResolver; @Mock private ServerWebExchange serverWebExchange; @@ -155,7 +155,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { ClientRegistration registration = TestClientRegistrations.clientCredentials().build(); String clientRegistrationId = registration.getClientId(); - this.function = new ServerOAuth2AuthorizedClientExchangeFilterFunction(this.authorizedClientRepository, this.oAuth2AuthorizedClientResolver); + this.function = new ServerOAuth2AuthorizedClientExchangeFilterFunction(this.authorizedClientRepository, this.authorizedClientResolver); OAuth2AccessToken newAccessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "new-token", @@ -164,8 +164,8 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { OAuth2AuthorizedClient newAuthorizedClient = new OAuth2AuthorizedClient(registration, "principalName", newAccessToken, null); Request r = new Request(clientRegistrationId, authentication, null); - when(this.oAuth2AuthorizedClientResolver.clientCredentials(any(), any(), any())).thenReturn(Mono.just(newAuthorizedClient)); - when(this.oAuth2AuthorizedClientResolver.createDefaultedRequest(any(), any(), any())).thenReturn(Mono.just(r)); + when(this.authorizedClientResolver.clientCredentials(any(), any(), any())).thenReturn(Mono.just(newAuthorizedClient)); + when(this.authorizedClientResolver.createDefaultedRequest(any(), any(), any())).thenReturn(Mono.just(r)); when(this.authorizedClientRepository.saveAuthorizedClient(any(), any(), any())).thenReturn(Mono.empty()); @@ -190,8 +190,8 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { .block(); verify(this.authorizedClientRepository).saveAuthorizedClient(any(), eq(authentication), any()); - verify(this.oAuth2AuthorizedClientResolver).clientCredentials(any(), any(), any()); - verify(this.oAuth2AuthorizedClientResolver).createDefaultedRequest(any(), any(), any()); + verify(this.authorizedClientResolver).clientCredentials(any(), any(), any()); + verify(this.authorizedClientResolver).createDefaultedRequest(any(), any(), any()); List requests = this.exchange.getRequests(); assertThat(requests).hasSize(1); @@ -207,7 +207,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { TestingAuthenticationToken authentication = new TestingAuthenticationToken("test", "this"); ClientRegistration registration = TestClientRegistrations.clientCredentials().build(); - this.function = new ServerOAuth2AuthorizedClientExchangeFilterFunction(this.authorizedClientRepository, this.oAuth2AuthorizedClientResolver); + this.function = new ServerOAuth2AuthorizedClientExchangeFilterFunction(this.authorizedClientRepository, this.authorizedClientResolver); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(registration, "principalName", this.accessToken, null); @@ -219,8 +219,8 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)) .block(); - verify(this.oAuth2AuthorizedClientResolver, never()).clientCredentials(any(), any(), any()); - verify(this.oAuth2AuthorizedClientResolver, never()).createDefaultedRequest(any(), any(), any()); + verify(this.authorizedClientResolver, never()).clientCredentials(any(), any(), any()); + verify(this.authorizedClientResolver, never()).createDefaultedRequest(any(), any(), any()); List requests = this.exchange.getRequests(); assertThat(requests).hasSize(1);