Merge branch '6.1.x'

This commit is contained in:
Sébastien Deleuze
2024-03-26 15:41:46 +01:00
88 changed files with 172 additions and 72 deletions

View File

@@ -337,6 +337,7 @@ class DefaultServerRequest implements ServerRequest {
}
@Override
@Nullable
public InetSocketAddress host() {
return this.httpHeaders.getHost();
}

View File

@@ -80,6 +80,7 @@ public class ServerWebExchangeMethodArgumentResolver extends HandlerMethodArgume
}
@Override
@Nullable
public Object resolveArgumentValue(
MethodParameter methodParameter, BindingContext context, ServerWebExchange exchange) {

View File

@@ -19,6 +19,7 @@ package org.springframework.web.reactive.socket.server.support;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.lang.Nullable;
/**
* {@link RuntimeHintsRegistrar} implementation that registers reflection hints related to
@@ -30,7 +31,7 @@ import org.springframework.aot.hint.RuntimeHintsRegistrar;
class HandshakeWebSocketServiceRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
hints.reflection().registerType(HandshakeWebSocketService.initUpgradeStrategy().getClass(),
MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
}