Polish ref-doc

Issue gh-1205

Author: Steve Riesenberg

docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java

@@ -33,7 +33,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -54,6 +54,7 @@
 import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher;
 
 @Configuration(proxyBeanMethods = false)
+@EnableWebSecurity
 public class EnableUserInfoSecurityConfig {
 
 	@Bean // <1>
@@ -64,7 +65,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
 			.oidc(Customizer.withDefaults());	// Enable OpenID Connect 1.0
 		// @formatter:off
 		http
-			.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt) // <2>
+			.oauth2ResourceServer((oauth2) -> oauth2.jwt(Customizer.withDefaults())) // <2>
 			.exceptionHandling((exceptions) -> exceptions
 				.defaultAuthenticationEntryPointFor(
 					new LoginUrlAuthenticationEntryPoint("/login"),

docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java

@@ -34,7 +34,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -60,6 +60,7 @@
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
 @Configuration(proxyBeanMethods = false)
+@EnableWebSecurity
 public class JwtUserInfoMapperSecurityConfig {
 
 	@Bean // <1>
@@ -90,7 +91,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
 				.anyRequest().authenticated()
 			)
 			.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
-			.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt) // <4>
+			.oauth2ResourceServer(resourceServer -> resourceServer
+				.jwt(Customizer.withDefaults()) // <4>
+			)
 			.exceptionHandling((exceptions) -> exceptions
 				.defaultAuthenticationEntryPointFor(
 					new LoginUrlAuthenticationEntryPoint("/login"),

docs/src/docs/asciidoc/examples/src/test/java/sample/jpa/JpaTests.java

@@ -43,7 +43,6 @@
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 import org.springframework.security.oauth2.core.oidc.endpoint.OidcParameterNames;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
@@ -209,7 +208,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
 						new MediaTypeRequestMatcher(MediaType.TEXT_HTML)
 					)
 				)
-				.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt);
+				.oauth2ResourceServer((resourceServer) -> resourceServer
+					.jwt(Customizer.withDefaults())
+				);
 			// @formatter:on
 			return http.build();
 		}

docs/src/docs/asciidoc/guides/how-to-userinfo.adoc

@@ -22,7 +22,7 @@ The following listing shows how to enable the {spring-security-reference-base-ur
 [[sample.userinfo]]
 include::code:EnableUserInfoSecurityConfig[]
 
-TIP: Click on the "Expanded folded text" icon in the code sample above to display the full example.
+TIP: Click on the "Expand folded text" icon in the code sample above to display the full example.
 
 This configuration provides the following:
 

docs/src/docs/asciidoc/protocol-endpoints.adoc

@@ -557,7 +557,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
 
 	...
 
-	http.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt);
+	http.oauth2ResourceServer(resourceServer -> resourceServer.jwt(Customizer.withDefaults()));
 
 	return http.build();
 }
@@ -650,7 +650,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
 
 	...
 
-	http.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt);
+	http.oauth2ResourceServer(resourceServer -> resourceServer.jwt(Customizer.withDefaults()));
 
 	return http.build();
 }