diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java index 27e4d6a5db1..6ff08da81ac 100644 --- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java +++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java @@ -830,6 +830,7 @@ public class MethodParameter { * @since 5.0 */ public static MethodParameter forParameter(Parameter parameter) { + Assert.notNull(parameter, "Parameter must not be null"); return forExecutable(parameter.getDeclaringExecutable(), findParameterIndex(parameter)); } diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java index 38684155568..10cc0f27567 100644 --- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java @@ -327,8 +327,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator catch (Throwable ex) { // Release concurrency permit if thread creation fails this.concurrencyThrottle.afterAccess(); - throw new TaskRejectedException( - "Failed to start execution thread for task: " + task, ex); + throw new TaskRejectedException("Failed to start execution thread for task: " + task, ex); } } else if (this.activeThreads != null) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java index 307cdb6bbcf..f01c1754981 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java @@ -108,7 +108,6 @@ final class SseServerResponse extends AbstractServerResponse { private static final byte[] NL_NL = new byte[]{'\n', '\n'}; - private final ServerHttpResponse outputMessage; private final DeferredResult deferredResult; @@ -121,7 +120,6 @@ final class SseServerResponse extends AbstractServerResponse { private boolean sendFailed; - public DefaultSseBuilder(HttpServletResponse response, Context context, DeferredResult deferredResult, HttpHeaders httpHeaders) { this.outputMessage = new ServletServerHttpResponse(response); @@ -188,7 +186,6 @@ final class SseServerResponse extends AbstractServerResponse { @Override public void data(Object object) throws IOException { Assert.notNull(object, "Object must not be null"); - if (object instanceof String text) { writeString(text); } @@ -210,7 +207,6 @@ final class SseServerResponse extends AbstractServerResponse { this.builder.append("data:"); try { this.outputMessage.getBody().write(builderBytes()); - Class dataClass = data.getClass(); for (HttpMessageConverter converter : this.messageConverters) { if (converter.canWrite(dataClass, MediaType.APPLICATION_JSON)) { @@ -295,8 +291,7 @@ final class SseServerResponse extends AbstractServerResponse { public HttpHeaders getHeaders() { return this.mutableHeaders; } - } - } + }