root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polishing contribution 

See gh-24292
This commit is contained in:
Rossen Stoyanchev 2020-01-08 16:16:07 +00:00
parent e96b71acf3
commit 01827389ef
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -83,7 +83,6 @@ public class ResourceDecoder extends AbstractDataBufferDecoder<Resource> {
public String getFilename() { public String getFilename() {
return filename; return filename;
} }
@Override @Override
public long contentLength() { public long contentLength() {
return bytes.length; return bytes.length;

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -82,10 +82,7 @@ class ResourceDecoderTests extends AbstractDecoderTests<ResourceDecoder> {
@Override @Override
@Test @Test
public void decodeToMono() { public void decodeToMono() {
Flux<DataBuffer> input = Flux.concat( Flux<DataBuffer> input = Flux.concat(dataBuffer(this.fooBytes), dataBuffer(this.barBytes));
dataBuffer(this.fooBytes),
dataBuffer(this.barBytes));
testDecodeToMonoAll(input, ResolvableType.forClass(Resource.class), testDecodeToMonoAll(input, ResolvableType.forClass(Resource.class),
step -> step step -> step
.consumeNextWith(value -> { .consumeNextWith(value -> {

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -84,10 +84,10 @@ public class ResourceHttpMessageConverter extends AbstractHttpMessageConverter<R
public String getFilename() { public String getFilename() {
return inputMessage.getHeaders().getContentDisposition().getFilename(); return inputMessage.getHeaders().getContentDisposition().getFilename();
} }
@Override @Override
public long contentLength() { public long contentLength() throws IOException {
return inputMessage.getHeaders().getContentLength(); long length = inputMessage.getHeaders().getContentLength();
return (length != -1 ? length : super.contentLength());
} }
}; };
} }

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.