Polish ReactiveOidcIdTokenDecoderFactory WebClient Support

- Changed to #setWebClientFactory to align with other methods
- Updated Copyright
- Added @SInCE attribute

Issue spring-projectsgh-13274

Author: jzheaux

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ public final class ReactiveOidcIdTokenDecoderFactory implements ReactiveJwtDecod
 	private Function<ClientRegistration, Converter<Map<String, Object>, Map<String, Object>>> claimTypeConverterFactory = (
 			clientRegistration) -> DEFAULT_CLAIM_TYPE_CONVERTER;
 
-	private Function<ClientRegistration, WebClient> webClientResolver = (clientRegistration) -> WebClient.create();
+	private Function<ClientRegistration, WebClient> webClientFactory = (clientRegistration) -> WebClient.create();
 
 	/**
 	 * Returns the default {@link Converter}'s used for type conversion of claim values
@@ -168,7 +168,7 @@ private NimbusReactiveJwtDecoder buildDecoder(ClientRegistration clientRegistrat
 				throw new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString());
 			}
 			return NimbusReactiveJwtDecoder.withJwkSetUri(jwkSetUri).jwsAlgorithm((SignatureAlgorithm) jwsAlgorithm)
-					.webClient(this.webClientResolver.apply(clientRegistration)).build();
+					.webClient(this.webClientFactory.apply(clientRegistration)).build();
 		}
 		if (jwsAlgorithm != null && MacAlgorithm.class.isAssignableFrom(jwsAlgorithm.getClass())) {
 			// https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
@@ -248,12 +248,13 @@ public void setClaimTypeConverterFactory(
 	 * {@link NimbusReactiveJwtDecoder}. The default resolver provides {@link WebClient}
 	 * that is created by {@code WebClient.create()}. This is optional method if we need
 	 * to set custom web client in {@link NimbusReactiveJwtDecoder}.
-	 * @param webClientResolver a function that will provide {@link WebClient} for a
+	 * @param webClientFactory a function that will provide {@link WebClient} for a
 	 * {@link ClientRegistration}
+	 * @since 6.3
 	 */
-	public void setWebClientResolver(Function<ClientRegistration, WebClient> webClientResolver) {
-		Assert.notNull(webClientResolver, "webClientResolver cannot be null");
-		this.webClientResolver = webClientResolver;
+	public void setWebClientFactory(Function<ClientRegistration, WebClient> webClientFactory) {
+		Assert.notNull(webClientFactory, "webClientFactory cannot be null");
+		this.webClientFactory = webClientFactory;
 	}
 
 }

oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,8 +97,8 @@ public void setClaimTypeConverterFactoryWhenNullThenThrowIllegalArgumentExceptio
 	}
 
 	@Test
-	public void setWebClientResolverWhenNullThenThrowIllegalArgumentException() {
-		assertThatIllegalArgumentException().isThrownBy(() -> this.idTokenDecoderFactory.setWebClientResolver(null));
+	public void setWebClientFactoryWhenNullThenThrowIllegalArgumentException() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.idTokenDecoderFactory.setWebClientFactory(null));
 	}
 
 	@Test
@@ -188,7 +188,7 @@ public void createDecoderWhenCustomClaimTypeConverterFactorySetThenApplied() {
 	public void createDecoderWhenCustomWebClientResolverSetThenApplied() {
 		WebClient webClient = mock(WebClient.class);
 		Function<ClientRegistration, WebClient> customWebClientResolver = mock(Function.class);
-		this.idTokenDecoderFactory.setWebClientResolver(customWebClientResolver);
+		this.idTokenDecoderFactory.setWebClientFactory(customWebClientResolver);
 		ClientRegistration clientRegistration = this.registration.build();
 		given(customWebClientResolver.apply(clientRegistration)).willReturn(webClient);
 		this.idTokenDecoderFactory.createDecoder(clientRegistration);