spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-23 06:29:10 +00:00
Code Issues Projects Releases Wiki Activity

Expose getFilePath() on Resource interface for consistent NIO support

Browse Source 
Closes gh-35435
This commit is contained in:
Juergen Hoeller
2025-09-08 17:03:07 +02:00
parent 114c3f7c9c
commit 27221581a1
12 changed files with 94 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java
+8 -7
View File
@@ -16,8 +16,9 @@
package org.springframework.http.codec;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
@@ -193,17 +194,17 @@ public class ResourceHttpMessageWriter implements HttpMessageWriter<Resource> {
if (message instanceof ZeroCopyHttpOutputMessage zeroCopyHttpOutputMessage && resource.isFile()) {
try {
File file = resource.getFile();
long pos = region != null ? region.getPosition() : 0;
long count = region != null ? region.getCount() : file.length();
Path filePath = resource.getFilePath();
long pos = (region != null ? region.getPosition() : 0);
long count = (region != null ? region.getCount() : Files.size(filePath));
if (logger.isDebugEnabled()) {
String formatted = region != null ? "region " + pos + "-" + (count) + " of " : "";
logger.debug(Hints.getLogPrefix(hints) + "Zero-copy " + formatted + "[" + resource + "]");
}
return zeroCopyHttpOutputMessage.writeWith(file, pos, count);
return zeroCopyHttpOutputMessage.writeWith(filePath, pos, count);
}
catch (IOException ex) {
// should not happen
catch (IOException ignore) {
// returning null below leads to fallback code path
}
}
return null;