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 79fff8944cf..c55b9805180 100644 --- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java +++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java @@ -822,6 +822,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 46c506f2c81..d09482040e5 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 @@ -324,8 +324,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-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java index fa7c290613c..b9a81cecf6a 100644 --- a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java +++ b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java @@ -42,7 +42,6 @@ import org.springframework.util.Assert; * @see java.util.concurrent.ExecutorService * @see java.util.concurrent.Executors */ -@SuppressWarnings("deprecation") public class TaskExecutorAdapter implements AsyncTaskExecutor { private final Executor concurrentExecutor; 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 b12a672c6d5..1ca6712f64a 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 @@ -105,7 +105,6 @@ final class SseServerResponse extends AbstractServerResponse { private static final byte[] NL_NL = new byte[]{'\n', '\n'}; - private final ServerHttpResponse outputMessage; private final DeferredResult deferredResult; @@ -118,7 +117,6 @@ final class SseServerResponse extends AbstractServerResponse { private boolean sendFailed; - public DefaultSseBuilder(HttpServletResponse response, Context context, DeferredResult deferredResult, HttpHeaders httpHeaders) { this.outputMessage = new ServletServerHttpResponse(response); @@ -184,7 +182,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); } @@ -206,7 +203,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)) { @@ -291,8 +287,7 @@ final class SseServerResponse extends AbstractServerResponse { public HttpHeaders getHeaders() { return this.mutableHeaders; } - } - } + }