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

MvcUriComponentsBuilder prepends slash

Browse Source 
See gh-24143
This commit is contained in:
Astushi Yoshikawa
2019-12-05 21:47:23 +09:00
committed by Rossen Stoyanchev
parent 1dd5db42ab
commit 53b39eb753
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
View File

@@ -102,6 +102,8 @@ public class MvcUriComponentsBuilder {
*/
public static final String MVC_URI_COMPONENTS_CONTRIBUTOR_BEAN_NAME = "mvcUriComponentsContributor";
/** Path separator: "/". */
public static final String PATH_SEPARATOR = "/";
private static final Log logger = LogFactory.getLog(MvcUriComponentsBuilder.class);
@@ -545,7 +547,7 @@ public class MvcUriComponentsBuilder {
String typePath = getClassMapping(controllerType);
String methodPath = getMethodMapping(method);
String path = pathMatcher.combine(typePath, methodPath);
builder.path(path);
builder.path(path.startsWith(PATH_SEPARATOR) ? path : PATH_SEPARATOR + path);
return applyContributors(builder, method, args);
}
@@ -576,11 +578,11 @@ public class MvcUriComponentsBuilder {
Assert.notNull(controllerType, "'controllerType' must not be null");
RequestMapping mapping = AnnotatedElementUtils.findMergedAnnotation(controllerType, RequestMapping.class);
if (mapping == null) {
return "/";
return PATH_SEPARATOR;
}
String[] paths = mapping.path();
if (ObjectUtils.isEmpty(paths) || !StringUtils.hasLength(paths[0])) {
return "/";
return PATH_SEPARATOR;
}
if (paths.length > 1 && logger.isTraceEnabled()) {
logger.trace("Using first of multiple paths on " + controllerType.getName());
@@ -596,7 +598,7 @@ public class MvcUriComponentsBuilder {
}
String[] paths = requestMapping.path();
if (ObjectUtils.isEmpty(paths) || !StringUtils.hasLength(paths[0])) {
return "/";
return PATH_SEPARATOR;
}
if (paths.length > 1 && logger.isTraceEnabled()) {
logger.trace("Using first of multiple paths on " + method.toGenericString());