Fix compile errors

Author: rwinch

login/src/main/java/livelessons/LoginApplication.java

@@ -20,12 +20,12 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.AuthenticatedPrincipalOAuth2AuthorizedClientRepository;
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
+import org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import static org.springframework.security.oauth2.client.web.reactive.function.client.OAuth2ExchangeFilterFunctions.oauth2ServletConfig;
-
 @SpringBootApplication
 public class LoginApplication {
 
@@ -34,9 +34,16 @@ public static void main(String[] args) {
 	}
 
 	@Bean
-	WebClient webClient(OAuth2AuthorizedClientRepository authorizedClientRepository) {
-		return WebClient.builder().apply(oauth2ServletConfig(authorizedClientRepository))
+	WebClient webClient(ClientRegistrationRepository clientRegistrationRepository,
+			OAuth2AuthorizedClientRepository authorizedClientRepository) {
+		// @formatter:off
+		ServletOAuth2AuthorizedClientExchangeFilterFunction oauth2Client =
+				new ServletOAuth2AuthorizedClientExchangeFilterFunction(clientRegistrationRepository,
+						authorizedClientRepository);
+		return WebClient.builder()
+				.apply(oauth2Client.oauth2Configuration())
 				.build();
+		// @formatter:on
 	}
 
 	@Bean

login/src/main/java/livelessons/SecurityConfig.java

@@ -9,8 +9,16 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
-		http.oauth2Login().and().authorizeRequests().anyRequest().authenticated().and()
-				.oauth2().client().authorizationCodeGrant();
+		// @formatter:off
+		http
+			.oauth2Login()
+				.and()
+			.authorizeRequests()
+				.anyRequest().authenticated()
+				.and()
+			.oauth2Client()
+				.authorizationCodeGrant();
+		// @formatter:on
 	}
 
 }

resource-server/src/main/java/livelessons/SecurityConfig.java

@@ -13,12 +13,16 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
+		// @formatter:off
 		http
-			.oauth2()
-				.resourceServer()
-					.jwt().jwkSetUri(this.jwkSetUril)
+			.oauth2ResourceServer()
+				.jwt()
+					.jwkSetUri(this.jwkSetUril)
 					.and()
+				.and()
 			.authorizeRequests()
 				.anyRequest().access("principal?.claims['email'] == '[email protected]'");
+		// @formatter:on
 	}
+
 }