Skip to content

Commit f5fffe3

Browse files
dependabot[bot]rwinch
authored andcommitted
Bump org.springframework:spring-framework-bom from 7.0.1 to 7.0.2
Includes fixes for Breaking Changes in Spring Framework 7.0.2: - spring-projects/spring-framework#35916 - spring-projects/spring-framework#35947 Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v7.0.1...v7.0.2) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-version: 7.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent d5beb51 commit f5fffe3

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class ServerJwtDslTests {
275275
}
276276

277277
class NullConverter: Converter<Jwt, Mono<AbstractAuthenticationToken>> {
278-
override fun convert(source: Jwt): Mono<AbstractAuthenticationToken>? {
278+
override fun convert(source: Jwt): Mono<AbstractAuthenticationToken> {
279279
return Mono.empty()
280280
}
281281

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ org-jetbrains-kotlin = "2.2.21"
1212
org-jetbrains-kotlinx = "1.10.2"
1313
org-mockito = "5.17.0"
1414
org-opensaml5 = "5.1.6"
15-
org-springframework = "7.0.1"
15+
org-springframework = "7.0.2"
1616
com-password4j = "1.8.4"
1717

1818
[libraries]

webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,12 @@ private GenericHttpMessageConverterAdapter(GenericHttpMessageConverter<T> delega
174174
this.delegate = delegate;
175175
}
176176

177+
@Override
178+
public boolean canRead(ResolvableType type, @Nullable MediaType mediaType) {
179+
Class<?> clazz = type.resolve();
180+
return (clazz != null) ? canRead(clazz, mediaType) : canRead(mediaType);
181+
}
182+
177183
@Override
178184
public boolean canRead(Class<?> clazz, @Nullable MediaType mediaType) {
179185
return this.delegate.canRead(clazz, mediaType);
@@ -206,6 +212,11 @@ public T read(ResolvableType type, HttpInputMessage inputMessage, @Nullable Map<
206212
return this.delegate.read(type.getType(), null, inputMessage);
207213
}
208214

215+
@Override
216+
public boolean canWrite(ResolvableType targetType, Class<?> valueClass, @Nullable MediaType mediaType) {
217+
return this.delegate.canWrite(targetType.getType(), valueClass, mediaType);
218+
}
219+
209220
}
210221

211222
}

0 commit comments

Comments
 (0)