Skip to content

Commit 9dea1c2

Browse files
committed
Update to Latest HttpRequestValues Contract
Issue gh-16858
1 parent c06b1f4 commit 9dea1c2

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.jspecify.annotations.Nullable;
2222

23+
import org.springframework.core.MethodParameter;
2324
import org.springframework.core.annotation.AnnotationUtils;
2425
import org.springframework.security.oauth2.client.annotation.ClientRegistrationId;
2526
import org.springframework.security.oauth2.client.web.ClientAttributes;
@@ -37,7 +38,7 @@ public final class ClientRegistrationIdProcessor implements HttpRequestValues.Pr
3738
public static ClientRegistrationIdProcessor DEFAULT_INSTANCE = new ClientRegistrationIdProcessor();
3839

3940
@Override
40-
public void process(Method method, @Nullable Object[] arguments, HttpRequestValues.Builder builder) {
41+
public void process(Method method, MethodParameter[] parameters, @Nullable Object[] arguments, HttpRequestValues.Builder builder) {
4142
ClientRegistrationId registeredId = AnnotationUtils.findAnnotation(method, ClientRegistrationId.class);
4243
if (registeredId != null) {
4344
String registrationId = registeredId.registrationId();

oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/client/ClientRegistrationIdProcessorTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ClientRegistrationIdProcessorTests {
4545
void processWhenClientRegistrationIdPresentThenSet() {
4646
HttpRequestValues.Builder builder = HttpRequestValues.builder();
4747
Method hasClientRegistrationId = ReflectionUtils.findMethod(RestService.class, "hasClientRegistrationId");
48-
this.processor.process(hasClientRegistrationId, null, builder);
48+
this.processor.process(hasClientRegistrationId, null, null, builder);
4949

5050
String registrationId = ClientAttributes.resolveClientRegistrationId(builder.build().getAttributes());
5151
assertThat(registrationId).isEqualTo(RestService.REGISTRATION_ID);
@@ -55,7 +55,7 @@ void processWhenClientRegistrationIdPresentThenSet() {
5555
void processWhenMetaClientRegistrationIdPresentThenSet() {
5656
HttpRequestValues.Builder builder = HttpRequestValues.builder();
5757
Method hasClientRegistrationId = ReflectionUtils.findMethod(RestService.class, "hasMetaClientRegistrationId");
58-
this.processor.process(hasClientRegistrationId, null, builder);
58+
this.processor.process(hasClientRegistrationId, null, null, builder);
5959

6060
String registrationId = ClientAttributes.resolveClientRegistrationId(builder.build().getAttributes());
6161
assertThat(registrationId).isEqualTo(RestService.REGISTRATION_ID);
@@ -65,7 +65,7 @@ void processWhenMetaClientRegistrationIdPresentThenSet() {
6565
void processWhenNoClientRegistrationIdPresentThenNull() {
6666
HttpRequestValues.Builder builder = HttpRequestValues.builder();
6767
Method hasClientRegistrationId = ReflectionUtils.findMethod(RestService.class, "noClientRegistrationId");
68-
this.processor.process(hasClientRegistrationId, null, builder);
68+
this.processor.process(hasClientRegistrationId, null, null, builder);
6969

7070
String registrationId = ClientAttributes.resolveClientRegistrationId(builder.build().getAttributes());
7171
assertThat(registrationId).isNull();

0 commit comments

Comments
 (0)