Skip to content

Commit fd50731

Browse files
committed
Upgrade to Spring Security 7.0.0-M2
Closes gh-1281
1 parent 84d90b7 commit fd50731

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

platform/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
api(platform("io.micrometer:micrometer-bom:1.16.0-M2"))
1515
api(platform("io.micrometer:micrometer-tracing-bom:1.6.0-M2"))
1616
api(platform("org.springframework.data:spring-data-bom:2025.1.0-M5"))
17-
api(platform("org.springframework.security:spring-security-bom:7.0.0-M1"))
17+
api(platform("org.springframework.security:spring-security-bom:7.0.0-M2"))
1818
api(platform("com.querydsl:querydsl-bom:5.1.0"))
1919
api(platform("io.rsocket:rsocket-bom:1.1.5"))
2020
api(platform("org.jetbrains.kotlin:kotlin-bom:${kotlinVersion}"))

spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AuthenticationPrincipalArgumentResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private Mono<Authentication> getCurrentAuthentication(MethodParameter parameter)
112112
return (value instanceof Authentication auth) ? Mono.just(auth) : (Mono<Authentication>) value;
113113
}
114114

115-
private @Nullable Object resolvePrincipal(MethodParameter parameter, Object principal) {
115+
private @Nullable Object resolvePrincipal(MethodParameter parameter, @Nullable Object principal) {
116116
AuthenticationPrincipal annotation = findMethodAnnotation(parameter);
117117
if (annotation != null && StringUtils.hasLength(annotation.expression())) {
118118
StandardEvaluationContext context = new StandardEvaluationContext();

spring-graphql/src/main/java/org/springframework/graphql/execution/SecurityExceptionResolverUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ static GraphQLError resolveUnauthorized(DataFetchingEnvironment environment) {
4141
.build();
4242
}
4343

44+
@SuppressWarnings("NullAway") // until https://github.com/spring-projects/spring-security/issues/17764
4445
static GraphQLError resolveAccessDenied(
4546
DataFetchingEnvironment env, AuthenticationTrustResolver resolver, SecurityContext securityContext) {
4647

0 commit comments

Comments
 (0)