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

Merge pull request #24143 from yoshikawaa/patch-1 

Closes gh-24143
This commit is contained in:
Rossen Stoyanchev 2020-01-08 16:48:54 +00:00
parent 1dd5db42ab d509d5ae6f
commit 9d6e40fb1e
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.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.
@ -545,6 +545,9 @@ public class MvcUriComponentsBuilder {
String typePath = getClassMapping(controllerType); String typePath = getClassMapping(controllerType);
String methodPath = getMethodMapping(method); String methodPath = getMethodMapping(method);
String path = pathMatcher.combine(typePath, methodPath); String path = pathMatcher.combine(typePath, methodPath);
if (StringUtils.hasLength(path) && !path.startsWith("/")) {
path = "/" + path;
}
builder.path(path); builder.path(path);
return applyContributors(builder, method, args); return applyContributors(builder, method, args);

34
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-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.
@ -434,6 +434,20 @@ public class MvcUriComponentsBuilderTests {
assertThat(url).isEqualTo("/base/people/_%2B_/addresses/DE%3BFR"); assertThat(url).isEqualTo("/base/people/_%2B_/addresses/DE%3BFR");
} }
@Test
public void fromMappingNameWithPathWithoutLeadingSlash() {
initWebApplicationContext(PathWithoutLeadingSlashConfig.class);
this.request.setServerName("example.org");
this.request.setServerPort(9999);
this.request.setContextPath("/base");
String mappingName = "PWLSC#getAddressesForCountry";
String url = fromMappingName(mappingName).arg(0, "DE;FR").encode().buildAndExpand("_+_");
assertThat(url).isEqualTo("/base/people/DE%3BFR");
}
@Test @Test
public void fromControllerWithPrefix() { public void fromControllerWithPrefix() {
@ -498,6 +512,14 @@ public class MvcUriComponentsBuilderTests {
} }
} }
@RequestMapping({"people"})
static class PathWithoutLeadingSlashController {
@RequestMapping("/{country}")
HttpEntity<Void> getAddressesForCountry(@PathVariable String country) {
return null;
}
}
@RequestMapping({"/persons", "/people"}) @RequestMapping({"/persons", "/people"})
private class InvalidController { private class InvalidController {
@ -622,6 +644,16 @@ public class MvcUriComponentsBuilderTests {
} }
@EnableWebMvc
static class PathWithoutLeadingSlashConfig implements WebMvcConfigurer {
@Bean
public PathWithoutLeadingSlashController controller() {
return new PathWithoutLeadingSlashController();
}
}
@EnableWebMvc @EnableWebMvc
static class PathPrefixWebConfig implements WebMvcConfigurer { static class PathPrefixWebConfig implements WebMvcConfigurer {