diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java index 924017ec489..25e0003f527 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java @@ -252,11 +252,6 @@ final class DefaultEntityResponseBuilder implements EntityResponse.Builder this.entityType = entityType; } - private static boolean isResource(T entity) { - return !(entity instanceof InputStreamResource) && - (entity instanceof Resource); - } - @Override public T entity() { return this.entity; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java index bfda2d48494..d96a4e14d60 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java @@ -35,9 +35,6 @@ import java.util.stream.Collectors; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import kotlin.reflect.KFunction; -import kotlin.reflect.jvm.ReflectJvmMapping; - import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.InitializingBean; @@ -805,15 +802,4 @@ public abstract class AbstractHandlerMethodMapping extends AbstractHandlerMap } } - /** - * Inner class to avoid a hard dependency on Kotlin at runtime. - */ - private static class KotlinDelegate { - - static private boolean isSuspend(Method method) { - KFunction function = ReflectJvmMapping.getKotlinFunction(method); - return function != null && function.isSuspend(); - } - } - } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java index ee02ad1700a..05431f0bc31 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java @@ -61,8 +61,6 @@ import org.springframework.web.method.support.ModelAndViewContainer; */ public class ResponseBodyEmitterReturnValueHandler implements HandlerMethodReturnValueHandler { - private final List> messageConverters; - private final List> sseMessageConverters; private final ReactiveTypeHandler reactiveHandler; @@ -76,7 +74,6 @@ public class ResponseBodyEmitterReturnValueHandler implements HandlerMethodRetur */ public ResponseBodyEmitterReturnValueHandler(List> messageConverters) { Assert.notEmpty(messageConverters, "HttpMessageConverter List must not be empty"); - this.messageConverters = messageConverters; this.sseMessageConverters = initSseConverters(messageConverters); this.reactiveHandler = new ReactiveTypeHandler(); } @@ -93,7 +90,6 @@ public class ResponseBodyEmitterReturnValueHandler implements HandlerMethodRetur ReactiveAdapterRegistry registry, TaskExecutor executor, ContentNegotiationManager manager) { Assert.notEmpty(messageConverters, "HttpMessageConverter List must not be empty"); - this.messageConverters = messageConverters; this.sseMessageConverters = initSseConverters(messageConverters); this.reactiveHandler = new ReactiveTypeHandler(registry, executor, manager); }