From e3da8b5e9cb96eb3cc007197c50d2dd6cc68d34f Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 12 Sep 2016 15:27:33 +0200 Subject: [PATCH] Polish ResourceHttpRequestHandler, ResourceEncoder --- .../java/org/springframework/core/codec/ResourceEncoder.java | 2 +- .../web/servlet/resource/ResourceHttpRequestHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java index 6b87f983c6..89adf12d39 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java +++ b/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java @@ -50,7 +50,7 @@ public class ResourceEncoder extends AbstractSingleValueEncoder { } public ResourceEncoder(int bufferSize) { - super(MimeTypeUtils.ALL); + super(MimeTypeUtils.APPLICATION_OCTET_STREAM, MimeTypeUtils.ALL); Assert.isTrue(bufferSize > 0, "'bufferSize' must be larger than 0"); this.bufferSize = bufferSize; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java index e0d6d8441c..fc3c1fa59a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java @@ -187,7 +187,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator } /** - * Return the list of configured resource converters. + * Return the configured resource converter. * @since 4.3 */ public ResourceHttpMessageConverter getResourceHttpMessageConverter() { @@ -204,7 +204,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator } /** - * Return the list of configured resource region converters. + * Return the configured resource region converter. * @since 4.3 */ public ResourceRegionHttpMessageConverter getResourceRegionHttpMessageConverter() {