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

#269 - Make sure URL parts are joined by exactly one slash.

Browse Source 
Original pull request: #423.
This commit is contained in:
Kevin Conaway
2016-01-08 09:32:55 -05:00
committed by Oliver Gierke
parent 792b5fcd22
commit 720ff797de
2 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/springframework/hateoas/core/AnnotationMappingDiscoverer.java
View File

@@ -109,7 +109,17 @@ public class AnnotationMappingDiscoverer implements MappingDiscoverer {
return typeMapping;
}
return typeMapping == null || "/".equals(typeMapping) ? mapping[0] : typeMapping + mapping[0];
return typeMapping == null || "/".equals(typeMapping) ? mapping[0] : join(typeMapping, mapping[0]);
}
private String join(String typeMapping, String mapping) {
StringBuilder builder = new StringBuilder();
builder.append(typeMapping.endsWith("/") ? typeMapping.substring(0, typeMapping.length() - 1) : typeMapping);
builder.append('/');
builder.append(mapping.startsWith("/") ? mapping.substring(1) : mapping);
return builder.toString();
}
private String[] getMappingFrom(Annotation annotation) {