From f082c435e1cc14593300715a94b2ab712249bd00 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 30 Nov 2025 11:31:10 +0100 Subject: [PATCH] Polishing --- .../org/springframework/test/json/JsonConverterDelegate.java | 2 +- .../springframework/http/server/ServletServerHttpRequest.java | 2 +- .../http/server/reactive/ServletServerHttpRequest.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/json/JsonConverterDelegate.java b/spring-test/src/main/java/org/springframework/test/json/JsonConverterDelegate.java index 016d274719a..12bf7d1ef1b 100644 --- a/spring-test/src/main/java/org/springframework/test/json/JsonConverterDelegate.java +++ b/spring-test/src/main/java/org/springframework/test/json/JsonConverterDelegate.java @@ -22,7 +22,7 @@ import org.springframework.core.ResolvableType; import org.springframework.http.converter.HttpMessageConverter; /** - * Delegate to abstract JSON type conversion in AssertJ support clases. + * Delegate to abstract JSON type conversion in AssertJ support classes. * * @author Rossen Stoyanchev * @since 7.0 diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java index 13df46d2a73..0ac463ce0e5 100644 --- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java @@ -322,7 +322,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest { private @Nullable transient Set> entrySet; - @Override public int size() { int size = 0; @@ -454,4 +453,5 @@ public class ServletServerHttpRequest implements ServerHttpRequest { return entrySet; } } + } diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java index 30a9953df15..d58d57560e8 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java @@ -161,7 +161,6 @@ class ServletServerHttpRequest extends AbstractServerHttpRequest { @SuppressWarnings("NullAway") // Dataflow analysis limitation private static HttpHeaders initHeaders(HttpHeaders headerValues, HttpServletRequest request) { - HttpHeaders headers = null; MediaType contentType = null; if (!StringUtils.hasLength(headerValues.getFirst(HttpHeaders.CONTENT_TYPE))) {