Polishing contribution

See gh-24292
spring-projects · Jan 8, 2020 · 0182738 · 0182738
1 parent e96b71a
commit 0182738
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java b/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,7 +83,6 @@ public Resource decode(DataBuffer dataBuffer, ResolvableType elementType,
 				public String getFilename() {
 					return filename;
 				}
-
 				@Override
 				public long contentLength() {
 					return bytes.length;

diff --git a/spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java b/spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,10 +82,7 @@ public void decode() {
 	@Override
 	@Test
 	public void decodeToMono() {
-		Flux<DataBuffer> input = Flux.concat(
-				dataBuffer(this.fooBytes),
-				dataBuffer(this.barBytes));
-
+		Flux<DataBuffer> input = Flux.concat(dataBuffer(this.fooBytes), dataBuffer(this.barBytes));
 		testDecodeToMonoAll(input, ResolvableType.forClass(Resource.class),
 				step -> step
 						.consumeNextWith(value -> {

diff --git a/...ng-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java b/...ng-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,10 +84,10 @@ protected Resource readInternal(Class<? extends Resource> clazz, HttpInputMessag
 				public String getFilename() {
 					return inputMessage.getHeaders().getContentDisposition().getFilename();
 				}
-
 				@Override
-				public long contentLength() {
-					return inputMessage.getHeaders().getContentLength();
+				public long contentLength() throws IOException {
+					long length = inputMessage.getHeaders().getContentLength();
+					return (length != -1 ? length : super.contentLength());
 				}
 			};
 		}

diff --git a/...b/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java b/...b/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.