Skip to content

Commit c2cfeb0

Browse files
committed
Merge branch '3.3.x' into 3.4.x
Closes gh-45325
2 parents 1174ece + ee0beed commit c2cfeb0

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public Jwt getJwt() {
4747
return this.jwt;
4848
}
4949

50-
private final Opaquetoken opaqueToken = new Opaquetoken();
50+
private final Opaquetoken opaquetoken = new Opaquetoken();
5151

5252
public Opaquetoken getOpaquetoken() {
53-
return this.opaqueToken;
53+
return this.opaquetoken;
5454
}
5555

5656
public static class Jwt {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerOpaqueTokenConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ static class OpaqueTokenIntrospectionClientConfiguration {
4545
@Bean
4646
@ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.opaquetoken.introspection-uri")
4747
SpringReactiveOpaqueTokenIntrospector opaqueTokenIntrospector(OAuth2ResourceServerProperties properties) {
48-
OAuth2ResourceServerProperties.Opaquetoken opaqueToken = properties.getOpaquetoken();
49-
return new SpringReactiveOpaqueTokenIntrospector(opaqueToken.getIntrospectionUri(),
50-
opaqueToken.getClientId(), opaqueToken.getClientSecret());
48+
OAuth2ResourceServerProperties.Opaquetoken opaquetoken = properties.getOpaquetoken();
49+
return new SpringReactiveOpaqueTokenIntrospector(opaquetoken.getIntrospectionUri(),
50+
opaquetoken.getClientId(), opaquetoken.getClientSecret());
5151
}
5252

5353
}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ static class OpaqueTokenIntrospectionClientConfiguration {
4747
@Bean
4848
@ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.opaquetoken.introspection-uri")
4949
SpringOpaqueTokenIntrospector opaqueTokenIntrospector(OAuth2ResourceServerProperties properties) {
50-
OAuth2ResourceServerProperties.Opaquetoken opaqueToken = properties.getOpaquetoken();
51-
return new SpringOpaqueTokenIntrospector(opaqueToken.getIntrospectionUri(), opaqueToken.getClientId(),
52-
opaqueToken.getClientSecret());
50+
OAuth2ResourceServerProperties.Opaquetoken opaquetoken = properties.getOpaquetoken();
51+
return new SpringOpaqueTokenIntrospector(opaquetoken.getIntrospectionUri(), opaquetoken.getClientId(),
52+
opaquetoken.getClientSecret());
5353
}
5454

5555
}

0 commit comments

Comments
 (0)