Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added extractFullFilenameFromUrlPath to WebUtils

Browse Source
This commit is contained in:
Arjen Poutsma
2009-02-05 15:45:25 +00:00
parent b0180fdf32
commit 460977263d
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
org.springframework.web/src/main/java/org/springframework/web/util/WebUtils.java
View File

@@ -653,6 +653,20 @@ public abstract class WebUtils {
* @return the extracted URI filename (e.g. "index")
*/
public static String extractFilenameFromUrlPath(String urlPath) {
String filename = extractFullFilenameFromUrlPath(urlPath);
int dotIndex = filename.lastIndexOf('.');
if (dotIndex != -1) {
filename = filename.substring(0, dotIndex);
}
return filename;
}
/**
* Extract the full URL filename (including file extension) from the given request URL path.
* Correctly resolves nested paths such as "/products/view.html" as well.
* @param urlPath the request URL path (e.g. "/products/index.html")
* @return the extracted URI filename (e.g. "index.html")
*/
public static String extractFullFilenameFromUrlPath(String urlPath) {
int end = urlPath.indexOf(';');
if (end == -1) {
end = urlPath.indexOf('?');
@@ -661,12 +675,7 @@ public abstract class WebUtils {
}
}
int begin = urlPath.lastIndexOf('/', end) + 1;
String filename = urlPath.substring(begin, end);
int dotIndex = filename.lastIndexOf('.');
if (dotIndex != -1) {
filename = filename.substring(0, dotIndex);
}
return filename;
return urlPath.substring(begin, end);
}
}