Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine null-safety in the spring-web module

Browse Source 
Closes gh-34162
This commit is contained in:
Sébastien Deleuze
2024-12-26 18:50:17 +01:00
parent a442c180f1
commit 5fba926ab6
23 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/client/AbstractStreamingClientHttpRequest.java
View File

@@ -62,7 +62,7 @@ abstract class AbstractStreamingClientHttpRequest extends AbstractClientHttpRequ
}
@Override
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Lambda
protected final ClientHttpResponse executeInternal(HttpHeaders headers) throws IOException {
if (this.body == null && this.bodyStream != null) {
this.body = outputStream -> this.bodyStream.writeTo(outputStream);

4
spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequest.java
View File

@@ -94,7 +94,6 @@ class JdkClientHttpRequest extends AbstractStreamingClientHttpRequest {
@Override
@SuppressWarnings("NullAway")
protected ClientHttpResponse executeInternal(HttpHeaders headers, @Nullable Body body) throws IOException {
CompletableFuture<HttpResponse<InputStream>> responseFuture = null;
try {
@@ -133,7 +132,8 @@ class JdkClientHttpRequest extends AbstractStreamingClientHttpRequest {
throw ioEx;
}
else {
throw new IOException(cause.getMessage(), cause);
String message = (cause == null ? null : cause.getMessage());
throw (message == null ? new IOException(cause) : new IOException(message, cause));
}
}
}

4
spring-web/src/main/java/org/springframework/http/client/JettyClientHttpRequest.java
View File

@@ -69,7 +69,6 @@ class JettyClientHttpRequest extends AbstractStreamingClientHttpRequest {
}
@Override
@SuppressWarnings("NullAway")
protected ClientHttpResponse executeInternal(HttpHeaders headers, @Nullable Body body) throws IOException {
if (!headers.isEmpty()) {
this.request.headers(httpFields -> {
@@ -118,7 +117,8 @@ class JettyClientHttpRequest extends AbstractStreamingClientHttpRequest {
throw ioEx;
}
else {
throw new IOException(cause.getMessage(), cause);
String message = (cause == null ? null : cause.getMessage());
throw (message == null ? new IOException(cause) : new IOException(message, cause));
}
}
catch (TimeoutException ex) {

2
spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
View File

@@ -135,7 +135,7 @@ public class ServerSentEventHttpMessageReader implements HttpMessageReader<Objec
});
}
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
private @Nullable Object buildEvent(List<String> lines, ResolvableType valueType, boolean shouldWrap,
Map<String, Object> hints) {

3
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
View File

@@ -49,7 +49,6 @@ import org.springframework.http.HttpHeaders;
* @author Arjen Poutsma
* @since 5.3
*/
@SuppressWarnings("NullAway")
final class MultipartParser extends BaseSubscriber<DataBuffer> {
private static final byte CR = '\r';
@@ -117,12 +116,14 @@ final class MultipartParser extends BaseSubscriber<DataBuffer> {
}
@Override
@SuppressWarnings("NullAway") // Dataflow analysis limitation
protected void hookOnNext(DataBuffer value) {
this.requestOutstanding.set(false);
this.state.get().onNext(value);
}
@Override
@SuppressWarnings("NullAway") // Dataflow analysis limitation
protected void hookOnComplete() {
this.state.get().onComplete();
}

2
spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
View File

@@ -57,7 +57,7 @@ import org.springframework.util.FastByteArrayOutputStream;
* @author Arjen Poutsma
* @since 5.3
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
final class PartGenerator extends BaseSubscriber<MultipartParser.Token> {
private static final Log logger = LogFactory.getLog(PartGenerator.class);

2
spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
View File

@@ -189,7 +189,7 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa
}
}
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Not null assertion performed in StreamUtils#copyRange
private void writeResourceRegionCollection(Collection<ResourceRegion> resourceRegions,
HttpOutputMessage outputMessage) throws IOException {

2
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
View File

@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
* @since 5.0
* @param <T> the type of element signaled
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
/**

2
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java
View File

@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
* @since 5.0
* @param <T> the type of element signaled to the {@link Subscriber}
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
public abstract class AbstractListenerWriteFlushProcessor<T> implements Processor<Publisher<? extends T>, Void> {
/**

2
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
View File

@@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
* @since 5.0
* @param <T> the type of element signaled to the {@link Subscriber}
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
public abstract class AbstractListenerWriteProcessor<T> implements Processor<T, Void> {
/**

2
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
View File

@@ -159,7 +159,7 @@ class ServletServerHttpRequest extends AbstractServerHttpRequest {
}
}
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
private static HttpHeaders initHeaders(HttpHeaders headerValues, HttpServletRequest request) {
HttpHeaders headers = null;

2
spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java
View File

@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
* @author Rossen Stoyanchev
* @since 5.0
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
class WriteResultPublisher implements Publisher<Void> {
/**

2
spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
View File

@@ -243,7 +243,7 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
* {@link RestClientResponseException#setBodyConvertFunction(Function)}.
* @since 6.0
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Lambda
protected Function<ResolvableType, ?> initBodyConvertFunction(ClientHttpResponse response, byte[] body) {
Assert.state(!CollectionUtils.isEmpty(this.messageConverters), "Expected message converters");
return resolvableType -> {

6
spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
View File

@@ -83,7 +83,7 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
* @param previousRequest the existing request from the last dispatch
* @since 5.3.33
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
StandardServletAsyncWebRequest(HttpServletRequest request, HttpServletResponse response,
@Nullable StandardServletAsyncWebRequest previousRequest) {
@@ -272,7 +272,7 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
}
@Override
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
public ServletOutputStream getOutputStream() throws IOException {
int level = obtainLockOrRaiseException();
try {
@@ -292,7 +292,7 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
}
@Override
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
public PrintWriter getWriter() throws IOException {
int level = obtainLockOrRaiseException();
try {

4
spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
View File

@@ -298,7 +298,7 @@ public final class WebAsyncManager {
* via {@link #getConcurrentResultContext()}
* @throws Exception if concurrent processing failed to start
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Lambda
public void startCallableProcessing(final WebAsyncTask<?> webAsyncTask, Object... processingContext)
throws Exception {
@@ -419,7 +419,7 @@ public final class WebAsyncManager {
* @see #getConcurrentResult()
* @see #getConcurrentResultContext()
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Lambda
public void startDeferredResultProcessing(
final DeferredResult<?> deferredResult, Object... processingContext) throws Exception {

2
spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
View File

@@ -104,7 +104,7 @@ public class ServletContextResourcePatternResolver extends PathMatchingResourceP
* @see ServletContextResource
* @see jakarta.servlet.ServletContext#getResourcePaths
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
protected void doRetrieveMatchingServletContextResources(
ServletContext servletContext, String fullPattern, String dir, Set<Resource> result)
throws IOException {

4
spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
View File

@@ -162,7 +162,7 @@ public class CorsConfiguration {
/**
* Variant of {@link #setAllowedOrigins} for adding one origin at a time.
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Lambda
public void addAllowedOrigin(@Nullable String origin) {
if (origin == null) {
return;
@@ -235,7 +235,7 @@ public class CorsConfiguration {
* Variant of {@link #setAllowedOriginPatterns} for adding one origin at a time.
* @since 5.3
*/
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Lambda
public void addAllowedOriginPattern(@Nullable String originPattern) {
if (originPattern == null) {
return;

4
spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
View File

@@ -44,7 +44,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
public abstract class AbstractMultipartHttpServletRequest extends HttpServletRequestWrapper
implements MultipartHttpServletRequest {
private @Nullable MultiValueMap<String, MultipartFile> multipartFiles;
@SuppressWarnings("NullAway.Init")
private MultiValueMap<String, MultipartFile> multipartFiles;
/**
@@ -135,7 +136,6 @@ public abstract class AbstractMultipartHttpServletRequest extends HttpServletReq
* lazily initializing it if necessary.
* @see #initializeMultipart()
*/
@SuppressWarnings("NullAway")
protected MultiValueMap<String, MultipartFile> getMultipartFiles() {
if (this.multipartFiles == null) {
initializeMultipart();

8
spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
View File

@@ -45,9 +45,11 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
private static final String CONTENT_TYPE = "Content-Type";
private @Nullable Map<String, String[]> multipartParameters;
@SuppressWarnings("NullAway.Init")
private Map<String, String[]> multipartParameters;
private @Nullable Map<String, String> multipartParameterContentTypes;
@SuppressWarnings("NullAway.Init")
private Map<String, String> multipartParameterContentTypes;
/**
@@ -164,7 +166,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
* lazily initializing it if necessary.
* @see #initializeMultipart()
*/
@SuppressWarnings("NullAway")
protected Map<String, String[]> getMultipartParameters() {
if (this.multipartParameters == null) {
initializeMultipart();
@@ -185,7 +186,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
* lazily initializing it if necessary.
* @see #initializeMultipart()
*/
@SuppressWarnings("NullAway")
protected Map<String, String> getMultipartParameterContentTypes() {
if (this.multipartParameterContentTypes == null) {
initializeMultipart();

5
spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
View File

@@ -58,7 +58,8 @@ import org.springframework.web.multipart.MultipartFile;
*/
public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpServletRequest {
private @Nullable Set<String> multipartParameterNames;
@SuppressWarnings("NullAway.Init")
private Set<String> multipartParameterNames;
/**
@@ -138,7 +139,6 @@ public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpSe
}
@Override
@SuppressWarnings("NullAway")
public Enumeration<String> getParameterNames() {
if (this.multipartParameterNames == null) {
initializeMultipart();
@@ -159,7 +159,6 @@ public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpSe
}
@Override
@SuppressWarnings("NullAway")
public Map<String, String[]> getParameterMap() {
if (this.multipartParameterNames == null) {
initializeMultipart();

4
spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java
View File

@@ -86,7 +86,8 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa
private WebSessionManager sessionManager = new DefaultWebSessionManager();
private @Nullable ServerCodecConfigurer codecConfigurer;
@SuppressWarnings("NullAway.Init")
private ServerCodecConfigurer codecConfigurer;
private LocaleContextResolver localeContextResolver = new AcceptHeaderLocaleContextResolver();
@@ -149,7 +150,6 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa
/**
* Return the configured {@link ServerCodecConfigurer}.
*/
@SuppressWarnings("NullAway")
public ServerCodecConfigurer getCodecConfigurer() {
if (this.codecConfigurer == null) {
setCodecConfigurer(ServerCodecConfigurer.create());

8
spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java
View File

@@ -189,7 +189,7 @@ public class InMemoryWebSessionStore implements WebSessionStore {
}
@Override
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
public String getId() {
return this.id.get();
}
@@ -225,7 +225,7 @@ public class InMemoryWebSessionStore implements WebSessionStore {
}
@Override
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
public boolean isStarted() {
return this.state.get().equals(State.STARTED) || !getAttributes().isEmpty();
}
@@ -254,7 +254,7 @@ public class InMemoryWebSessionStore implements WebSessionStore {
}
@Override
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
public Mono<Void> save() {
checkMaxSessionsLimit();
@@ -292,7 +292,7 @@ public class InMemoryWebSessionStore implements WebSessionStore {
return isExpired(clock.instant());
}
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
private boolean isExpired(Instant now) {
if (this.state.get().equals(State.EXPIRED)) {
return true;

2
spring-web/src/main/java/org/springframework/web/service/invoker/HttpServiceMethod.java
View File

@@ -236,7 +236,7 @@ final class HttpServiceMethod {
return null;
}
@SuppressWarnings("NullAway")
@SuppressWarnings("NullAway") // Dataflow analysis limitation
private static @Nullable String initUrl(
@Nullable HttpExchange typeAnnotation, HttpExchange methodAnnotation,
@Nullable StringValueResolver embeddedValueResolver) {