diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessor.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessor.java index ec6f6bedac..edecc19f09 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessor.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessor.java @@ -20,6 +20,7 @@ import java.lang.reflect.Method; import org.jspecify.annotations.Nullable; +import org.springframework.core.MethodParameter; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.security.oauth2.client.annotation.ClientRegistrationId; import org.springframework.security.oauth2.client.web.ClientAttributes; @@ -37,7 +38,7 @@ public final class ClientRegistrationIdProcessor implements HttpRequestValues.Pr public static ClientRegistrationIdProcessor DEFAULT_INSTANCE = new ClientRegistrationIdProcessor(); @Override - public void process(Method method, @Nullable Object[] arguments, HttpRequestValues.Builder builder) { + public void process(Method method, MethodParameter[] parameters, @Nullable Object[] arguments, HttpRequestValues.Builder builder) { ClientRegistrationId registeredId = AnnotationUtils.findAnnotation(method, ClientRegistrationId.class); if (registeredId != null) { String registrationId = registeredId.registrationId(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessorTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessorTests.java index 19ea292665..6e58287e41 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessorTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessorTests.java @@ -45,7 +45,7 @@ class ClientRegistrationIdProcessorTests { void processWhenClientRegistrationIdPresentThenSet() { HttpRequestValues.Builder builder = HttpRequestValues.builder(); Method hasClientRegistrationId = ReflectionUtils.findMethod(RestService.class, "hasClientRegistrationId"); - this.processor.process(hasClientRegistrationId, null, builder); + this.processor.process(hasClientRegistrationId, null, null, builder); String registrationId = ClientAttributes.resolveClientRegistrationId(builder.build().getAttributes()); assertThat(registrationId).isEqualTo(RestService.REGISTRATION_ID); @@ -55,7 +55,7 @@ class ClientRegistrationIdProcessorTests { void processWhenMetaClientRegistrationIdPresentThenSet() { HttpRequestValues.Builder builder = HttpRequestValues.builder(); Method hasClientRegistrationId = ReflectionUtils.findMethod(RestService.class, "hasMetaClientRegistrationId"); - this.processor.process(hasClientRegistrationId, null, builder); + this.processor.process(hasClientRegistrationId, null, null, builder); String registrationId = ClientAttributes.resolveClientRegistrationId(builder.build().getAttributes()); assertThat(registrationId).isEqualTo(RestService.REGISTRATION_ID); @@ -65,7 +65,7 @@ class ClientRegistrationIdProcessorTests { void processWhenNoClientRegistrationIdPresentThenNull() { HttpRequestValues.Builder builder = HttpRequestValues.builder(); Method hasClientRegistrationId = ReflectionUtils.findMethod(RestService.class, "noClientRegistrationId"); - this.processor.process(hasClientRegistrationId, null, builder); + this.processor.process(hasClientRegistrationId, null, null, builder); String registrationId = ClientAttributes.resolveClientRegistrationId(builder.build().getAttributes()); assertThat(registrationId).isNull();