From 718b0991ec95b950a2cd48cf0aea250400919b4a Mon Sep 17 00:00:00 2001
From: Vishal Raj <vishalraj1802@gmail.com>
Date: Sat, 25 May 2019 23:04:00 +0530
Subject: [PATCH] Updates OAuth2ResourceServer configuration tests

Refactores collapsed imports
---
 .../OAuth2ResourceServerConfigurerTests.java         | 12 +++++-------
 .../web/server/OAuth2ResourceServerSpecTests.java    | 11 ++++-------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java
index dcedddf93f6..e44c6a83bb9 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java
@@ -27,7 +27,6 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.util.Base64;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -1484,12 +1483,11 @@ protected void configure(HttpSecurity http) throws Exception {
 		}
 
 		Converter<Jwt, AbstractAuthenticationToken> getJwtAuthenticationConverter() {
-			return new JwtAuthenticationConverter() {
-				@Override
-				protected Collection<GrantedAuthority> extractAuthorities(Jwt jwt) {
-					return Collections.singletonList(new SimpleGrantedAuthority("message:read"));
-				}
-			};
+			JwtAuthenticationConverter converter = new JwtAuthenticationConverter();
+			converter.setJwtGrantedAuthoritiesConverter(jwt ->
+					Collections.singletonList(new SimpleGrantedAuthority("message:read"))
+			);
+			return converter;
 		}
 	}
 
diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java
index 5edd88a0053..01de7e8dead 100644
--- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java
+++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java
@@ -25,7 +25,6 @@
 import java.security.spec.RSAPublicKeySpec;
 import java.time.Instant;
 import java.util.Base64;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -56,7 +55,6 @@
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.test.SpringTestRule;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.core.OAuth2Error;
@@ -556,13 +554,12 @@ SecurityWebFilterChain springSecurity(ServerHttpSecurity http) throws Exception
 
 		@Bean
 		Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() {
-			JwtAuthenticationConverter converter = new JwtAuthenticationConverter() {
-				@Override
-				protected Collection<GrantedAuthority> extractAuthorities(Jwt jwt) {
+
+			JwtAuthenticationConverter converter = new JwtAuthenticationConverter();
+			converter.setJwtGrantedAuthoritiesConverter(jwt -> {
 					String[] claims = ((String) jwt.getClaims().get("scope")).split(" ");
 					return Stream.of(claims).map(SimpleGrantedAuthority::new).collect(Collectors.toList());
-				}
-			};
+				});
 
 			return new ReactiveJwtAuthenticationConverterAdapter(converter);
 		}