Add ContentLength support for InputStreamResource created in ResourceHttpMessageConverter and ResourceDecoder

spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java

@@ -83,6 +83,11 @@ public Resource decode(DataBuffer dataBuffer, ResolvableType elementType,
 				public String getFilename() {
 					return filename;
 				}
+
+				@Override
+				public long contentLength() {
+					return bytes.length;
+				}
 			};
 		}
 		else if (Resource.class.isAssignableFrom(clazz)) {

spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java

@@ -104,4 +104,22 @@ public void decodeToMono() {
 				Collections.singletonMap(ResourceDecoder.FILENAME_HINT, "testFile"));
 	}
 
+	@Test
+	public void decodeInputStreamResource() {
+		Flux<DataBuffer> input = Flux.concat(dataBuffer(this.fooBytes), dataBuffer(this.barBytes));
+		testDecodeAll(input, InputStreamResource.class, step -> step
+				.consumeNextWith(resource -> {
+					try {
+						byte[] bytes = StreamUtils.copyToByteArray(resource.getInputStream());
+						assertThat(new String(bytes)).isEqualTo("foobar");
+						assertThat(resource.contentLength()).isEqualTo(fooBytes.length + barBytes.length);
+					}
+					catch (IOException ex) {
+						throw new AssertionError(ex.getMessage(), ex);
+					}
+				})
+				.expectComplete()
+				.verify());
+	}
+
 }

spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java

@@ -84,6 +84,11 @@ protected Resource readInternal(Class<? extends Resource> clazz, HttpInputMessag
 				public String getFilename() {
 					return inputMessage.getHeaders().getContentDisposition().getFilename();
 				}
+
+				@Override
+				public long contentLength() {
+					return inputMessage.getHeaders().getContentLength();
+				}
 			};
 		}
 		else if (Resource.class == clazz || ByteArrayResource.class.isAssignableFrom(clazz)) {

spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java

@@ -80,10 +80,12 @@ public void shouldReadInputStreamResource() throws IOException {
 			inputMessage.getHeaders().setContentType(MediaType.IMAGE_JPEG);
 			inputMessage.getHeaders().setContentDisposition(
 					ContentDisposition.builder("attachment").filename("yourlogo.jpg").build());
+			inputMessage.getHeaders().setContentLength(123);
 			Resource actualResource = converter.read(InputStreamResource.class, inputMessage);
 			assertThat(actualResource).isInstanceOf(InputStreamResource.class);
 			assertThat(actualResource.getInputStream()).isEqualTo(body);
 			assertThat(actualResource.getFilename()).isEqualTo("yourlogo.jpg");
+			assertThat(actualResource.contentLength()).isEqualTo(123);
 		}
 	}